7343 files changed, 71770 insertions, 54769 deletions

diff --git a/Manifest b/Manifest
index 56237ee4006e..8b20a0d772f4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29317 BLAKE2B 7a92dcb3c5acb1984c8b310f557f1e191b0a389d15c3d49d75a2281448771edcb0dd90244e5de369e7d2e8cf97e2ef2c5acce085a16610bdad4848ab1f24b40e SHA512 4d017ecf95975c2496f22826c4556896da0fed5e372e2e52ac3b9f8472d378b3f76a0ec7ed357bb7a0e18368e70eb5d8433f3e3655a7bd6dd6806a7a3fd37254
-TIMESTAMP 2021-09-25T18:39:23Z
+MANIFEST Manifest.files.gz 29303 BLAKE2B 6b946142ef912c8c38ef2516828aed04528b3c2562fcf9eb4eff7f99ad524b488e3923b7632a88b3629292ebd5515850c8fa1316be7b84bed44e104a5cb16c48 SHA512 e8706afe693acae77ce01da5404f1747fb915dc50399b3be76876c1937292ed8addf6441c4562aefd2a250039b01a69677c4bcd26a76b97ae143d1f026dbb54c
+TIMESTAMP 2021-10-01T19:09:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFPbNtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFXXNRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzJg//W2VC5HHnm7sBz+AZuKn/PEqYiQKY0oSPqrKAwtkQxVepT2SLcZkoJjUC
-/W51WRG5kE5A6hLlbpM2Ko6RgQZG4/xen+rRrvC6yPx18j4+SiHA2NzebkUvtYeC
-Q+4sXrjLesW8jRGkLYHAIVBSZhvg4Y/6gzrcrclOz6+/q1ML9m9qp+QIqFUZYewL
-Npx0zk7lX1iPlI7eipfrKEslIlhBMmhl+Vq/VOP6CfdehD/XrR8C6yiQnGZ7SPJg
-sbzNjqOOJLg+YLEVepl5mwZ3akMwzeQFke6wYF383ml24XPAaS9kZOyffa1NoIhY
-MUFOk3jL+CozG9A4p5zjzMzxvpssc/12mj4lrVl92FpfgEJbL0PusvRoau5+aCR7
-71QqteKg+YKTpEhg7AwtGAUXvIsTf4mepj5/izf4dXDRgWYg+p0tEVfV0plffJ8N
-Wwbz41GHbsNCP4GAs/2RxI6D4KP9VdvPagWjlxgHQQGAjKUxIzJnId4uacE4h3yc
-7jQ/FDfr14mo/qG4NLsldo64TVYwOzrlGsgi5utTB5U1BS0UcRvXtCP0APttWyBn
-1pmeTs0YjmNYVSk26NxU+VylBfqUoEWMserYmr46Rg29iiwasHpIxakbqylFLGT5
-8YqFKvB8RySFP/tQZvXaBmgkpYjBKlGsfKWeZqIhQplpT7fk5l4=
-=d++A
+klBd8Q//R3Hs0+soKWb05j5HilLCcQ087m/Qqgj+p4Nfv4Fx1WR4qfnmpivTcYif
+s+m7pohU7Y36Dq0zHoguuF3l6Gzxh5u/Ly8gmD8MghysdJbe1W56V2LbKXloTc/H
+oqYnmmawdXAlsqsn5vLamt49StIp+YzGPGAs2Ui7VuJaaKBnsiVpfFsYQs8qp1gj
+cO/99oLhFn0C7tylCwUitJvJBq+a3Bn3I8tnXi8EjY1RSJ6OPvpwtLIs0HT2w6Ur
+1ySggjMOsfUuQD8uCG99qudef5vl+bnPYI+lG7Dcf5ILEhVxsc4RuVNqdi+91Ihe
+ICPKIPatwb5EBFHANcYHVdPVcP9z9EyQFuUQs+PZiZY2D7Ljyk8JzM3UWt0L9jhZ
+0pMU/HemPbxQ8YQDWY5Df/uTcek6t3gScjCxZwGWZI0UmWrtlsN/0v5xnzTOe8T3
+fvQbWyr3YeAoYpzsXOIAoDwz2GDavRTEV8nejQCMC6J4HQ5xcewTvXTgIy2zP+SU
+l3CCKMmPLvTaB5OFtf8qESpny1zynINhpxTCOPEZh6FgBgckzE3/DTqnz3y1nIUt
+lURFe7juJ566M6w/DigpdrAxzzOc/WxsEow9dH8m8+DQVBMzRZbp9ABuX+GGzTbA
+lY59NpJ3FLVpFjeEUOxjFu3FPvMAaE0kONAQ/oYr4QlurMolDZ8=
+=gd3F
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index cc61a38964b6..2b696f53196e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 06967c1a1bb2..4f7aeedf22c5 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/ftpproxy/Manifest b/acct-group/ftpproxy/Manifest
index e9867777c76d..a5716fd68305 100644
--- a/acct-group/ftpproxy/Manifest
+++ b/acct-group/ftpproxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD ftpproxy-0.ebuild 193 BLAKE2B 2f9cd8e299a261196b1d686ea86661b55b5bcf322f5b179eeb5372a19aca33081cb08e2d97a8454d95ba2aa4ad8ba9f1b04175497c91a5ad6f6be192a307eb3d SHA512 98dda91977a2726a60f5d13a3a4bc7069b3d9834e7fda99b0a7a9f426921429bd08869a64c6b56aab917b614fed5ede2755d2d3781bf490a0a7e8ce7a8db845d
-MISC metadata.xml 393 BLAKE2B b407261fe3a30e63d8a9cf1197c6c638754001180f5fdf5c8f0083dd166bbd19e566482b38e7bcc42a8e0a6f6786b305bb14a5d95115864261f7cf0e6812dcc4 SHA512 4d05fe4842cb7badcb2267aa70981c727ae334e550610db77d63f82cd01106df1ea1cb2f0936182f2d9543764cf4dab889a0b69289a04fa21797ccb4f1c20cfa
+MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
diff --git a/acct-group/ftpproxy/metadata.xml b/acct-group/ftpproxy/metadata.xml
index 8d547bc93683..fd68dfdc70a8 100644
--- a/acct-group/ftpproxy/metadata.xml
+++ b/acct-group/ftpproxy/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>kabel@blackhole.sk</email>
-		<name>Marek Behun</name>
+		<email>kabel@kernel.org</email>
+		<name>Marek Behún</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 9df1039830d7..987cb11170aa 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/ftpproxy/Manifest b/acct-user/ftpproxy/Manifest
index 4cc98e63b1cb..63c6531c7f24 100644
--- a/acct-user/ftpproxy/Manifest
+++ b/acct-user/ftpproxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD ftpproxy-0.ebuild 302 BLAKE2B eecdf448e319f6dd19ad56db601f9d273ca6ec4753347020d46b2217baaaae7657ad41f38b50bb44806cfcf2407272d01430c206d623f348dd5fc4732d5ea42d SHA512 108002fb6d5fb82f6ed42d08703e4a40219d0492c8f68513a0ab1306e717cb9b19ac830e7bcf929080eb6c6adbf78e3836e4eef893f2157513ef28b504d8d105
-MISC metadata.xml 393 BLAKE2B b407261fe3a30e63d8a9cf1197c6c638754001180f5fdf5c8f0083dd166bbd19e566482b38e7bcc42a8e0a6f6786b305bb14a5d95115864261f7cf0e6812dcc4 SHA512 4d05fe4842cb7badcb2267aa70981c727ae334e550610db77d63f82cd01106df1ea1cb2f0936182f2d9543764cf4dab889a0b69289a04fa21797ccb4f1c20cfa
+MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
diff --git a/acct-user/ftpproxy/metadata.xml b/acct-user/ftpproxy/metadata.xml
index 8d547bc93683..fd68dfdc70a8 100644
--- a/acct-user/ftpproxy/metadata.xml
+++ b/acct-user/ftpproxy/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>kabel@blackhole.sk</email>
-		<name>Marek Behun</name>
+		<email>kabel@kernel.org</email>
+		<name>Marek Behún</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 56148abde01f..7e780cd2ac71 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index e7eb0c49c390..2c9bf26012b7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -9,6 +9,10 @@ DIST awscli-1.20.45.tar.gz 2074157 BLAKE2B 4ff9af5217bf241c89de1fb601ff5c41f2207
 DIST awscli-1.20.46.tar.gz 2079078 BLAKE2B c5e4f7c3f068dbcba9e6c8b4b96e3d41e60b0bf58aecfc06fa93cc918d570bdac77f3ccc28819c04f4cc7be25627d505c1180d78cb4ccd9fae4ea4c7b517e3bb SHA512 b0c46fce82497a399725bb4965700a7c9a41be4ca62115da6028ba2b7c7420b72301c4ad46133067d0da42690a8ca5575f54f54977d158090d01995308a2b785
 DIST awscli-1.20.47.tar.gz 2079314 BLAKE2B 2c202ed3e3527a6881c3f9ca73e8639732442948c6cd6a79fc3fe64de38ff56f7e595f0a0e4badeade81624f8a0323f435b63199a138ce90acb0a1785a326dcf SHA512 ad7be0753549c6f82f6f9a8631cbb8c56526ef17eb0152298bb78365735d4454ec4efb44a6858d01f31cff2ae54ad6a11e0afff3277dde2b70415d58bfb81c86
 DIST awscli-1.20.48.tar.gz 2079233 BLAKE2B 9871d66b2acfb83572e200c8c6951f8ccab0c26ee4296c5e64329be6757727be7f33cc8c5788852191425c528524ab8a5917331b933fc16efc3e41a5f24e8500 SHA512 1ba5d2da32fbb7fe9bed552b06e793ccb97f40c9391f2c08f0799ec49efef832c855347168a8d42fc6757cb88ef68fa15ae4cc50fce60024ebb0e341abcf0b37
+DIST awscli-1.20.49.tar.gz 2079908 BLAKE2B 7aac4ff54993b70eed395ab625c6b1ed9631465f7a7672f58575a8f563036b1c03cf761bf47e7c6e36ce24066a603015684020f551180891467469b76d3d4e28 SHA512 846bf1de3d2a4305cf0d4980e2c9422d5ae517e01bf6c7cecedf96308a0fe030928feb0efefec074ca304b429b71e0e22070bec323998edd4109d16d20349e6f
+DIST awscli-1.20.50.tar.gz 2079977 BLAKE2B f6cd055fb74641023bbfa664a817ac19dcfa1d6a33489cd70e4d2255bd8dbe35aa900e88c312b26db77ff066c7b513e758ef67e42e44e6e7d48b2599359251db SHA512 d01c648bfb089e9663ecc9976a60e865155462fd7ad97714e0959b867126b7031433e59716edc31e08893c77f09e92c8885c8df5dbaf7715eac592bf634ef5d7
+DIST awscli-1.20.51.tar.gz 2080377 BLAKE2B b7d32d129956817c98f43ea44200027389569e1484d568e3632f71c527a77ffb5e15045ce64fae72d9835856e81fea091f2fde293626e918cacf52c933204d35 SHA512 1cab00c694f19bbd14c4a0da01a28ef19eca00b03b1da377d2ee7b03e3c397c99f49fc2994679a08211ba41f583d5b2d1b39dac9990a3dc5ebfd121a376b7ca3
+DIST awscli-1.20.52.tar.gz 2080775 BLAKE2B ea71ef44ff4ba0758a3e4f7fb5784c852ab6df3ba33ae5345c5e8bf43d46e693457110555af9570996ab3035a50847261eebb12b04c63cfe150bca01fcef3aa9 SHA512 c388ee9b6b73fc49d1a39772dc93c90b7472f63c65100b2ee9dec46893210f9104c32a9dbf0570d6c790f1faa703e7f0ec900395bb9964898b3bcd046a879721
 EBUILD awscli-1.20.28.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 EBUILD awscli-1.20.40.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.41.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
@@ -19,4 +23,8 @@ EBUILD awscli-1.20.45.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b940
 EBUILD awscli-1.20.46.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
 EBUILD awscli-1.20.47.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
 EBUILD awscli-1.20.48.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
-MISC metadata.xml 447 BLAKE2B a149ec992aad58d4e48ff13549d5126e6203321a087676519d20208719e076394b7cf6a699e98fc2012ea627ff267311630ed5a0adc8ba01ff469c2746a60d12 SHA512 91d8fe7cf0ddee1fe098931369f2a13835bce06efd8f66de96ebb21f6f42e0194c1bd35d340a21a36b240a1e37ea58286e11b68308937439d0c18edaf6dad348
+EBUILD awscli-1.20.49.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
+EBUILD awscli-1.20.50.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.51.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.52.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.20.49.ebuild b/app-admin/awscli/awscli-1.20.49.ebuild
new file mode 100644
index 000000000000..95a3e5aaa0df
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.49.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit 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}]
+"
+
+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.50.ebuild b/app-admin/awscli/awscli-1.20.50.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.50.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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.51.ebuild b/app-admin/awscli/awscli-1.20.51.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.51.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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.52.ebuild b/app-admin/awscli/awscli-1.20.52.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.52.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/metadata.xml b/app-admin/awscli/metadata.xml
index 48130fb88e3d..16fb00668076 100644
--- a/app-admin/awscli/metadata.xml
+++ b/app-admin/awscli/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index 538ed7b84844..72a23e98789c 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2
 DIST gnome-abrt-1.4.0.tar.gz 112129 BLAKE2B f3f45c1793c59f4453ef17fd7e24877143cc5d87bdf8cfd6d778d9178005ff6083ce1564f06bb98d9027628bcdd4feb9d98edcbdcc76432c813065d518d0f91a SHA512 eb66040f23a8cba4e015f4f72dee56d782aa3d8bdd90644dce2e7fa1776edc4dc14d69c3722503825db5ff75fa80bde09bbc5bcd9eb6f20209e7e579d8c33a21
-EBUILD gnome-abrt-1.3.6.ebuild 1161 BLAKE2B 2a8a3a444f592bed4ed15a2f2503814f4017d36de6dc9be0f16a9eb15f02507e86fc3727f654e1c7062321ee5b0695e6cd6b431ca9abfc47f608f902e24568b7 SHA512 ebf07063571c949d8ab39bd16dc742424e2239f856f9141ce29bc7ac94ee7552ecba8c7b7f467d6426be608091ef7a8fd0647ea243eeeb825d3aa76eb7fd42ea
-EBUILD gnome-abrt-1.4.0.ebuild 1157 BLAKE2B a3a831484d71ffb342211b0af4fe843efef0e333ec2ba46b86f578922836f53ded16f9777f71bb870e179815297d81b545e09c976a436fd156f9f3f14701a761 SHA512 d0e99a173d7b3e5fd0d905d2980f5e1435e66b2b83da47aea2b072ec19716b8bb01969efa7d8496b6aef4854d5188a7568fe7a865cb17b5f26886a3d76bf783b
+EBUILD gnome-abrt-1.4.0.ebuild 1158 BLAKE2B c89c5fdc6fbd7bc28a0cad48e9cf1d9ab43b54e6783e01a9912c9eb0293cbc963dd0fef8ddcb6be11dd3ea29be5005c829ed956cfaaaf878aa60cafbdc73e61a SHA512 f6d4fd37809b1e4382ae8035b1b522c574b80a9b68f6f764aa78c5b69838224ada61961e8a720f0da2ea55bda7175de4bd2755918d76125561c111960bd82728
 MISC metadata.xml 324 BLAKE2B 1ffb7c15745814f3cd31a57d21c31626168e535f993691109ea2f5fafd53b6e5951b6ac86ef1a4542e8074d20fb197a211208373b218b4a3821577413fcbf3ef SHA512 5c2c35dc69f9560490724309a8039ef989d69ba3452db590292363e349070075efc9f6fa0c3c2dba3d459a09b59751f4c28a4058ba8bbef175397c106cb2ab95
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
deleted file mode 100644
index d06fd2d8b609..000000000000
--- a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-r1
-
-DESCRIPTION="A utility for viewing problems that have occurred with the system"
-HOMEPAGE="https://github.com/abrt/gnome-abrt"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.10.0:3
-	>=dev-libs/libreport-2.0.20:0=[python,${PYTHON_USEDEP}]
-	>=app-admin/abrt-2.10.10-r1
-	>=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-		-Dlint=false
-	)
-
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_install() {
-	python_foreach_impl meson_src_install
-	python_foreach_impl python_optimize
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild
index f0302b220f12..44eb462bbfbd 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit meson python-r1
 
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 2bbf2b825d0d..d4c6efc77a76 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,4 @@
-AUX keepassxc-2.6.4-quazip1.patch 952 BLAKE2B f4e402dc5bacb7cfbff683d43a7f494cdc7874500e53058f79dbdeae861b57ac01d11362ae66c65fb1aa15450335003a66fcef3cc1d45007ab5c1cf5c903ffe9 SHA512 df6ca3594452dfa6ada95c3a24a225f1788fdb3f9e9c61043e8a0eebd05944e76041848a04f5e8ada1cc979b0444ee439ab259358e8bb0fa6aeb568ed220e979
-DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
-DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a SHA512 a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce
 DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
-EBUILD keepassxc-2.6.4-r2.ebuild 2233 BLAKE2B 53fa2d144f16bf30f5068fcdc231756418fcc84b0d7410bcbedb4c5502846de645918bb69d4df8015ba2c98224327dbc5a669679a06e064f55f40941cd47c24c SHA512 2e71956c1bf0cc4e77f03a02621c1b38e183a14f47be9945953b454265449b385f1146f7bbefc7e274c2116b12008318fa81954442082c59f50eb4b2a80f2fdc
-EBUILD keepassxc-2.6.5.ebuild 2336 BLAKE2B 263676014991a0cdcd9a3bf10eae75033b1b9f6429a852f3ae761038ae150340390e6dafb2b094f5477d1ab405517ce6910fbc4ee2eef57702a081f099bb74a7 SHA512 5268dceef5a921ef191acbe703762fed1bf846eaaeabdd37bcaf17f9e14e0413e1adcba32a9b92d6d1bf6ba9d7ec1b1fc3f69a1dc304554bcd792bad87a39b27
 EBUILD keepassxc-2.6.6.ebuild 2381 BLAKE2B 551bca5f58e013b4e90b4122bd02e623429839c168831687bd07a3f9c7f4a09ed2b2e2bab786354c1beb739326da08e7dc7a43c716353222e838cc34a5fbe623 SHA512 1526ab18936e4309935ffb58e549cdc72726d15ddadc6c00fc4fa68f7149fa0aff8ecee9d86872ee933d58255333a883316dc96c6a527baaca1e5464cfed899d
-EBUILD keepassxc-9999.ebuild 2383 BLAKE2B fa4dffbc4af69468ead77d7e9e380e391cef1319bb61f3d9e1fd78ea521f24a9aa991f2209db4da2e7f70dab38b6165d11ee5d766be6fd96d05c4149f92afcc7 SHA512 1aeda66e8167df7d5245c2f1361b6b473d7f598fe308f43e2ccd6badff83aad178122f0396555607e89485e851fe3e4be25923e9c0c225d3baf8ce6762250252
+EBUILD keepassxc-9999.ebuild 2383 BLAKE2B f89da1f90b7c4e09ca19905a9b7daf3cc0cd114fc1f6873499fd58800d5b2706bad5d57d5313c9c11ced1fa666cc06ec90d251822c45c5c4deea1a20d6d4dc2d SHA512 e60806680f7e6bcc088b07dcf255f4477b079ae3bcc4f903db1507eb0d6b6476d7249120593fbd0b564efd13c2a6d36a6b6f2b7f74446ca361de655fff04eb4d
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch
deleted file mode 100644
index 42f4fe7478bc..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 5 Oct 2020 21:00:24 +0200
-Subject: [PATCH] Support quazip 1.0
-
----
- cmake/FindQuaZip.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
-index a387e2f81..9fab3e579 100644
---- a/cmake/FindQuaZip.cmake
-+++ b/cmake/FindQuaZip.cmake
-@@ -10,12 +10,12 @@ if(MINGW)
-     find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h)
- else()
-     find_library(QUAZIP_LIBRARIES
--        NAMES quazip5 quazip
-+        NAMES quazip5 quazip quazip1-qt5
- 	PATHS /usr/lib /usr/lib64 /usr/local/lib
-     )
-     find_path(QUAZIP_INCLUDE_DIR quazip.h
- 	PATHS /usr/include /usr/local/include
--        PATH_SUFFIXES quazip5 quazip
-+        PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip
-     )
-     find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include)
- endif()
diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
deleted file mode 100644
index e15340b81741..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( dev-libs/quazip:0= )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS=OFF
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.6.5.ebuild b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
deleted file mode 100644
index 4b62059e2dca..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( dev-libs/quazip:0= )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-	doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
-		printf '%s' "${PV}" > .version || die
-	fi
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS="$(usex doc)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 377737479d9c..44ca0b85d8d9 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake flag-o-matic xdg
 
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 11188e1e9afa..745c35e7fbf4 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,7 +2,7 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30
 DIST puppet-agent_7.11.0-1focal_amd64.deb 20968988 BLAKE2B 41c1464290fc38b9bb2a79384c6c427ec8cd1332b3ccba155cb26d43a87b36931415d3a54a10ae8f6a1322f02eeaef27147d4af7304f541ce38e668b072cc03c SHA512 38024f80af5ef69a1db22f9ed90b7b00af5183988b2029fa63a8b2fa1de1c189ba164d8cd450156c4d822a3e6404e5933ca09efdd4eeee7188c99791991a9921
-EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901
-EBUILD puppet-agent-7.10.0.ebuild 1964 BLAKE2B f5e86b40715313179474474ede2a92fd8d13cd548a23796094ebaec2e43ba60712b9a5fcfa496903a1cbd21595e89762ee427dc68def1f980c59a1fd1b9d1dba SHA512 3155da6f7e138a462e07cabb7ac78c14028bbfd801db1bbe747c5b3f42acdc5bf0c985590ca315950abafc23c85b5f1412e26f1c78146d5b3ab03904e2262bcf
-EBUILD puppet-agent-7.11.0.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
+EBUILD puppet-agent-6.19.1-r2.ebuild 2613 BLAKE2B 577e3273fed0cef3beac556bd864c48b913eb056312eb8fc8aa693cd01ce57779f263100c827e1f254d8996fe7b226dfd88cf778797cb18c659f660a3380f496 SHA512 eda78460fe3b5478ddab1433f43b7849800fd36f1cdf0a0dc302c52d872b53f4abc402b3a345d82800b2526ac3d30474dfb8f06f44f30b86eb3285a28bf57165
+EBUILD puppet-agent-7.10.0-r1.ebuild 2475 BLAKE2B fe0abbb691d683c9edbd966eb3676c2b0c0a05535f179af030a1392030aef2a0ae9da5aa1948f79390b364c64befc90cf785cf656f504e315a5d86ddac278f21 SHA512 49117ad9d47ea1d293db51c7cf4fecc68700aed007df48a76b3585fd195fadca8d0e3a6341c8fa586bbab35359b1ccffde4020eb734d8f06644105eb6dfa4b2b
+EBUILD puppet-agent-7.11.0-r1.ebuild 2476 BLAKE2B 61b7d8647f55e8324a77cf28394e4ff755017d66da20ff782303c829dfba9d0831bd5b17dd3a498acf1578053bce7d5e5b4f070a5e5b30887fc555258627fa17 SHA512 c99ee3447e1b5e93ae41551b99b9aef4c16c911a8a6f8a25847e45c5135550405ca6e3f0dd5c39f954e786b567e14ed5619b0c2db25cdcd09f41dc8d87149196
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
deleted file mode 100644
index e99c2fe2b84a..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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
-	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
-	dodir var/log/puppetlabs/puppet/
-	fperms 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/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	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 ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../../../usr/lib64/xcrypt/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-6.19.1-r2.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild
new file mode 100644
index 000000000000..8ef74d148ca4
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild
@@ -0,0 +1,91 @@
+# 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"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 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/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	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 ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild
new file mode 100644
index 000000000000..77dd8d3fbcfa
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild
@@ -0,0 +1,90 @@
+# 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"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+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
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
deleted file mode 100644
index 1af71eb6f52c..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/puppet-agent/puppet-agent-7.11.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild
new file mode 100644
index 000000000000..6e7e8d74150a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild
@@ -0,0 +1,90 @@
+# 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"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+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
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild
deleted file mode 100644
index c24ff0f353a2..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 60de3af59bf0..3c4ab76d8459 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -16,6 +16,6 @@ EBUILD syslog-ng-3.30.1-r2.ebuild 4889 BLAKE2B a84207505959119191dd2097e7e0c6dce
 EBUILD syslog-ng-3.30.1.ebuild 4839 BLAKE2B 92c837ecd1d724d06457e586dfc35e483ab233b7cd0ed9fbb461174c2659d9aba967aff62a33cec504f13b85656b8b736f61b0cb57bc70fcee96cda795bd7d91 SHA512 b02e32aa65e0df8ca222d219bf70ccbb0260b40e3db98db7a9ac37998e8059992f35a2bb9d03a5adb2d60756bf065e9a4aa1ddd94dacf40505a701bcf6c373ad
 EBUILD syslog-ng-3.31.2-r1.ebuild 4940 BLAKE2B d7d0f6fec4570cbe20336b8332d17930ee310d904540fce3cb83434b98227e8fb40e7b7cde5eccaa16fc2142660d626361fca11d42ba386cd9196e7b1faef72c SHA512 af3b35519d289d06b74eaa2be42190c862743b18c85cdf75ab67193d6bff386fef5df546ea9e04290fec8cef41aa909a2d716869ac9cdeec0aa2d4cc7fc184db
 EBUILD syslog-ng-3.32.1-r1.ebuild 4941 BLAKE2B d06d4fd5bc2104c335d46d626657e800712382b0e8db648d737efe2a7be53e4766fc2795179aa08ae749edb7b152d9d1e3292c248b51dcd3d69216b07743abce SHA512 f1d1449199a773fc8474690ac5d074eec485d4f7f142825d7982c8279c781e0f8427d4be6c256be1a8569560d75e98ea74ae742e3f5cfcd3511da2d73d15c83b
-EBUILD syslog-ng-3.33.2.ebuild 4891 BLAKE2B c50cf966763fcf8e17de802f5dca755bdb6d47485f6eefbcd5d1e9fbb026793be87e4a49bc58047f07edc275b7cf8e920498199574ce5df9bc6d8a8f4635aff6 SHA512 bb0a0e934b2f40f9d14662241d1d287adbc1c6a074a5bba8f1bef8dbec32307b62a443de096d5e0c8eff6b6b76f8dcbbc5b0f046e121c27c2cf62912a9e688ef
+EBUILD syslog-ng-3.33.2.ebuild 4888 BLAKE2B 226e92ef4117327c7707320a828dfe72d86430e71ab4eae5aaaa19ac246e06a915fc774bd176b8660d7d9757ea745201355a6e72bb08eed8a007b703e54a3514 SHA512 0bc35e7270f6ce112464173b644777d76e0216bc4a19415ff083d9833977c24553e258f009b54876dd72013a389b01c2d6fe3d870c1088770188d3793fd2a315
 EBUILD syslog-ng-3.34.1.ebuild 4883 BLAKE2B b4b36e9aa1a62149ae9187196b810d4d74cd7b7bf02d222fefffd3c8603bcb35aa47dbc4703c1cfbe1cc811463db0cdb112d279b98a4035aeb843635ebf98134 SHA512 95fcc558278b04d0fe7de1f41f7585f192de4da8071bbdc4f6cb6818c9bafdd9a20e05587e730567fa660a58e1cc5cb58e4025bcffcc1e4f22ce03e78ef2dcf3
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
diff --git a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
index cb84d5130b4f..01d0a75cd6db 100644
--- a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index a132631d58f8..fcf8fc194a17 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -3,5 +3,5 @@ AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1a
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
-EBUILD ulogd-2.0.7-r2.ebuild 3178 BLAKE2B 6e0e62cd8ec982001c973a78da705f229d7bca57878c3a96cba2f2ac86ccd53da3fafece16d0993c1bb931e670c50b7106c74778e7d22b669be17804eeb420d2 SHA512 2dfa6f9b8992537f343770c447574beb1eccd23bec5e294711f25f324507f154224ae1ec98494470d1d04c7b231d3460dd199b046855f068277707d46b411c74
+EBUILD ulogd-2.0.7-r3.ebuild 3180 BLAKE2B fb070ac8e21b2a0e41dc0854cbf3f6def729ffa6e4ee3441bc0d47be47ffd85728e625be8aa42958f46ba26bd5d204b5b91fcd70f52ce1923a8fa0e88aa984ee SHA512 70216e7ab49fae313d6c5c28b4deb5c5c0d5fa630d56da7d0562dbde3585997c4f97ce55b6c9bc9f71c06e44f427fdb0db5fa3bc6e686d10145021ef35830313
 MISC metadata.xml 908 BLAKE2B a03a79c9a3d2a9b6f0b59bd9593f7b506c2f95656bd0130e0282088b7b7822eeff98136675af356939f17f0e8f2cd32ec59836c7afe3278390e46b1e695f60aa SHA512 9b9ef498ad464f3e3cfc2c86f2fb3f7ec39f2cbf6134af63d6cff28fd523d977c8c154849ff1a10f574e9df346c06cf9fd3fdfa86be27e11e0d40352a7a8f170
diff --git a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild b/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
deleted file mode 100644
index c252351ca7ea..000000000000
--- a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-
-DEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.4
-		>=net-libs/libnetfilter_acct-1.0.3
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.1 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/ulogd
-	acct-group/ulogd
-	selinux? ( sec-policy/selinux-ulogd )
-"
-BDEPEND="
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-	You must have at least one logging stack enabled to make ulogd work.
-	Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-PATCHES=( "${FILESDIR}"/patches/ulogd.patch )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires a kernel >= 3.3."
-	fi
-
-	if use ulog && kernel_is ge 3 17 0; then
-		ewarn "ULOG target has been removed in the 3.17 kernel release."
-		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Change default settings to:
-	# - keep log files in /var/log/ulogd instead of /var/log;
-	# - create sockets in /run instead of /tmp.
-	sed -i \
-		-e "s|var/log|var/log/${PN}|g" \
-		-e 's|tmp|run|g' \
-		ulogd.conf.in || die
-}
-
-src_configure() {
-	append-lfs-flags
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation.
-		export VARTEXFONTS="${T}/fonts"
-		emake -C doc
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/${PN}.html )
-
-	default_src_install
-	find "${ED}" -name '*.la' -delete || die
-
-	readme.gentoo_create_doc
-	doman ${PN}.8
-
-	use doc && dodoc doc/${PN}.{dvi,ps,txt}
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild b/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
new file mode 100644
index 000000000000..541c2fb48846
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+DEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson:= )
+	nfacct? (
+		>=net-libs/libmnl-1.0.4
+		>=net-libs/libnetfilter_acct-1.0.3
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.1 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/ulogd
+	acct-group/ulogd
+	selinux? ( sec-policy/selinux-ulogd )
+"
+BDEPEND="
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+	You must have at least one logging stack enabled to make ulogd work.
+	Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+PATCHES=( "${FILESDIR}"/patches/ulogd.patch )
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires a kernel >= 3.3."
+	fi
+
+	if use ulog && kernel_is ge 3 17 0; then
+		ewarn "ULOG target has been removed in the 3.17 kernel release."
+		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Change default settings to:
+	# - keep log files in /var/log/ulogd instead of /var/log;
+	# - create sockets in /run instead of /tmp.
+	sed -i \
+		-e "s|var/log|var/log/${PN}|g" \
+		-e 's|tmp|run|g' \
+		ulogd.conf.in || die
+}
+
+src_configure() {
+	append-lfs-flags
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation.
+		export VARTEXFONTS="${T}/fonts"
+		emake -C doc
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/${PN}.html )
+
+	default_src_install
+	find "${ED}" -name '*.la' -delete || die
+
+	readme.gentoo_create_doc
+	doman ${PN}.8
+
+	use doc && dodoc doc/${PN}.{dvi,ps,txt}
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	use sqlite && dodoc doc/sqlite3.table
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/${PN}.conf
+	fperms 640 /etc/${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index c8b1f994bc77..dad0f0376e2f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -750,6 +750,8 @@ DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mo
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip 44497 BLAKE2B 5aa70e4f68346c12f87677bf98b54c3a5bd5ecc2520d1f3e616f943fb2e2a16ea7e79ec82c6f4dd753baee577aebb2660cabaa381b625396756fe7b5872c4395 SHA512 c1d971eeacff84a5f3d0f203222c34483b1db575bbe61f0991565dc1471ac5c8df1eb6f5252faafa2d2473d2781ccaca6e38d3de86833b05a3e2557ee91b6e90
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.mod 654 BLAKE2B 65d973ef48076c9b11dd7a9057efeccaa7851cf1d42273b9fc722577844861694bab90e578a47ae144c3b568a381ea3c5501a951bdb7936ff247cc2c177e48ea SHA512 8ee81d2dfdbcffb4615add255cbee4cc8f369a035b865c0fc74ec9126418e6265518afd0223fdf09da3957ab325ce6c29d81b539be704815e64dfd821bafafae
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.zip 87114 BLAKE2B 76bce3b85179d005480590256a54cf5b2e6e69151775b86bf2668016ac80adf096c2196d33c2b35e211e31f0106b80fcdbcc338ef437d28004d017789d74c16f SHA512 99a6b117ca1900782c6bf06ddc63fb17778113ec8aaf0637a6b3530d0df5d5bd43b3ab8a6117551f0581fb04a49362bf7e67f3a17e9c600c4b98675c2f5b718e
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.mod 654 BLAKE2B 65d973ef48076c9b11dd7a9057efeccaa7851cf1d42273b9fc722577844861694bab90e578a47ae144c3b568a381ea3c5501a951bdb7936ff247cc2c177e48ea SHA512 8ee81d2dfdbcffb4615add255cbee4cc8f369a035b865c0fc74ec9126418e6265518afd0223fdf09da3957ab325ce6c29d81b539be704815e64dfd821bafafae
+DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.zip 90572 BLAKE2B b226be15ed5f335cb55be0928e541a0b30ea6e7effd0dcd764df764f90030a1d31d3530dd243f7fd826c1c245dbacc2820dd29e4e5a00c314dd3e1d418bb6acc SHA512 07dc170f3088452ac16c050de6388fbfb70474e7a0d36ef6fa89ab191d93e7cf9927989dd779b84da5694e1be02be71155bdecd9b194b3b72fcd9387afa235b3
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod 407 BLAKE2B 3381c3a22697e706463c781960e46457b346cee86a0b087205f24cf12804abb21e99acca67889cab9cfbf71da3fb642e96528fbc09526c1a294a00f591aef437 SHA512 858e53248937d9cae085e23e61a4b76a9c2acc1e955efb36110b53bb9e4a19ff7d4c3cb6693c5bd340402b5cedba132147d93295910126a90c7842c4e972ac0b
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip 50978 BLAKE2B 5963eead988acf705c34af624e98b6187369a3fb7c77490d07d06e016f0c848004ea9614fe5e6cf1bc6b451a2503a4ede2e3f57f061832cdd23c73e23a246e9b SHA512 d7dbb67211fbeba11607e9fc76346d74b53c35a648da61ee796c4be46f24b56e195f025e9ad641aa0ab1f45f8cb3223dc9f1eb756638420dcfed30105b4e82b0
 DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod 32 BLAKE2B 40839230d4a1fd6d28597a39b0d98ac4aace76a96dcf2d222f073554b8df6de4fab48c0613b7bc2da1b4912e338ede282043a3f615a87c246bfd71488a671337 SHA512 614955fd74641e34555d843e335d5e35cf79dcc6e3b4d43bb0ba4fd6fed7d332365eb874d6bdb7c3b5be576dc3d09356c8206d1aa4d70378581001342f4f7310
@@ -1752,5 +1754,8 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST vault-1.8.2-webui.tar.xz 1382592 BLAKE2B e7df79275f65b601de577f1197b89c03bd4e299fb4c5ee67f5e91439a79c15eeb4b58946d4cf2c837ca88883c2d655ae86388f2f194a06f159c6580d4e6b1e59 SHA512 35c738be79fd956f09595045d7616599cfd7948baf2b774d0585c4cc12f9cfbd8bf262eb3c9a3969b96184560f2b2f7eb203271100a4ce452347d1100a5884b8
 DIST vault-1.8.2.tar.gz 20974085 BLAKE2B dbef32b3b1881f61053fed410c80caca253af9fd27d525eaf7e8b471af15d62c16423d35905302ccd4c32d7f2bc983a09d4ccbf2f835b7c60e2ac5067b17348c SHA512 fe203f68a8b2f91356a59ee5a5e072aad232bfb9b037c7673297240ddd6270936f144c9a25bcba399053ef0fbc756146cc0e9e9f3642f0fd07008d8ee003d793
+DIST vault-1.8.3-webui.tar.xz 1380524 BLAKE2B d4c401cb637aa83712c9433a2c252d052a130021981e68462cff31f5192ad4d138a2e0f754386ad49cd05cfef3afe4dff039f759410b4aca41107693a301a841 SHA512 e09c46af20a4174add3ba55ca2e011beb5b0a074798bd736d3a0b0cf245428f33cf10059aa97d16c6ac015ce39b9ee0e2ce9904eed220422dfe21c0ad6637a42
+DIST vault-1.8.3.tar.gz 20983018 BLAKE2B 31bf4d4bf69b195c4cc31d2ee5e1c129167c781f6b8844fe168dd0746683b955928edcb2a879e83638e5a15c3e4b5b751ff5de2e4fd24d2f038f9f3b4428808f SHA512 a5c9366697ed293a67558e50037f6f76dac02362db51878ac9845b07e436e3c27e39d811369e616308a00c42af2b86f47f9b346f2d4561ea1aaa2203c6e589c2
 EBUILD vault-1.8.2.ebuild 95865 BLAKE2B 6f72e3a4c990600d2f0b2cd189ca4d0502195edd05e7fc1f00d6788243f535705226d5a0faa1f44618e49081c1230b71431d4e949b47e6c1c4f39247255dadbb SHA512 33ad1aca41e2d07adcff741e7eb603f87dded3bb4c794eceb6bbfca694944c0cf28f9b7ce19762a7a8aba1c2c512e4b9a90667ac1ff04069d257f3600d18c103
+EBUILD vault-1.8.3.ebuild 95873 BLAKE2B 8f615858a56b44127f371fd4527d44c78456db7e3b8a4289078c37ba31c7fa6d69f33fb6be4be7df9e923633ef476a3412d4f336ba66e8c7f22177dcaf06f933 SHA512 54d4f18d44747171b59bc4ff14a5748315af685cea491b5e2fbe79357f38b0562ccdfc5366ee0598a14826a247d7f375b3b72ebd758e641b3fb4735388c8e37b
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.8.3.ebuild b/app-admin/vault/vault-1.8.3.ebuild
new file mode 100644
index 000000000000..c93e0a0edd28
--- /dev/null
+++ b/app-admin/vault/vault-1.8.3.ebuild
@@ -0,0 +1,1827 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.39.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.6.0"
+"cloud.google.com/go/bigquery v1.6.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/spanner v1.5.1"
+"cloud.google.com/go/spanner v1.5.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"git.apache.org/thrift.git v0.12.0/go.mod"
+"github.com/Azure/azure-pipeline-go v0.2.3"
+"github.com/Azure/azure-pipeline-go v0.2.3/go.mod"
+"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
+"github.com/Azure/azure-storage-blob-go v0.13.0"
+"github.com/Azure/azure-storage-blob-go v0.13.0/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.17"
+"github.com/Azure/go-autorest/autorest v0.11.17/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.7.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.4.0"
+"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/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"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Jeffail/gabs v1.1.1"
+"github.com/Jeffail/gabs v1.1.1/go.mod"
+"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+"github.com/Masterminds/goutils v1.1.0"
+"github.com/Masterminds/goutils v1.1.0/go.mod"
+"github.com/Masterminds/semver v1.4.2/go.mod"
+"github.com/Masterminds/semver v1.5.0"
+"github.com/Masterminds/semver v1.5.0/go.mod"
+"github.com/Masterminds/sprig v2.22.0+incompatible"
+"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.13/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
+"github.com/Microsoft/hcsshim v0.8.14"
+"github.com/Microsoft/hcsshim v0.8.14/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/SAP/go-hdb v0.14.1"
+"github.com/SAP/go-hdb v0.14.1/go.mod"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/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/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/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/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod"
+"github.com/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.3/go.mod"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-metrics v0.3.7"
+"github.com/armon/go-metrics v0.3.7/go.mod"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.27/go.mod"
+"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+"github.com/aws/aws-sdk-go v1.37.19"
+"github.com/aws/aws-sdk-go v1.37.19/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/aws/aws-sdk-go-v2 v1.3.2"
+"github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/config v1.1.5"
+"github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/credentials v1.1.5"
+"github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6"
+"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod"
+"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2"
+"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4"
+"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6"
+"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2"
+"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0"
+"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5"
+"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2"
+"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod"
+"github.com/aws/smithy-go v1.3.1"
+"github.com/aws/smithy-go v1.3.1/go.mod"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod"
+"github.com/bitly/go-hostpool v0.1.0"
+"github.com/bitly/go-hostpool v0.1.0/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod"
+"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible"
+"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+"github.com/cenkalti/backoff/v3 v3.0.0"
+"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/apd v1.1.0"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
+"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.3"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+"github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod"
+"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe"
+"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
+"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.2.1+incompatible"
+"github.com/coreos/go-oidc v2.2.1+incompatible/go.mod"
+"github.com/coreos/go-oidc/v3 v3.0.0"
+"github.com/coreos/go-oidc/v3 v3.0.0/go.mod"
+"github.com/coreos/go-semver v0.2.0"
+"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-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/couchbase/gocb/v2 v2.1.4"
+"github.com/couchbase/gocb/v2 v2.1.4/go.mod"
+"github.com/couchbase/gocbcore/v9 v9.0.4"
+"github.com/couchbase/gocbcore/v9 v9.0.4/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.7.5"
+"github.com/digitalocean/godo v1.7.5/go.mod"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.1"
+"github.com/dimchansky/utfbom v1.1.1/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dsnet/compress v0.0.1"
+"github.com/dsnet/compress v0.0.1/go.mod"
+"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/color v1.11.0"
+"github.com/fatih/color v1.11.0/go.mod"
+"github.com/fatih/structs v1.1.0"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/frankban/quicktest v1.4.0/go.mod"
+"github.com/frankban/quicktest v1.4.1/go.mod"
+"github.com/frankban/quicktest v1.10.0/go.mod"
+"github.com/frankban/quicktest v1.13.0"
+"github.com/frankban/quicktest v1.13.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.5.1"
+"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
+"github.com/go-errors/errors v1.0.1"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/kit v0.10.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
+"github.com/go-ldap/ldap/v3 v3.2.4"
+"github.com/go-ldap/ldap/v3 v3.2.4/go.mod"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+"github.com/go-sql-driver/mysql v1.5.0"
+"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.1/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/go-test/deep v1.0.7"
+"github.com/go-test/deep v1.0.7/go.mod"
+"github.com/go-yaml/yaml v2.1.0+incompatible"
+"github.com/go-yaml/yaml v2.1.0+incompatible/go.mod"
+"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+"github.com/gobuffalo/depgen v0.1.0/go.mod"
+"github.com/gobuffalo/envy v1.6.15/go.mod"
+"github.com/gobuffalo/envy v1.7.0/go.mod"
+"github.com/gobuffalo/flect v0.1.0/go.mod"
+"github.com/gobuffalo/flect v0.1.1/go.mod"
+"github.com/gobuffalo/flect v0.1.3/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+"github.com/gobuffalo/genny v0.1.0/go.mod"
+"github.com/gobuffalo/genny v0.1.1/go.mod"
+"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+"github.com/gobuffalo/gogen v0.1.0/go.mod"
+"github.com/gobuffalo/gogen v0.1.1/go.mod"
+"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+"github.com/gobuffalo/mapi v1.0.1/go.mod"
+"github.com/gobuffalo/mapi v1.0.2/go.mod"
+"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+"github.com/gobuffalo/packd v0.1.0/go.mod"
+"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309/go.mod"
+"github.com/godbus/dbus/v5 v5.0.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.1"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/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.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/golang/snappy v0.0.2/go.mod"
+"github.com/golang/snappy v0.0.4"
+"github.com/golang/snappy v0.0.4/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/flatbuffers v1.11.0"
+"github.com/google/flatbuffers v1.11.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-github v17.0.0+incompatible"
+"github.com/google/go-github v17.0.0+incompatible/go.mod"
+"github.com/google/go-metrics-stackdriver v0.2.0"
+"github.com/google/go-metrics-stackdriver v0.2.0/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.1.0/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/mux v1.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/securecookie v1.1.1"
+"github.com/gorilla/securecookie v1.1.1/go.mod"
+"github.com/gorilla/sessions v1.2.0"
+"github.com/gorilla/sessions v1.2.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.1"
+"github.com/gorilla/websocket v1.4.1/go.mod"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"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"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod"
+"github.com/hashicorp/cap v0.1.0"
+"github.com/hashicorp/cap v0.1.0/go.mod"
+"github.com/hashicorp/consul-template v0.26.0"
+"github.com/hashicorp/consul-template v0.26.0/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/api v1.4.0"
+"github.com/hashicorp/consul/api v1.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/errwrap v1.1.0"
+"github.com/hashicorp/errwrap v1.1.0/go.mod"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.2"
+"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0/go.mod"
+"github.com/hashicorp/go-gatedio v0.5.0"
+"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.7.0"
+"github.com/hashicorp/go-gcp-common v0.7.0/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+"github.com/hashicorp/go-hclog v0.16.1"
+"github.com/hashicorp/go-hclog v0.16.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping v0.5.16"
+"github.com/hashicorp/go-kms-wrapping v0.5.16/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.2"
+"github.com/hashicorp/go-memdb v1.0.2/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-msgpack v1.1.5"
+"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.1"
+"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1"
+"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod"
+"github.com/hashicorp/go-slug v0.4.1"
+"github.com/hashicorp/go-slug v0.4.1/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-tfe v0.12.0"
+"github.com/hashicorp/go-tfe v0.12.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.0.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hcl v1.0.1-vault-3"
+"github.com/hashicorp/hcl v1.0.1-vault-3/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod"
+"github.com/hashicorp/raft v1.0.1/go.mod"
+"github.com/hashicorp/raft v1.1.0/go.mod"
+"github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft v1.3.0"
+"github.com/hashicorp/raft v1.3.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.3"
+"github.com/hashicorp/raft-autopilot v0.1.3/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod"
+"github.com/hashicorp/raft-snapshot v1.0.3"
+"github.com/hashicorp/raft-snapshot v1.0.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1/go.mod"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1/go.mod"
+"github.com/hashicorp/vault-plugin-mock v0.16.1"
+"github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.3.2"
+"github.com/huandu/xstrings v1.3.2/go.mod"
+"github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod"
+"github.com/hudl/fargo v1.3.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod"
+"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jarcoal/httpmock v1.0.4/go.mod"
+"github.com/jarcoal/httpmock v1.0.5"
+"github.com/jarcoal/httpmock v1.0.5/go.mod"
+"github.com/jcmturner/aescts v1.0.1"
+"github.com/jcmturner/aescts v1.0.1/go.mod"
+"github.com/jcmturner/dnsutils v1.0.1"
+"github.com/jcmturner/dnsutils v1.0.1/go.mod"
+"github.com/jcmturner/gofork v1.0.0"
+"github.com/jcmturner/gofork v1.0.0/go.mod"
+"github.com/jcmturner/goidentity/v6 v6.0.1"
+"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
+"github.com/jcmturner/gokrb5/v8 v8.0.0"
+"github.com/jcmturner/gokrb5/v8 v8.0.0/go.mod"
+"github.com/jcmturner/rpc/v2 v2.0.2"
+"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod"
+"github.com/jefferai/jsonx v1.0.0"
+"github.com/jefferai/jsonx v1.0.0/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joho/godotenv v1.3.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+"github.com/json-iterator/go v1.1.5/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/karrick/godirwalk v1.8.0/go.mod"
+"github.com/karrick/godirwalk v1.10.3/go.mod"
+"github.com/kelseyhightower/envconfig v1.3.0/go.mod"
+"github.com/kelseyhightower/envconfig v1.4.0"
+"github.com/kelseyhightower/envconfig v1.4.0/go.mod"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.4.1/go.mod"
+"github.com/klauspost/compress v1.9.5"
+"github.com/klauspost/compress v1.9.5/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/lestrrat-go/jwx v0.9.0/go.mod"
+"github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/lib/pq v1.2.0/go.mod"
+"github.com/lib/pq v1.8.0"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+"github.com/markbates/safe v1.0.1/go.mod"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-ieproxy v0.0.1"
+"github.com/mattn/go-ieproxy v0.0.1/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/mattn/go-shellwords v1.0.12"
+"github.com/mattn/go-shellwords v1.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mholt/archiver v3.1.1+incompatible"
+"github.com/mholt/archiver v3.1.1+incompatible/go.mod"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.40"
+"github.com/miekg/dns v1.1.40/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/cli v1.1.2"
+"github.com/mitchellh/cli v1.1.2/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/gox v1.0.1"
+"github.com/mitchellh/gox v1.0.1/go.mod"
+"github.com/mitchellh/hashstructure v1.0.0"
+"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.2.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2/go.mod"
+"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwielbut/pointy v1.1.0"
+"github.com/mwielbut/pointy v1.1.0/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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod"
+"github.com/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/ncw/swift v1.0.47"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nwaples/rardecode v1.1.0"
+"github.com/nwaples/rardecode v1.1.0/go.mod"
+"github.com/oklog/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/okta/okta-sdk-golang v1.1.0"
+"github.com/okta/okta-sdk-golang v1.1.0/go.mod"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.7.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.1/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+"github.com/opencontainers/runc v0.1.1/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc9"
+"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/openlyinc/pointy v1.1.2"
+"github.com/openlyinc/pointy v1.1.2/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.3/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/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
+"github.com/oracle/oci-go-sdk v12.5.0+incompatible"
+"github.com/oracle/oci-go-sdk v12.5.0+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.4+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.5+incompatible"
+"github.com/ory/dockertest v3.3.5+incompatible/go.mod"
+"github.com/ory/dockertest/v3 v3.6.2"
+"github.com/ory/dockertest/v3 v3.6.2/go.mod"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.7.0/go.mod"
+"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/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/pierrec/lz4 v2.2.6+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.3.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-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-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.7.0/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.11.1"
+"github.com/prometheus/common v0.11.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rogpeppe/go-internal v1.6.2"
+"github.com/rogpeppe/go-internal v1.6.2/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da"
+"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/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sethvargo/go-limiter v0.7.1"
+"github.com/sethvargo/go-limiter v0.7.1/go.mod"
+"github.com/shirou/gopsutil v3.21.5+incompatible"
+"github.com/shirou/gopsutil v3.21.5+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/snowflakedb/gosnowflake v1.6.1"
+"github.com/snowflakedb/gosnowflake v1.6.1/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/sony/gobreaker v0.4.1/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/square/go-jose v2.4.1+incompatible/go.mod"
+"github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod"
+"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v1.2.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible/go.mod"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tidwall/pretty v1.0.1"
+"github.com/tidwall/pretty v1.0.1/go.mod"
+"github.com/tklauser/go-sysconf v0.3.6"
+"github.com/tklauser/go-sysconf v0.3.6/go.mod"
+"github.com/tklauser/numcpus v0.2.2"
+"github.com/tklauser/numcpus v0.2.2/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/ulikunitz/xz v0.5.6/go.mod"
+"github.com/ulikunitz/xz v0.5.7"
+"github.com/ulikunitz/xz v0.5.7/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.2/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+"github.com/xdg/stringprep v1.0.0"
+"github.com/xdg/stringprep v1.0.0/go.mod"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yandex-cloud/go-genproto v0.0.0-20200722140432-762fe965ce77/go.mod"
+"github.com/yandex-cloud/go-sdk v0.0.0-20200722140627-2194e5077f13/go.mod"
+"github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.4/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547/go.mod"
+"go.mongodb.org/atlas v0.7.1"
+"go.mongodb.org/atlas v0.7.1/go.mod"
+"go.mongodb.org/mongo-driver v1.4.2/go.mod"
+"go.mongodb.org/mongo-driver v1.4.6"
+"go.mongodb.org/mongo-driver v1.4.6/go.mod"
+"go.opencensus.io v0.19.1/go.mod"
+"go.opencensus.io v0.19.2/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"go.opencensus.io v0.20.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opentelemetry.io/otel v0.20.0"
+"go.opentelemetry.io/otel v0.20.0/go.mod"
+"go.opentelemetry.io/otel/metric v0.20.0"
+"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/oteltest v0.20.0"
+"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk v0.20.0"
+"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+"go.opentelemetry.io/otel/trace v0.20.0"
+"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/atomic v1.5.0/go.mod"
+"go.uber.org/atomic v1.6.0"
+"go.uber.org/atomic v1.6.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.3.0/go.mod"
+"go.uber.org/multierr v1.5.0"
+"go.uber.org/multierr v1.5.0/go.mod"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.13.0/go.mod"
+"go.uber.org/zap v1.14.1"
+"go.uber.org/zap v1.14.1/go.mod"
+"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/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-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.4.0"
+"golang.org/x/mod v0.4.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-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-20190206173232-65e2d4e15006/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod"
+"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+"golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/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-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
+"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod"
+"golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod"
+"golang.org/x/tools v0.0.0-20200521155704-91d71f6c2f04/go.mod"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/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-20181220000619-583d854617af/go.mod"
+"google.golang.org/api v0.2.0/go.mod"
+"google.golang.org/api v0.3.0/go.mod"
+"google.golang.org/api v0.3.1/go.mod"
+"google.golang.org/api v0.3.2/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.5.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.21.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.29.0"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.2.0/go.mod"
+"google.golang.org/appengine v1.3.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
+"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
+"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod"
+"google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc 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.21.1/go.mod"
+"google.golang.org/grpc v1.22.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.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.28.1/go.mod"
+"google.golang.org/grpc v1.29.1"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.0/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.42.0"
+"gopkg.in/ini.v1 v1.42.0/go.mod"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.7/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2"
+"gotest.tools/v3 v3.0.2/go.mod"
+"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+"honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod"
+"k8s.io/api v0.18.2"
+"k8s.io/api v0.18.2/go.mod"
+"k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod"
+"k8s.io/apimachinery v0.18.2"
+"k8s.io/apimachinery v0.18.2/go.mod"
+"k8s.io/client-go v0.18.2"
+"k8s.io/client-go v0.18.2/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod"
+"mvdan.cc/gofumpt v0.1.1"
+"mvdan.cc/gofumpt v0.1.1/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+go-module_set_globals
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+PATCHES=( "${FILESDIR}"/vault-1.8.2-go-limiter.patch )
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=readonly" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index bb2cefe80b53..3fae4727c89f 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 01f603cacdf0..c6ed177d4866 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -17,5 +17,5 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
 DIST clamav-0.103.3.tar.gz 13389239 BLAKE2B 1846cceed39fbd48fcf973d05a57901cf6f9ccdbb4d7eae501e712d84ab4d0a662e4477696aa6a1446116db85a89603428d7092a55e18f7acb805016d3cd5431 SHA512 c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f
 EBUILD clamav-0.103.2.ebuild 7395 BLAKE2B a014956d708aacb1c5904c57cb9c42b4c9255282f6718e6f37afba75dac7dd07da84e2cc17afb85ccab136e7d9c206ddd13257dbe6d3eb2a7c3c865b38cdd61f SHA512 bfdf8fe0ec764c7c165eaad8c090a33f182bf6e781745ac2eeb3ac51186d4128a8acff0ead73e4d5352e432c56ba9d6727f0cbea8c35dc6a6f552495c62deb28
-EBUILD clamav-0.103.3-r1.ebuild 7407 BLAKE2B b303165f3eb4bb6548430b70fee1a80a0089e9dce1c1426f3af4f024480026d562b0821f786c2cbfbf49e7d4f3b3230eac9014c0efcab7b7fde6a8c651ec5ec7 SHA512 bf3730cf38f9d601f4082fa614dadb063295e6ad6625dd726caf3465b4560f8cd33f3360c4c7c0ef3e43a8644f29c451e26898de4d9bd10911d73ee20ffdf5f9
+EBUILD clamav-0.103.3-r1.ebuild 7406 BLAKE2B 5f33b82341474bd154e1f4dd93b02beda562edebe8c014d33734ba1b3890be34d9110289f70d9c28e6d2f8e527a3cec2c886240a3dd7c1cf067d42d1314091cc SHA512 14988d294e03bce06ab3ff66ad33dcf3c1f86f34040aee1845a1ccf61c7d4d96caf86eac208ec70d79780c135df5f5e2658f5872b42c2ab2ffbff8035a2c4a0a
 MISC metadata.xml 1060 BLAKE2B 77fa5fa0a2d6bd96b1ec797d42f7f626decf3c98c1563e87af503268f4f09d0a01f38651174546dd835476b635ae5a6a0535acd06849f58c2bbf41993d8a7ffc SHA512 334cc919ca47d8045ab61193e39f7dbf86a58d7619a193ed31da5cd5f82c99c2af210790d75f60f9951097915fa6805f5aa79f90efb3551322c9f0e54fc68e99
diff --git a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
index 232af95e06e5..3128b1c31043 100644
--- a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 61af6601ede7..d906075f17f8 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 7ca2127e6772..e6c0e5cd6639 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,4 +1,4 @@
 AUX advancecomp-2.2_pre20190301-gcc-11.patch 7012 BLAKE2B ba239903860dbebec89d102f7417bc1db83129a762dfa59ed81ea46ef0ca58720556f0e697a05a995d095f1f33540538dcebeff98bc228b870ff84e267a51fa1 SHA512 a122abb506667203d202da35796f4f59bf050aa25edeec644bbf9c6ccd2fb841c1b3e8df9b782af0d84dd6362d2722044cc54d53c5923da5a47fc6296322d16e
 DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
-EBUILD advancecomp-2.2_pre20190301.ebuild 1047 BLAKE2B 38f4a51875c94066ca1145cef0c9da2dadcb99126b81cbe7752b82fcc61db2f7381ffd94adf6d60d5a23c93b6da6e2f04c608dbb2a348bf61d46d97e3b9f7474 SHA512 cf1fbb54db472e22fd28385e789a2e79030b6edf7d3f109ab74a4a5a5f4c608b5ca0f103112384d5c5e82910987aff680c18c31dd8ad64cc35a0ce281b1f23fd
+EBUILD advancecomp-2.2_pre20190301.ebuild 1054 BLAKE2B a58fa4afccfd0f3dc6173956babef1de8010d147ceb7ca6c7f3f858da98a85ac80d797d84e7aaba4846c83eb15d8459125ed7bd25b39f9d08d993dd0fd015adc SHA512 4d9a5fb0a46f6b1179a7d11dc6e764adedc8a9eb2f971c59e1a3942ffb3635bc3bca49643942e0acd2c4daa67c2185d33eb606968051f41e73e6af8b87b08cfd
 MISC metadata.xml 390 BLAKE2B ff0e188cad31daa60b4298b09a40fbbeb0d2b95ef7bf7a78df9c3acba7421ceea5511b1654c2c15acd59efd53dc6e2f222037201bf2f66c2d8abd9d888c4138f SHA512 5f2bdc25546d01a5a3b785fc5b659dc1d0f53a12f992cab12bc14790f82b6401bb8dd65f5bddb32f59ea458fa2cc913f7b1641cf36827207f7aa2875d9488ef8
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
index edb31f6a8c44..b13f318de57e 100644
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="app-arch/bzip2:=
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 4375aebdde8f..c95929789f6d 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
 DIST lxqt-archiver-0.4.0.tar.xz 167124 BLAKE2B 2d9295200c284e2dc0c2b538a92952dd0a11882211e5d1d5838141583b4a595b65c26a057e5c9733190182a5f78958e15d0e086356d75dd4e0c72d3510a34cfc SHA512 e1b323cd118af3726009e153c4f9766ec53b29fa0280530da16e2101d36ec45b55de0fe3d87c1386a4e5b3d88712fd209659b4ebb9344af689812600ae136ed6
-EBUILD lxqt-archiver-0.3.0.ebuild 1173 BLAKE2B ed90bcdc16bfe9a9401ef0ee07cbba79cf7c1bba6dd4f87be0a535442f96f63c69b534bb62d0a6767dd974d6ea92c7ad3f05ca8710b66e1f117ac477dbee1f28 SHA512 7396a031b3c47f978d67a01f2cef96cfd7bfd3375b8c409bf6af5dd22f438eb922379d4c70c000f8ac0f56bb7f2652c76598bd962a42911b7e3bdcea5a117385
 EBUILD lxqt-archiver-0.4.0.ebuild 1180 BLAKE2B e683fb27236235e2dce15e1d957a435be42a953585cd16b881766808e510e390b42b7b7a199d0929d4f51ed8b1de360e78e8e45537f38b5378152da4b2658f95 SHA512 0cef2d37e234144395e7569790be0a2b84b1b67568559da56769cb68dd8af92aa6220d3d6f961904a08ae573a78810f9e09a6e840b08bfbcdd9fb3a72327e3cd
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
deleted file mode 100644
index e976f452fb32..000000000000
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI File Archiver"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-libs/json-glib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-qt-0.16.0
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Please note that this is only a graphical front-end, and additional"
-	elog "packages are needed to have support for specific file formats."
-	elog "For example, to be able to work with the 7-Zip format, the"
-	elog "'app-arch/p7zip' package may be used."
-	elog "For the full list of supported formats, see the 'README.md' file:"
-	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 0047b2136197..c0b96dad25c0 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,3 +1,3 @@
 DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de
-EBUILD pax-20201030.ebuild 894 BLAKE2B 197e13e545e827d119a5f81d577f8922778502523c6aef90ff0b5a8ab73b4695bf8d08247c0ad7306c0ba6ee0c62bdb71b5e5aa952b4d2044dad1882785fc75e SHA512 07c175cec34ce8315e8e770cb57dc572a92a67f1e7383ff9c34b0b074668a8151f27f8b4b87268b0f18d32c14360b68491cb9fcddc42e44ce73dab16b5778fff
+EBUILD pax-20201030.ebuild 901 BLAKE2B 8dfeb7355f36383b10057691fc8dc538b292e8b389ffc7c32cb97861625451fd64ea269b1d106572a474acfad30570a8f14725597642f9f1acfc353af217117c SHA512 b9a6a8103b417cd554d63b4a604b6bf16c212486916e208dfa9cb9e62169e5bb77871da938f4f85685d0349ce1dc07efb2f9063140e678a98f7a1daa84e58cfe
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-arch/pax/pax-20201030.ebuild b/app-arch/pax/pax-20201030.ebuild
index 168e4b44d8d6..af1a475b6593 100644
--- a/app-arch/pax/pax-20201030.ebuild
+++ b/app-arch/pax/pax-20201030.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index feed07a707f0..9dccffa907a6 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 16c69faf8bb5..8214c78bbbae 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -15,7 +15,7 @@ AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b1718
 DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
 DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
-EBUILD bareos-18.2.12.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
-EBUILD bareos-19.2.11.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
-EBUILD bareos-20.0.3.ebuild 11418 BLAKE2B 70dd2c423d7857a6836ae2ac1c12983e69a50dd3f2a5370c0190fb025a7d147ab32ebaced6639b681bbddd4472fffd89eeda903b4589c020ebe1b5600919e321 SHA512 ffa4ef23c32fcf36c2b42e541cf2916feab55022205abcd6a79bf6d1d0f6e6257577f55ee40364c95c533f5234a4364fb679850245f59c551c6a0c4b898c1ed5
+EBUILD bareos-18.2.12-r1.ebuild 11168 BLAKE2B 952379f3531292e6b20e0e81d9be6d8384b8a76b1747a340310032c1ed0cf5b38415e6b6fc4edafb46b4e836cebce2dc73532fcc7b5737b1464deecec3c1e3ca SHA512 f8878820c0eeb8fc178b65579fe55230b8534b9e37b69ccacb1818635066a8fca016dbd818394b9b1e5916b49c31cee24abb9591dcbc7ed2a094146bb18adb41
+EBUILD bareos-19.2.11-r1.ebuild 10915 BLAKE2B c0101e1fd5a33994bb42b9a460fca12ed422eb4a99a23d6e7333c29b94bf117c39efb1cde61f82b9fda9a00ccc0452187ab8a74ccf6d4e3fdcd813fc9d219908 SHA512 0880c16abaad7ad94bdb75d77e4069994872bfb74b03f496127a936c46d21bb5bf2bbc5b8c078d9a0ecdd3aca40845d72b67bd475b006edabfd57657401979b4
+EBUILD bareos-20.0.3-r2.ebuild 11407 BLAKE2B 3892f00374c4da0f3447ae12308f8147cbadfa6d5f5a3c8995eeeb2d69312317d80233ce25ad4a47bad021917b9a4aab0a29d2ea842470d9bb3737f991297243 SHA512 72441b8e5d54836691209c8e4e9de9b9371c59a8e698095e47c82341d5885ee9070e1556bbce26674da0560362790248c496c70a58d7a80a752f2b4724e86d88
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
diff --git a/app-backup/bareos/bareos-18.2.12-r1.ebuild b/app-backup/bareos/bareos-18.2.12-r1.ebuild
new file mode 100644
index 000000000000..c40c79602918
--- /dev/null
+++ b/app-backup/bareos/bareos-18.2.12-r1.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit desktop systemd cmake
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
+	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	cephfs? ( sys-cluster/ceph )
+	rados? ( sys-cluster/ceph )
+	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson:= )
+		)
+	)
+	fastlz? ( dev-libs/bareos-fastlzlib )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!gnutls? (
+				dev-libs/openssl:0=[static-libs]
+			)
+			gnutls? ( net-libs/gnutls[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		ssl? (
+			!gnutls? (
+				dev-libs/openssl:0=
+			)
+			gnutls? ( net-libs/gnutls )
+		)
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="static? ( clientonly )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+	use mysql    && export mydbtypes+=( mysql )
+	use postgres && export mydbtypes+=( postgresql )
+	use sqlite   && export mydbtypes+=( sqlite )
+
+	# enables default database driver in catalog
+	pushd core/src/defaultconfigs >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
+			|| die "sed on MyCatalog.conf.in failed"
+	popd >&/dev/null || die
+
+	eapply -p0 "${FILESDIR}/bareos-cmake-rados.patch"
+
+	# fix gentoo version detection
+	eapply -p0 "${FILESDIR}/bareos-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
+
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory filed
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
+	eapply_user
+
+	CMAKE_USE_DIR="$S/core"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	CMAKE_USE_DIR="$S/core"
+
+	pushd core/platforms >&/dev/null || die
+	cmake_comment_add_subdirectory '${DISTNAME}'
+	popd >&/dev/null || die
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=YES
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
+		systemd fastlz mysql lmdb glusterfs rados \
+		rados-striper cephfs jansson; do
+
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
+		-Dx=$(usex X)
+		-Dpostgresql=$(usex postgres)
+		-Dmysql=$(usex mysql)
+		-Dsqlite3=$(usex sqlite)
+		-Dopenssl=$(usex ssl)
+		-Dtcp-wrapper=$(usex tcpd)
+		-Dlibdir=/usr/$(get_libdir)
+		-Dsbindir=/usr/sbin
+		-Dmandir=/usr/share/man
+		-Ddocdir=/usr/share/doc/${PF}
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dpiddir=/run/bareos
+		-Dsysconfdir=/etc
+		-Dconfdir=/etc/bareos
+		-Dsubsys-dir=/run/lock/subsys
+		-Dworkingdir=/var/lib/bareos
+		-Dlogdir=/var/log/bareos
+		-Dscriptdir=/usr/libexec/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Ddir-user=bareos
+		-Ddir-group=bareos
+		-Dsd-user=root
+		-Dsd-group=bareos
+		-Dfd-user=root
+		-Dfd-group=bareos
+		-Dsbin-perm=0755
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dbatch-insert=yes
+		-Dhost=${CHOST}
+		-Dcoverage=no
+		-Dpython=no
+		-Dsmartalloc=yes
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dbasename="`hostname -s`"
+		-Dhostname="`hostname -s`"
+		)
+
+		cmake_src_configure
+}
+
+src_install() {
+	#emake DESTDIR="${D}" install
+	cmake_src_install
+	newicon core/src/images/bareos_logo_shadow.png bareos.png
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/bareos-18.2.12.ebuild b/app-backup/bareos/bareos-18.2.12.ebuild
deleted file mode 100644
index 996c4c35ce13..000000000000
--- a/app-backup/bareos/bareos-18.2.12.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit desktop systemd cmake
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb
-	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
-	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
-REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
-
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	cephfs? ( sys-cluster/ceph )
-	rados? ( sys-cluster/ceph )
-	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		director? (
-			virtual/mta
-			jansson? ( dev-libs/jansson )
-		)
-	)
-	fastlz? ( dev-libs/bareos-fastlzlib )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		ssl? (
-			!gnutls? (
-				dev-libs/openssl:0=[static-libs]
-			)
-			gnutls? ( net-libs/gnutls[static-libs] )
-		)
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		ssl? (
-			!gnutls? (
-				dev-libs/openssl:0=
-			)
-			gnutls? ( net-libs/gnutls )
-		)
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="static? ( clientonly )"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-src_prepare() {
-	use mysql    && export mydbtypes+=( mysql )
-	use postgres && export mydbtypes+=( postgresql )
-	use sqlite   && export mydbtypes+=( sqlite )
-
-	# enables default database driver in catalog
-	pushd core/src/defaultconfigs >&/dev/null || die
-		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
-			|| die "sed on MyCatalog.conf.in failed"
-	popd >&/dev/null || die
-
-	eapply -p0 "${FILESDIR}/bareos-cmake-rados.patch"
-
-	# fix gentoo version detection
-	eapply -p0 "${FILESDIR}/bareos-cmake-gentoo.patch"
-
-	# fix missing DESTDIR in symlink creation
-	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
-
-	# disable dird and stored plugins, because of
-	# py2 dependency
-	cd "${S}/core/src/plugins"
-	cmake_comment_add_subdirectory filed
-	cmake_comment_add_subdirectory dird
-	cmake_comment_add_subdirectory stored
-	cd -
-
-	eapply_user
-
-	CMAKE_USE_DIR="$S/core"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	CMAKE_USE_DIR="$S/core"
-
-	pushd core/platforms >&/dev/null || die
-	cmake_comment_add_subdirectory '${DISTNAME}'
-	popd >&/dev/null || die
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=YES
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
-		systemd fastlz mysql lmdb glusterfs rados \
-		rados-striper cephfs jansson; do
-
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
-		-Dx=$(usex X)
-		-Dpostgresql=$(usex postgres)
-		-Dmysql=$(usex mysql)
-		-Dsqlite3=$(usex sqlite)
-		-Dopenssl=$(usex ssl)
-		-Dtcp-wrapper=$(usex tcpd)
-		-Dlibdir=/usr/$(get_libdir)
-		-Dsbindir=/usr/sbin
-		-Dmandir=/usr/share/man
-		-Ddocdir=/usr/share/doc/${PF}
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dpiddir=/run/bareos
-		-Dsysconfdir=/etc
-		-Dconfdir=/etc/bareos
-		-Dsubsys-dir=/run/lock/subsys
-		-Dworkingdir=/var/lib/bareos
-		-Dlogdir=/var/log/bareos
-		-Dscriptdir=/usr/libexec/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Ddir-user=bareos
-		-Ddir-group=bareos
-		-Dsd-user=root
-		-Dsd-group=bareos
-		-Dfd-user=root
-		-Dfd-group=bareos
-		-Dsbin-perm=0755
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dbatch-insert=yes
-		-Dhost=${CHOST}
-		-Dcoverage=no
-		-Dpython=no
-		-Dsmartalloc=yes
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dbasename="`hostname -s`"
-		-Dhostname="`hostname -s`"
-		)
-
-		cmake_src_configure
-}
-
-src_install() {
-	#emake DESTDIR="${D}" install
-	cmake_src_install
-	newicon core/src/images/bareos_logo_shadow.png bareos.png
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bareos-dir)
-				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	diropts -m0755
-	keepdir /var/log/bareos
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		if use postgres; then
-			einfo
-			einfo "For postgresql:"
-			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
-		fi
-		if use mysql; then
-			einfo
-			einfo "For mysql:"
-			einfo
-			einfo "  Make sure root has direct access to your mysql server. You may want to"
-			einfo "  create a /root/.my.cnf file with"
-			einfo "    [client]"
-			einfo "    user=root"
-			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
-			einfo "  before running:"
-			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
-			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
-			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
-		fi
-		einfo
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bareos does not officially support SQLite database."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-		einfo "It is strongly recommended to use either postgresql or mysql as"
-		einfo "catalog database backend."
-		einfo
-	fi
-}
diff --git a/app-backup/bareos/bareos-19.2.11-r1.ebuild b/app-backup/bareos/bareos-19.2.11-r1.ebuild
new file mode 100644
index 000000000000..f2b7fc690b8d
--- /dev/null
+++ b/app-backup/bareos/bareos-19.2.11-r1.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+	logwatch mysql ndmp +postgres readline scsi-crypto
+	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson:= )
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		dev-libs/openssl:0=[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+BDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="
+	!clientonly? ( || ( mysql postgres sqlite ) )
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+	use mysql    && export mydbtypes+=( mysql )
+	use postgres && export mydbtypes+=( postgresql )
+	use sqlite   && export mydbtypes+=( sqlite )
+
+	# enables default database driver in catalog
+	pushd core/src/defaultconfigs >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
+			|| die "sed on MyCatalog.conf.in failed"
+	popd >&/dev/null || die
+
+	# fix gentoo version detection
+	eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
+	CMAKE_USE_DIR="$S/core"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	CMAKE_USE_DIR="$S/core"
+
+	pushd core/platforms >&/dev/null || die
+	cmake_comment_add_subdirectory '${DISTNAME}'
+	popd >&/dev/null || die
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd mysql lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmysql=$(usex mysql)
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dpostgresql=$(usex postgres)
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsqlite3=$(usex sqlite)
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove timelimit to fix #778557
+	rm -f "${D}"/usr/{,s}bin/timelimit
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/bareos-19.2.11.ebuild b/app-backup/bareos/bareos-19.2.11.ebuild
deleted file mode 100644
index a9e76afe1016..000000000000
--- a/app-backup/bareos/bareos-19.2.11.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
-	logwatch mysql ndmp +postgres readline scsi-crypto
-	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		director? (
-			virtual/mta
-			jansson? ( dev-libs/jansson )
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		dev-libs/openssl:0=[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-BDEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="
-	!clientonly? ( || ( mysql postgres sqlite ) )
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-src_prepare() {
-	use mysql    && export mydbtypes+=( mysql )
-	use postgres && export mydbtypes+=( postgresql )
-	use sqlite   && export mydbtypes+=( sqlite )
-
-	# enables default database driver in catalog
-	pushd core/src/defaultconfigs >&/dev/null || die
-		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
-			|| die "sed on MyCatalog.conf.in failed"
-	popd >&/dev/null || die
-
-	# fix gentoo version detection
-	eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch"
-
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	# disable dird and stored plugins, because of
-	# py2 dependency
-	cd "${S}/core/src/plugins"
-	cmake_comment_add_subdirectory dird
-	cmake_comment_add_subdirectory stored
-	cd -
-
-	CMAKE_USE_DIR="$S/core"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	CMAKE_USE_DIR="$S/core"
-
-	pushd core/platforms >&/dev/null || die
-	cmake_comment_add_subdirectory '${DISTNAME}'
-	popd >&/dev/null || die
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd mysql lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmysql=$(usex mysql)
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dpostgresql=$(usex postgres)
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsqlite3=$(usex sqlite)
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove timelimit to fix #778557
-	rm -f "${D}"/usr/{,s}bin/timelimit
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bareos-dir)
-				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	diropts -m0755
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		if use postgres; then
-			einfo
-			einfo "For postgresql:"
-			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
-		fi
-		if use mysql; then
-			einfo
-			einfo "For mysql:"
-			einfo
-			einfo "  Make sure root has direct access to your mysql server. You may want to"
-			einfo "  create a /root/.my.cnf file with"
-			einfo "    [client]"
-			einfo "    user=root"
-			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
-			einfo "  before running:"
-			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
-			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
-			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
-		fi
-		einfo
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bareos does not officially support SQLite database."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-		einfo "It is strongly recommended to use either postgresql or mysql as"
-		einfo "catalog database backend."
-		einfo
-	fi
-}
diff --git a/app-backup/bareos/bareos-20.0.3-r2.ebuild b/app-backup/bareos/bareos-20.0.3-r2.ebuild
new file mode 100644
index 000000000000..98191f5002a8
--- /dev/null
+++ b/app-backup/bareos/bareos-20.0.3-r2.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+	logwatch mysql ndmp +postgres readline scsi-crypto
+	sqlite static +storage-daemon systemd tcpd vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson:= )
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		dev-libs/openssl:0=[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+BDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="
+	!clientonly? ( || ( mysql postgres sqlite ) )
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+	use mysql    && export mydbtypes+=( mysql )
+	use postgres && export mydbtypes+=( postgresql )
+	use sqlite   && export mydbtypes+=( sqlite )
+
+	# enables default database driver in catalog
+	pushd core/src/defaultconfigs >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
+			|| die "sed on MyCatalog.conf.in failed"
+	popd >&/dev/null || die
+
+	# fix gentoo platform support
+	eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
+	CMAKE_USE_DIR="$S/core"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	CMAKE_USE_DIR="$S/core"
+
+	pushd core/platforms >&/dev/null || die
+	cmake_comment_add_subdirectory '${DISTNAME}'
+	popd >&/dev/null || die
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd mysql lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmysql=$(usex mysql)
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dpostgresql=$(usex postgres)
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsqlite3=$(usex sqlite)
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/bareos-20.0.3.ebuild b/app-backup/bareos/bareos-20.0.3.ebuild
deleted file mode 100644
index 261eb0feb129..000000000000
--- a/app-backup/bareos/bareos-20.0.3.ebuild
+++ /dev/null
@@ -1,394 +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} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
-	logwatch mysql ndmp +postgres readline scsi-crypto
-	sqlite static +storage-daemon systemd tcpd vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		director? (
-			virtual/mta
-			jansson? ( dev-libs/jansson )
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		dev-libs/openssl:0=[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	vmware? ( dev-lang/python:2.7 )
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-BDEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="
-	!clientonly? ( || ( mysql postgres sqlite ) )
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-src_prepare() {
-	use mysql    && export mydbtypes+=( mysql )
-	use postgres && export mydbtypes+=( postgresql )
-	use sqlite   && export mydbtypes+=( sqlite )
-
-	# enables default database driver in catalog
-	pushd core/src/defaultconfigs >&/dev/null || die
-		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
-			|| die "sed on MyCatalog.conf.in failed"
-	popd >&/dev/null || die
-
-	# fix gentoo platform support
-	eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.patch"
-
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	# disable dird and stored plugins, because of
-	# py2 dependency
-	cd "${S}/core/src/plugins"
-	cmake_comment_add_subdirectory dird
-	cmake_comment_add_subdirectory stored
-	cd -
-
-	CMAKE_USE_DIR="$S/core"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	CMAKE_USE_DIR="$S/core"
-
-	pushd core/platforms >&/dev/null || die
-	cmake_comment_add_subdirectory '${DISTNAME}'
-	popd >&/dev/null || die
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd mysql lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmysql=$(usex mysql)
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dpostgresql=$(usex postgres)
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsqlite3=$(usex sqlite)
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		# disable droplet support for now as it does not build with gcc 10
-		# ... and this is a bundled lib, which should have its own package
-		cd core && cmake_comment_add_subdirectory "src/droplet"
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# remove misc stuff we do not need in production
-	rm -f "${D}"/etc/bareos/bareos-regress.conf
-	rm -f "${D}"/etc/logrotate.d/bareos-dir
-
-	# get rid of py2 stuff if USE=-vmware
-	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py,python-fd.so}
-		rm -rf "$D"/usr/lib64/python2.7
-	fi
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bareos-dir)
-				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	diropts -m0755
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		if use postgres; then
-			einfo
-			einfo "For postgresql:"
-			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
-		fi
-		if use mysql; then
-			einfo
-			einfo "For mysql:"
-			einfo
-			einfo "  Make sure root has direct access to your mysql server. You may want to"
-			einfo "  create a /root/.my.cnf file with"
-			einfo "    [client]"
-			einfo "    user=root"
-			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
-			einfo "  before running:"
-			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
-			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
-			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
-		fi
-		einfo
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bareos does not officially support SQLite database."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-		einfo "It is strongly recommended to use either postgresql or mysql as"
-		einfo "catalog database backend."
-		einfo
-	fi
-}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index b35e1c812fd5..958678e23679 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,3 +1,5 @@
 DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
+DIST dar-2.7.2.tar.gz 2294187 BLAKE2B 6422f40aea9fe07195359d9e8d5a947fe20d1ec4d6bd866eb8e9240c153d069b5df75018c25b9e8ce6b7acbf4ce4259b50b0768cd391d8b9b1c7be72f03a56b6 SHA512 7e41adc0102806c07d644da41960b1e5bcb6b7872e6a5789506c1f2a001ffb4e3607cae6f76ccc2339d90cf4387b7645e9de6dbc4eed1306827a46e4b7c9d09d
 EBUILD dar-2.7.1.ebuild 2227 BLAKE2B 895d91efff0477b33aceb86ef3f007e71b6ffef85954e84c3617037863c658f3c8a810b5ceba94a5a6d896e40dc942165b6ea5a0b46dde2282a444ce986d99b0 SHA512 fb2e0d595a169d0cb7d29dbe398ef61acbc9fcb6b110d14ebf3ef7adc54e36891a1eae12dd5bf6560a115fab5b2b7004edfbbb1f5b8089c34a29e014cadca614
+EBUILD dar-2.7.2.ebuild 2231 BLAKE2B 4ae458a626feea6d2962feda19f87d150ae5782da72d0a485cdaa11936c513d082c96276ab22ff1bcad0c2fbb3c1e68965740a7e1c7aa039cf6053132f42cd58 SHA512 a696f62c67c912d81e4597828c250e30f7eda7522d4828d5b87442e00d2b0000a4081a0f92a16933a9abb6e729962a896713af6051c66c088ac3f594f5da02d5
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.2.ebuild b/app-backup/dar/dar-2.7.2.ebuild
new file mode 100644
index 000000000000..30d87e469279
--- /dev/null
+++ b/app-backup/dar/dar-2.7.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	sys-libs/libcap
+	>=sys-libs/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2:= )
+	curl? ( net-misc/curl )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gpg? ( app-crypt/gpgme:1= )
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-dar-static
+		--disable-python-binding
+		--disable-upx
+		$(usev !argon2 --disable-libargon2-linking)
+		$(usev !curl --disable-libcurl-linking)
+		$(usev dar32 --enable-mode=32)
+		$(usev dar64 --enable-mode=64)
+		$(usev !doc --disable-build-html)
+		$(usev !gcrypt --disable-libgcrypt-linking)
+		$(usev !gpg --disable-gpgme-linking)
+		$(usev !lz4 --disable-liblz4-linking)
+		$(usev !lzo --disable-liblzo2-linking)
+		$(usev !nls --disable-nls)
+		$(usev !rsync --disable-librsync-linking)
+		$(usev !threads --disable-threadar)
+		$(usev !xattr --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index d8c61469d37c..7d89ce218401 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 5a642ccc1094..6ab02822784f 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.13.03.tar.xz 578220 BLAKE2B b40e11a1a338de70f040fb3b0997f0fd101e00708c92c9137528c3c6914ce15251a06579df38d532b96e47149b0c39bc92e878ba53225f9a01e397d3376eff00 SHA512 78b05948b5a8622faba8ffb54f08a81c5ad31fcbbf060a95addaf4a5ec1605d3f190b1aebaa4b2b54315525e248289dcdbf16fdcf8395678fb33e74b22b0e7eb
-EBUILD stress-ng-0.13.03.ebuild 861 BLAKE2B 504588591c0f907fa543f17bfebd05d52f4fbd950eab60f99f8879bfb19c8b8ca89b407e945e983121cae974d31a70a603b7ef9ab53a224acedc5f880c145813 SHA512 a2f9c9c86c514a5e6f26dc21f6cccd56ace01222cdb45ed9f04e8b9aa3a9b88b6c2fbf6ffdbd6a80f407eebb724dd14777578ec571c57d8d59a775f6aa285b4f
+DIST stress-ng-0.13.04.tar.xz 580436 BLAKE2B c0aa542453fc0901f7cc6ad7500097df258c28cac2fe5136574b839abdbe349678d428571cb5eb1da1fb94b59a8ea23f20d96dba67c6210773f3bc8daf32fc3b SHA512 0d5dda9c7887cba9ce5b21d3a270e8c699df0d205f40ee2ccb5f45d49968feea850ed2e1008be2c3863a8d58f50d5a3e4327a4887ea68905e0355ae86101b48b
+EBUILD stress-ng-0.13.04.ebuild 861 BLAKE2B 504588591c0f907fa543f17bfebd05d52f4fbd950eab60f99f8879bfb19c8b8ca89b407e945e983121cae974d31a70a603b7ef9ab53a224acedc5f880c145813 SHA512 a2f9c9c86c514a5e6f26dc21f6cccd56ace01222cdb45ed9f04e8b9aa3a9b88b6c2fbf6ffdbd6a80f407eebb724dd14777578ec571c57d8d59a775f6aa285b4f
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.03.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.04.ebuild
index 309cd350a1c7..309cd350a1c7 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.13.03.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.04.ebuild
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 1c02ad8f7f9f..23c3af906597 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 79278d14642f..7a803c1f75d2 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,4 +1,6 @@
 AUX brasero-3.12.2-tracker3.patch 8745 BLAKE2B a3ca65c2354bc87f7d9c9bd4ec2dce06f7a97208193a48674ffb60ace244528e9f45e25b15c768af9cf5b002db549d058433eb069ad13cee2d1a2e76afee9b69 SHA512 0595dda2259c8a1a4b005ac6d8886a1b9333102df61a24cbaf61895160395374abcb2391e487b6e98eaa441fcc3164187c451edb6ddc0c19cb1b7d12658aff1b
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
+DIST brasero-3.12.3.tar.xz 3156012 BLAKE2B e657f29719164b786e29a4974102cf6b0eb3316bec84a08838bd62b952c43994e0187f6cfeaa5080fa794b1ff1684553a3d643cd309b2957a8d4191c7ea8cfbf SHA512 0e3c97b2a754f7178207db390e33b832fcaed3856ae5dee447e5c26d712728302dbebbf839a4fb7565f63b3ebb1e4936e20739482a8114e6fe2700805659270a
 EBUILD brasero-3.12.2-r3.ebuild 2086 BLAKE2B 55ed49c6e3fad05573940ad82362698f7135b56d7d76223e2a98f3395606c2c8e9858982cd49f7f4d00084761809bd3b1dfbd53a7e7851cdc6b23d82dc77e006 SHA512 31d9e31ced2c41970929aeab106945c4610f624769a553abf0eeb9c5f5feba55f67c83e7cb6575380fabc87410d62eafa8472eb3f968eb57febcc6fad385ba35
+EBUILD brasero-3.12.3.ebuild 1891 BLAKE2B 3e31810e8e4d962851469127cb4717d4a0be59ca0a028bce2fbe683ee0f57b15dfe4cc5b5200c2bcdb5eaa2b9c213e9521e7fc8e9bd5b77306930d123fd56271 SHA512 3be61c1a71ae57efbd56a36182da9d5ea5c0d3fdc55d459387c455cd0cf6782f6360ec586a8d9c0d7e04e51819bcd8a3ee71e40fe2f4144ca35c2017e177ec21
 MISC metadata.xml 642 BLAKE2B 7ac9b4e7b0568b7d608eee9280b15f04218e931daac55cc6fcbafbc01fdc4bc0fcc3631403f25451dc13f07854eb366e2028903be22d8740cc9d0e1ed9074c9e SHA512 7f5c7b80d484710f9dcecd6266331054a90789f0c5e4942b0f26d6da861bdcd754f495d505562bce8a5fcf70e59f57cf54e1ab2ef521798b213eee4d2dbe2b4f
diff --git a/app-cdr/brasero/brasero-3.12.3.ebuild b/app-cdr/brasero/brasero-3.12.3.ebuild
new file mode 100644
index 000000000000..bdf3c441ff61
--- /dev/null
+++ b/app-cdr/brasero/brasero-3.12.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus playlist test tracker"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1:=
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	libburn? (
+		>=dev-libs/libburn-0.4:=
+		>=dev-libs/libisofs-0.6.4:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( app-misc/tracker:3= )
+"
+RDEPEND="${DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0[mp3?]
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/cdrtools
+		app-cdr/dvd+rw-tools
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.3 )
+	app-text/yelp-tools
+	gnome-base/gnome-common
+"
+PDEPEND="gnome-base/gvfs"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search)
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c420b4c01f6c..c65ae5ff0540 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 001e5417796f..d4fd326b89d1 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,5 +1,5 @@
 DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
 DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
-EBUILD glep63-check-10.ebuild 551 BLAKE2B 694217b96184f979f3253bd7768595990be6ecbfde11ada0c79f21bbe0dd4355f32043527506896962052e9a0dc8d7f4c02c80eb3dde8ab2532cc3f4675cc992 SHA512 e154ae12c064980624baf5b2bc22b5c42a89b479bc21962a64a77dc6f5b264dd5a8f5401e2814c64151d7d575b335529084e20e6670b067d6e8d38348969efcb
+EBUILD glep63-check-10.ebuild 578 BLAKE2B 55866cf4987dbca5a6f4b7fe1e6321f6c659ca5eabb5c8108fa3dde8089c3685b411fb1e62c5e441fd2116c53e02ab4b2ae2e96d50c40ad219f599eaf1524d67 SHA512 a46d1b4c7807a60b582b0f202fc1b7d5576f165ce53dff6557fbb47e89982cf392abd968fcb7584ed236a7567796ed67941b6318d58e74bd656f18951c4bd5de
 EBUILD glep63-check-9.ebuild 686 BLAKE2B f3e108b7e17d3c2e63d56641306c4b5c3a39cdf4da469921d0fef3f7f0b1be0e753b07c4dc049d08710d5952117437ac1ae80424f56a56243016a42c25d0e00e SHA512 493c8cf0ce6feaa44b7212ebe10abb93169accbd6f4542cf99c32512871c0d47143ff64cc0ad705a154140918eb0a160e885ccf008f5da45d8ad9efb490f3012
 MISC metadata.xml 538 BLAKE2B f8b4385968fe1f9504666398550baf1c13a0f840e9d0d9c1f80caa7bca9001ed679a22bfba1e8b62064d0d5e6507e0eb8f40cf1e44b57f4e4a0830b1aae36c74 SHA512 6dbcbf2413392f6bc587cb96f6f127af72f5412d07c4c7a40472304470fb90390d05057010ad383d8431481b09d54df972f5873d69c2908dd6f80b27e52e75ba
diff --git a/app-crypt/glep63-check/glep63-check-10.ebuild b/app-crypt/glep63-check/glep63-check-10.ebuild
index 61e18a116228..c11a81b67fe5 100644
--- a/app-crypt/glep63-check/glep63-check-10.ebuild
+++ b/app-crypt/glep63-check/glep63-check-10.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="app-crypt/gnupg"
 DEPEND="
 	test? (
+		>=app-crypt/gnupg-2.2.29
 		sys-libs/libfaketime
 	)"
 
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index 2dfdd87ff387..c43718818651 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,5 +1,7 @@
 AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787a1f7154843123c1b4879f2e159ffef5ed8edb64a34ba84c5cbc71b1bdf34db63686e26f44554da67731ed857ca399219a1e7b36ca1630bac0705be56d2de SHA512 02642544797076d3c1568b11cc8edb303d844a2b9d9088af80f3bf7135da25635cbf7ce67387d9c51365466fc60942254773854fb9eff5562e2c7fff88d5a42f
 DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
+DIST ima-evm-utils-1.3.2.tar.gz 100373 BLAKE2B 04717a934795f7e2a351b1f59388d2d429e00a8a18c57c0eb258bb81bc329342cb9971fa2b4493f7b492f07961ec794a0549fd2d0984381492dcab474915a0d6 SHA512 af96935f953fbec8cdd40ba1a24001fae916633df03f9dee1e96775baec0ffea21a7a13798b3e3c3f375fd493a65fe65b5357887890b46cac0c4dcca5a5b79db
 EBUILD ima-evm-utils-1.1-r1.ebuild 930 BLAKE2B e781a98fbaa64eddde0e5da3e83078d081b38fd5793233774d704e78f1cb0fccbf6c4967cf3b54c4fe9b7441ea65368744d5dbc5bf19742bcf4cf2636ac10419 SHA512 d0ce0baafa523571fe772d277c86cf56cc9f540e13dd8a0e6b90332f61abb9c4ee9417adb2452f6e56b8b482ffb240d42025e24fb95794b0598c2d8fc27bb746
-EBUILD ima-evm-utils-9999.ebuild 846 BLAKE2B 4597d73c6834177822a8ec9067a2b80a048bad69b51d0592fcf9a254050c08f62d9f9115b6ceb1e5bbb24b16682922690015cc12e9ca16deb126100f07749b6d SHA512 69a422bf56c8dfcfb7ed190d134b461311be05498b7f9b090d6c0152f14d840657a69a5481222b3a22662aa7e80f489ae49095c5a1057edcdbf8fc5ca0c12561
+EBUILD ima-evm-utils-1.3.2.ebuild 939 BLAKE2B 65582200fc5b73c90d4fef83297001d1d94c76fb4f7a60550929ae8fb25314fe3efdde4b0dbea4de577ba75e78d171342c7c04ef94d544d60d5a2cb9296cfc72 SHA512 348f47d3a235ba09437593c6408c5cf3f7d448f0f238138208d1e2181800b7eb4e3d3a34e2612eb77a0c3ecea706cac295fa5350921e70dd2674687392e041f5
+EBUILD ima-evm-utils-9999.ebuild 924 BLAKE2B a78f12fd68b67be06b6d897ff864ad1df3e864a0b102e6b483045aa4e34410f603126895d1e97509ed26d98eb760b79cdd7256db5fe3e5beda289aefe1e91d71 SHA512 3306757d5d64cf1fab08f1260484c71b4bd333eb106baa57bdc70f7396680db3a5ecc74ca2f2629119851bb70a4db8f4bff632c3689ea47c5717b872e497f065
 MISC metadata.xml 331 BLAKE2B 1c72879ab3666f6dcb1b9b4f5b268ba4763a4d0c833e349d454a3a480ae70f3f287b1514ec04f3c79595658f7815d1e35be5247af5b64d0036b1c2206529ed7d SHA512 6c63abaa5dfda37911626af3683da11115bc6f753cba511a95b4c129912c19e516b8a4a71f9fe905c27924022e2bc6585444683000a4d6a2c3b3709b0818fa76
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild
new file mode 100644
index 000000000000..760e13c50315
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="https://download.sourceforge.net/linux-ima/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/keyutils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( app-editors/vim-core )"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index d967038aff71..bdb4d49d4f72 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools git-r3
 
 DESCRIPTION="Supporting tools for IMA and EVM"
 HOMEPAGE="http://linux-ima.sourceforge.net"
-EGIT_REPO_URI="git://git.code.sf.net/p/linux-ima/ima-evm-utils"
+EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug test"
 
 RDEPEND="
 	dev-libs/openssl:0=
 	sys-apps/keyutils:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/asciidoc
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
+	dev-libs/libxslt
+	test? ( app-editors/vim-core )"
 
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	default
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 5f8fd8cf5da6..a7b7c18c0a89 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
-DIST tpm2-pkcs11-1.6.0.tar.gz 1370370 BLAKE2B 5dd8c587688a26958e8406366ce14cdadc9d2279f01276037df3895f49f835bd021b96da2c7399881e23527c79c45d25417b57acfb961f934f29d785dacf87f7 SHA512 db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea
-EBUILD tpm2-pkcs11-1.6.0.ebuild 1559 BLAKE2B 91679bcf8eec8fe09d12601bbfa0bf0ad120d6eb60b0025044d31f814506bfeda522948dd150fbe9331c382f6079e35776dc85717879c4f0abfc99e61c1ad3b0 SHA512 9eba3fe01a307f46680bbd7e9880c71a6368d56711c67fdd10bc9f5d67bf934400621946df67e9528a8d93fbd60a140e9af4f5da3743ba50663ae6b83edc0c87
+DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d
+EBUILD tpm2-pkcs11-1.7.0.ebuild 1436 BLAKE2B 9bbf63d22a2f29bcc0fe5860563a7f445e19ec5ac293eae4c547a90e7fd1c99eebf9d5820469095d6d2a6dc5dc272e7a4b10b039950521153c7fe7009d5bf835 SHA512 ab607f6dc726f8afc9e0a6c71c0d8a7007bbe09d5f4b3d3bdcd8d8d9b994356c07d2a1f03d695ec543daeb4a2de975fa53d06b9825e40af3a49167335df759e2
 MISC metadata.xml 473 BLAKE2B 66d9a37ccc8a1dc4e94798394a6e33090a42922d40ca87b55b687207da072ed50a12b985e9261863a4208bced5a76c856e1d05eeed78b27a766dc56234a40ff1 SHA512 e15ae6f4fa11fe7719ba7692b04f7b81563f6c1ea7caa1984c0e0957c18a53abb87ea70c27f0972fec6f6b8608f94142e7791cbd9c2025d7ad0d17889968a549
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
deleted file mode 100644
index 7aae19c7c71f..000000000000
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3088817..d789ce9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
deleted file mode 100644
index fc4bbfa9a2f1..000000000000
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools distutils-r1
-
-DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
-HOMEPAGE="https://tpm2-software.github.io/"
-SRC_URI="https://github.com/tpm2-software/tpm2-pkcs11/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="fapi"
-
-# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires
-# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage.
-RESTRICT="test"
-
-RDEPEND="app-crypt/p11-kit
-	app-crypt/tpm2-abrmd
-	app-crypt/tpm2-tools[fapi?]
-	!fapi? ( app-crypt/tpm2-tss )
-	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
-	dev-db/sqlite:3
-	dev-libs/openssl:=
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}] "
-
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.2-Remove-WError.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fapi)
-}
-
-src_compile() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
-}
-
-src_install() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
-	dobin "${S}/tools/tpm2_ptool"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
new file mode 100644
index 000000000000..407c9604607b
--- /dev/null
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
+HOMEPAGE="https://tpm2-software.github.io/"
+SRC_URI="https://github.com/tpm2-software/tpm2-pkcs11/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="fapi test"
+
+# Units tests only for now
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/p11-kit
+	app-crypt/tpm2-abrmd
+	app-crypt/tpm2-tools[fapi?]
+	!fapi? ( app-crypt/tpm2-tss )
+	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
+	dev-db/sqlite:3
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-util/cmocka )
+	${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable fapi) \
+		$(use_enable test unit)
+}
+
+src_compile() {
+	default
+	cd "${S}/tools" || die
+	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
+}
+
+src_install() {
+	default
+	cd "${S}/tools" || die
+	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
+	dobin "${S}/tools/tpm2_ptool"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	default
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 225a1d34810e..06d976b13431 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/bookview/Manifest b/app-dicts/bookview/Manifest
index 310cf706bbce..382893c02039 100644
--- a/app-dicts/bookview/Manifest
+++ b/app-dicts/bookview/Manifest
@@ -1,5 +1,5 @@
 AUX Bookview.ad 20 BLAKE2B 1ddb8b0e075113cc16778b8e91bc04e4ae08676137562dccc31d70e0c64c7c820836dbbc3439fe567aa752a36d4aed75cb316934dfcd04e488a88813b704b6ef SHA512 805f0b8c643ab4b5d858042d4b7aaff491c070569845e8f605996dd47c15b83afad112dedb6e2afc1cdafa34b349ad966e6c1ccd32bc0aae6f785d7308f7a8ac
 AUX bookview-3.2.1-gentoo.diff 284 BLAKE2B 2d7f5d83c2a3fbd1ef7bbc46e4186cebf111e11da911a97b5c774ab8de2ec4ddc2af73f3361fa804c47cf255af559ed08db537f539701ea264e8f575c69fd7af SHA512 bfe21358eafa3dbd414a3ddd9194105dc7f2ea102584cc94f3b60a0e7b4dd6a156735d93a3fe648c8523829d3ca2061b306a82e8b20e1dd18ead49fb38de9f1e
 DIST bookview-3.2.1.tar.gz 311798 BLAKE2B 624f8130db7e3bfe9b290728bb20a93a4b218e51a299ac65ec5d5de22a3d65fcd33e471c58e948d3224255022af938e2ef695276f364f55285c6ef39f68fa517 SHA512 f5afa5d116a97f176a5a3194c50bd9b8eeff812c79844e0f3d617a9416ea5597e171888e8820034fbaf49812e95e6a5fee8701eb8702184ae3dc7ff37e3671d2
-EBUILD bookview-3.2.1.ebuild 543 BLAKE2B cf7c888d466ec05f68018c6897a0db3e2c22ebee51b8fecadf5354ce9988cbc31fa5e204cc7d6c02f7f1ef46af56a8c4d2f3859d650ac206245ada390b77dfc1 SHA512 755269eee6ec122e4db8381e54c06f9924a4220969e7587575c9fb89f433bed18361a8ed1104df2b0e8acdcf2b482b4ad9e8f51c05bac80d2c56d0946631e442
+EBUILD bookview-3.2.1.ebuild 550 BLAKE2B 07d1861500fa463c8e42094694ea36bef4363fc31f7a82588b28042f5c3058b57f3d2a65e898f682850aa65b941de41a93698c8bed13334f06311ccfab8e2593 SHA512 2bf8a2a38affbb4917106bc7f7023534c3405ce73bf8beb4d1b26e4a4de76d7529e762ef3211bf94b4a81fad778227f1b55a739100c0b091650ac233202d7262
 MISC metadata.xml 231 BLAKE2B c2fdc9ca113ea1fb6cb14f865609798058c3443d097117d61de82b4f53e8d293bc187413600b6a6eb3e1c744ae7712bf8c55db53562076e7bc5de5eae0c1f209 SHA512 281ccb55b01108f6fd9953a4fc8723e312c6416b885b11a32d2a0d4d532ebbc361990c814402bc8061e360c02b8074797b1b68ee9a8bc96d37f2cb6455e5949c
diff --git a/app-dicts/bookview/bookview-3.2.1.ebuild b/app-dicts/bookview/bookview-3.2.1.ebuild
index 9fdf455264a7..9e9ac8f57350 100644
--- a/app-dicts/bookview/bookview-3.2.1.ebuild
+++ b/app-dicts/bookview/bookview-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~riscv x86"
 
 RDEPEND="dev-lang/tk:0"
 DEPEND="${RDEPEND}"
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
index 5223d19a5dbd..2d9a1ef14ecf 100644
--- a/app-dicts/dictd-vera/Manifest
+++ b/app-dicts/dictd-vera/Manifest
@@ -1,4 +1,4 @@
 AUX dictd-vera-1.24-U+D7.patch 359 BLAKE2B 42895ad91dc2a0c8e154cf27bbbd74d0b27129bc73672dfabd305a60ed4d2c7acc11affbfd13a3b34ce0e728e4fbfa8181020d878710f730ee63125da731a089 SHA512 c0b9828c1f2639bca664bbd29729ce90b5db0a16bda713205c8be75bbd0d0ef2ba9cb8fc3b486d13ff7da37d129f34b81a99c360d23863f84857c233778acd11
 DIST vera-1.24.tar.gz 240378 BLAKE2B f35df71c4fc9b95a9abba83cf49f9a70db03f1353f7d4e2b4e1db1a2f6ae41dc88f0f61b28e5405e76a97a7305f8a8bf6414b19a8067f113e2fd6bb54e57de43 SHA512 1727c91b0b60dc579e8f634375488a145921cf419bf3213118f90af031c48ed3d3408609d0a8a41135a3f6c6e9fa579b412981883325ae0dd9f0f72f56da5cd9
-EBUILD dictd-vera-1.24-r1.ebuild 761 BLAKE2B 6b3e2f2c3c57387af94ca6ef92e51e5bd6196a9f891f0f8aecf90a5e2445380760efc85bdcfd5a3522bcbe3f5c3dc8ed8324cbbf2fc8ea6a23d6e21957f53172 SHA512 e41636f47801944ddacef6b9d44de8cb34b408d6d1febfe784c0b9d3354008144aa5e36d7d62cb9b4687d892f65a3ff0a65143fff1d5c0ef36968e19acdc0c38
+EBUILD dictd-vera-1.24-r1.ebuild 768 BLAKE2B 7758fdfb63379ce5bf1c2a425b4bd0e5c81758bb02cea982f0533632cb4c66b4f07280cad13de552d809a3e77a7929b2bddc90b1c81d4bc1fe5d95c9cc8d465e SHA512 725af305ac0e8d6c315333984391184c148de20b28552f92e4bdd47d9070bfdef9cfe6d6e5ee506f0e1ca774bedfca99aa696377d526216a21a43d5aa83410f0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
index 5877fb139913..dc49ad3b2d45 100644
--- a/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
+++ b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
 S="${WORKDIR}/vera-${PV}"
 SLOT="0"
 LICENSE="FDL-1.3"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 
 DEPEND=">=app-text/dictd-1.5.5"
 RDEPEND="${DEPEND}"
diff --git a/app-dicts/dictd-wn/Manifest b/app-dicts/dictd-wn/Manifest
index e861f125decb..4e382ca918e7 100644
--- a/app-dicts/dictd-wn/Manifest
+++ b/app-dicts/dictd-wn/Manifest
@@ -1,3 +1,3 @@
 DIST dict-wn_3.0-33_all.deb 10610306 BLAKE2B 9d9aeff72582e4ee3ede5e8b3872515cfe0acb1e17a14cecd7d492a36fe5e509515048e7c2978cf453abdbfb19dac89b496b78e2b8fc25e2924c8ea818e8713a SHA512 94a72c4fc8d8864abfb4372742f82534977d9472ef3751e58dd017e4ee78db0d541614c54a47634c9d1fbc25eec136f6dc5146845e971f87447ff091ac0278cb
-EBUILD dictd-wn-3.0_p33-r1.ebuild 515 BLAKE2B b57ceec29a0af7786cf996481b59782aef5dd491ba04b8f32f7eeefd39141a3c0c312a5ba7145b2cdabb67faf1771d61085c290de640d2e310dffc1029086b73 SHA512 3e60273685708f7bd5dc920cc971d5abd1a718868ff587ecb2844308fd7c3edb05254e0a4398a144cff3eadc86413405f683d397852960155805e6020efd0617
+EBUILD dictd-wn-3.0_p33-r1.ebuild 522 BLAKE2B 91e93a87510526f0ebb6438edba60122945ad246c8a0ea837a8fdaac7d6506b3f520928d1587bf5a22916ecd8a0830bed76dd807870f0c7898de3d7170b8b64d SHA512 66c24bcf9b793a11ecd563b448a9d8440651c33e8f6804fd4a2f57c9b43c71b90301e512e612d371e43f6c02e2c96449b4efa7d7f6806d9e62080095095ddd42
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild b/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild
index b07033c9b330..b8c0e5336c12 100644
--- a/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild
+++ b/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/wordnet/dict-wn_${PV/_p/-}_all.deb"
 S="${WORKDIR}"
 LICENSE="Princeton"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=app-text/dictd-1.5.5"
 
diff --git a/app-dicts/dikt/Manifest b/app-dicts/dikt/Manifest
index 1d103f050e06..47d104361a29 100644
--- a/app-dicts/dikt/Manifest
+++ b/app-dicts/dikt/Manifest
@@ -1,3 +1,3 @@
 DIST dikt-2s1.tar.xz 52620 BLAKE2B 7afbefdf136b4aaf81ca30399263760a10366c362f07cf620a2c42ab10e5cd6b1eb3ada308f99d7a80a077089cc189ca634d5fdb30a30063dc12fc5e748ad555 SHA512 b7b26ace5ce6326191047d0d0515db2b88e790475be569d7bb994879046aa26c93a663d6bef31f8e8b233377ebd602355fb11b275f3aec910f99a5372fcde682
-EBUILD dikt-2s_p1.ebuild 1103 BLAKE2B cd4d5db8e02eb20b1ae6848517409fd49bfd1c30b9c84533bb92f050a7ffe3edd4d335bf23f9b23b55918f8370dd1edae2cd4b686f4d9b243a2e4d3f0612b989 SHA512 32967645549e4dc180a8a0a5c1b75b2e191fa1d4fbe2c62cd0b8d65f1b9abab1b69a606f03ba34e31f2bf27d804320ae645912d4df388dfdd5f0ea1c00bffa87
+EBUILD dikt-2s_p1.ebuild 1110 BLAKE2B dc00fbace0be16619ab8cf5c199f5f730a375e16e4f80069b108a829df171e39978b4781bedf0633b20ec02397a1e67b2b051c342d17258fdb2da1e975223923 SHA512 735039457a45ab01c601bdba64b490aae355f0f2751fe03af464b61ea03ed36c7037b25631ce1bb88cfcbe504f1b3e06557b25e7075b4cad513971a5ce12135a
 MISC metadata.xml 327 BLAKE2B 0b7c1e4e8e567c1b7a3982367ed2ff41069127930448e5824fbd363088a5b67b872131b206deea51986b8cebcfd516558c74a2acb49a7ab846fdab81906381c2 SHA512 d40a39743ead348aa965fbe96f34628ce73513d650a05e83dbd7f05f288077a474f9b367e068c4f099a50b47ea658dcf9f0dee6eefd16485b697aa4a51a70d71
diff --git a/app-dicts/dikt/dikt-2s_p1.ebuild b/app-dicts/dikt/dikt-2s_p1.ebuild
index 5218d2e8ad9a..6fe9a62855e7 100644
--- a/app-dicts/dikt/dikt-2s_p1.ebuild
+++ b/app-dicts/dikt/dikt-2s_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket-archive.softwareheritage.org/static/67/67f37093-df38-
 
 LICENSE="BSD-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-dicts/eblook/Manifest b/app-dicts/eblook/Manifest
index e411463bdef3..4f9a764db61d 100644
--- a/app-dicts/eblook/Manifest
+++ b/app-dicts/eblook/Manifest
@@ -1,4 +1,4 @@
 AUX eblook-1.6.1-LDFLAGS.patch 751 BLAKE2B 03b79539c03224db4bdcc0d1f1865cb8e2f162949610083dde146260d40acd0a4de94d28850f6115648b406cbadac8603e07c624fd60f4b76159acadf4979eda SHA512 9d24ec3ff3aa1f363153cb1c20b2c2128bae2309ba0fe4e6244f4366f80473612130d29447752382a2d9e4bbe1137d195df3fdbb0cb2df23732fc52faae93bb6
 DIST eblook-1.6.1.tar.gz 440727 BLAKE2B 313dcc89fea9dbc8dac8c9fda618cf4e39d0cfef4f67ba7cf2ab29e3b1c8dc0559407c1f1c68c9994594b784acb445c6fe988456e14da324bd38c89de23f3ffe SHA512 36f4f383a53a0332a2dec0e40d2743c93d35c9f51a7de2d2706bbc18a4fde215d4e345feb175bebf428c1760cb32e73148fb9b336fcde8c0d8b924ee6ecfd6a4
-EBUILD eblook-1.6.1.ebuild 542 BLAKE2B 86b268aa6c6d1c5fcce60ef318339feedd6e928583f7ce4f8d592b9c3753b1aa00174ac986e3d01c619ab93a3ae9ec1783a5b096b5f2327063d67faf079c95fb SHA512 08d10c392345e06b4f29a9fcd9bcbb36d0ef6d590b23988185210f9d5eed3c970ca27e8b0324d0653beff681d3134c73f1c0f813a4146ebb2c9cb9db37bd0624
+EBUILD eblook-1.6.1.ebuild 549 BLAKE2B 42e852d48645a61b8a7494a0d7ec16819e557402865e33a24f7d52c526a24766d29df543536d99dc86acebc3fa693e26fdb786030b896e068469980a26f50597 SHA512 2d018c3a86dd75edb6a25669c47f5913fe3a0364505a352ae6fd357fea0c260f9df5919df015eef5dc6bfd6cd0377af5c521e203784c8abef1e2a5870378f7d1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild b/app-dicts/eblook/eblook-1.6.1.ebuild
index 79e8ddff2253..0ac5d0edc7d7 100644
--- a/app-dicts/eblook/eblook-1.6.1.ebuild
+++ b/app-dicts/eblook/eblook-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ppc ~riscv x86"
 
 DEPEND=">=dev-libs/eb-3.3.4"
 RDEPEND="${DEPEND}"
diff --git a/app-dicts/edictionary/Manifest b/app-dicts/edictionary/Manifest
index 505f5263f243..6cffc7defcc3 100644
--- a/app-dicts/edictionary/Manifest
+++ b/app-dicts/edictionary/Manifest
@@ -1,3 +1,3 @@
 DIST edict-2.6.tar.gz 51300 BLAKE2B dd074c4b4d771921c21cc63e3960951ff6e62e8485ee2a9e967751670562e29ae434d7a2a79886797093f315bdba2134f7d45c024a0657c4a53314d96c66fbce SHA512 03a9977df6d150e7e99805f8dc5f62e1f6d84360d79684210a4cbd8105ccf541777513c99bf77934a9b8e26e4aad8d88b84146b165d9e1a21dff80587f900677
-EBUILD edictionary-2.6-r1.ebuild 574 BLAKE2B fb053b5a6a69a04ca3514dca7e0c6e4d894ccaaaf07d8899a0b2bcdd550d0f37ab2c0b9d082f0e0f6d3e4c20acf8c9d66913553aacd8da0a571ca51e2ee80465 SHA512 a641fb4431f60c5086bee66e077f5c08e23ae6e2b1037ef14a3c32d0bf3a4cdbeaaf99f8ad441e92dac63c10870bc13aa24c4e71013f8c14efa28c1d4310f3d4
+EBUILD edictionary-2.6-r1.ebuild 581 BLAKE2B f682e7210f93213f9cf4cbd33825f12fbe6a5d51f0d05d766d47ebca6e44af725b494f3d4e3f2581e3fe9fa4c6fa770531aac644e382664385bce860930d8aa6 SHA512 2a1ae74d9f5317a9a11de43e28cd2ee1b4822ff8078aecf4b4cb4fe48948252255b8d89647340e3356046c42b98b92fdf7ea2be69195df2c63ff4d1677af74ba
 MISC metadata.xml 249 BLAKE2B 5b0c697072100648e906ad3a8545f94137d387e91fa2ab9072ffbff36055a368d5927598cfddfd430154d2d32b6b22a4aab3a4f240789b486256e21f9bc1828c SHA512 66dfe865fd98f80414f9b0dd81be31f6896083f0df7af08d04d33f9a62f5ba484aa97bc76eef483ee06c3b77dd418fc8420f11ef6ff4fbd792a0e0a0ffe142ae
diff --git a/app-dicts/edictionary/edictionary-2.6-r1.ebuild b/app-dicts/edictionary/edictionary-2.6-r1.ebuild
index b73480591e90..a52cefdaa6de 100644
--- a/app-dicts/edictionary/edictionary-2.6-r1.ebuild
+++ b/app-dicts/edictionary/edictionary-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-dicts/freedict-deu-eng/Manifest b/app-dicts/freedict-deu-eng/Manifest
index 64d9a53cf092..11f65eca595a 100644
--- a/app-dicts/freedict-deu-eng/Manifest
+++ b/app-dicts/freedict-deu-eng/Manifest
@@ -1,3 +1,3 @@
 DIST deu-eng.tar.gz 2113223 BLAKE2B 555d893e7f676bc19b54abe0a25ad9e55af3c76b3a1e3e82dbfceb2a1f8492f9e3836d0870880bb03c311e4787e6b0a04bf793bfc22326b24fdef65f7006b3c2 SHA512 44679d0c75054fc843279b88643298bb365862571e8ad9a27190216bf67aeed5b97e6d099de6c4c9af191a80499a644b107b960588a86e921ec57a76fde4c6aa
-EBUILD freedict-deu-eng-1.0.ebuild 225 BLAKE2B e2753b5d6d46c2c1c0f9424637b321fa8b3d45938a4a6201fe07cbdee3dbdb2fbe27b9bd977449eb289f4e32c20e36163b925ea9e20c0c98c26476a475959da5 SHA512 25a706a16e4ba285cfc7a08d1ccab3020ad4ae186d1782597907fa417c912240ed41976e6bc726400864f05a47832817a4ee07ccb085da4e434b5e9a297036d7
+EBUILD freedict-deu-eng-1.0.ebuild 232 BLAKE2B 8478fd0d5cc8979e50bb0db41cdc6d56f3364d01cf4410573626ed89dd81ca7ae4b69725311ec0f8f6bea9e5a58ac0eabe5cb78328285b37ffdde9b744088dd5 SHA512 3ce52da65df249dda54d9dccc1952bb47448d0d36795f03af4e098f5143b6b97728e666dc301f124df01d78f0823f97561136c64a8911ed9d86bf0bd8c6a476e
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild b/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
index 0d0b04883add..437aa6981d42 100644
--- a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
+++ b/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from German to English"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
diff --git a/app-dicts/freedict-eng-fra/Manifest b/app-dicts/freedict-eng-fra/Manifest
index bcea24ae2d50..d7f9b40da130 100644
--- a/app-dicts/freedict-eng-fra/Manifest
+++ b/app-dicts/freedict-eng-fra/Manifest
@@ -1,3 +1,3 @@
 DIST eng-fra.tar.gz 212980 BLAKE2B a731793e43ed753583d3f2642f7d81e471fbdc37c81535be43d020bb25074473dca4b7861a41022937eaa4c985deafad8bd116cd551ad3a81ba621cacd60766e SHA512 820152732941ccb12b8005780e91eeceb2cc2c239bc1d56cbdc800a98ac28bbff3f882d9fa327642bbb2df7f305b0e78b01c1794a021cca8f9315e030a83c62d
-EBUILD freedict-eng-fra-1.0.ebuild 253 BLAKE2B 54759c440b294785f72643bf8e9b00492b69a0cf151840b091a7a5b56a8bfd89eb0aceb34694d6fc40846a35549a5f5a10b6f86f8ca403561daef7c6bd8f2670 SHA512 32fe88e8184c6755ac0b4a05b05b828fa43c55210f25eb8929676318b7cf7b434a75ada476bceb1bb0fa20ad0649f4d5afc53118ff962f61b2cf4911e4c3e362
+EBUILD freedict-eng-fra-1.0.ebuild 260 BLAKE2B 34b80fd87713e2b8ed3ef9b92bd0276271df503967f481bda286e96238c160ad8494a675d4afbc70f4ae643e16361cb087050b24c39b6ca21fc6abdae0b4616d SHA512 986435e06cafbe2dfb3ae7206e71b558e482fb51ef699a0e9b4e50f365089f7b9be429c80846a2f612fb2a1dfe74b3d91dc82eaf05435281127d0ab2d0a33063
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild b/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
index 4018186f6794..bd84eb263cc2 100644
--- a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
+++ b/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from English to French"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86"
diff --git a/app-dicts/freedict-eng-ita/Manifest b/app-dicts/freedict-eng-ita/Manifest
index 17c47aec4013..949555c43856 100644
--- a/app-dicts/freedict-eng-ita/Manifest
+++ b/app-dicts/freedict-eng-ita/Manifest
@@ -1,3 +1,3 @@
 DIST eng-ita.tar.gz 76372 BLAKE2B e7b44baa9656b8c2bb7e826fd14d0d843d4e4597a172975be90f7d9dbe41412a8d54981537b7bb02de835e31197a1471a90c605e35c302276e82f1bb3a5fc2be SHA512 030a1877153938c287cd6e8729af47bc419d8464836f48b105c28533d2c46ea509ae56e10a1e3b3affd85d2bbf6efb2f3bc1e6feb49adbeafab8f178f4838fa9
-EBUILD freedict-eng-ita-1.0.ebuild 254 BLAKE2B 7f01aa39f69c5d66a860659f31601a3ba7d192a4484aa97047495aad678c08533c5fead6c0452f433ee7d29e89950ffe88e77e9a759ac4edf49d72a30c1dcd37 SHA512 cff9dbefb1b38f7367fcc4962df67ec6fad5e78cf19f918ea7dd16cca054f1b86a76a4f9415b45e4ed9bfe7835e9e0dc9b53fc3c14e89430e654aa74ae82c49c
+EBUILD freedict-eng-ita-1.0.ebuild 261 BLAKE2B 173e0c8e9788553db560a2b081e998114fc90e984d53f4b65fe9dc0bd5f3f05f43e6ce8d773baabe90680a298aea128b1a597996dd4a6918b7dae1e04eb14ff8 SHA512 f47f75068f65647785a2b3b27438d944d9a17e2177a67da5cbe69c89a183a025db8fe95b77d47ea24e185cd9b3827dbeda2397aa880eed496038dec6c0ccc09f
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild b/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
index d6408f0e8472..1e01ed37f071 100644
--- a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
+++ b/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from English to Italian"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86"
diff --git a/app-dicts/freedict-eng-swe/Manifest b/app-dicts/freedict-eng-swe/Manifest
index e1f925ca35f8..a1a360814ba0 100644
--- a/app-dicts/freedict-eng-swe/Manifest
+++ b/app-dicts/freedict-eng-swe/Manifest
@@ -1,3 +1,3 @@
 DIST eng-swe.tar.gz 126735 BLAKE2B c9b0e4c5c79f32c75486187d67bafe37d1197cbfb114ad269ee3e3e8cfd3ec904e8f303d46291a6a6535e0f374fc750c8afe5968d435370eb27532d580f9f033 SHA512 3075d5b4928ec3285f70ec22f5f501fb4823f888dc2eb218380efd83c786f9a9063f0709b6c59abf70f86a5b5005f45f2e376d6d1a03fb434dc479794bc45662
-EBUILD freedict-eng-swe-1.0.ebuild 254 BLAKE2B d0268304213a851ebf4a79891a4afbde8ea369caae90b43f79989cf2e51376c293368d41451385d7d393b32a6520445a624d9ec772e168ad617b73304e746ab5 SHA512 92ba96eb0d5144b623a009d56144365a9c45df535bbffa2348503e022a528e51fa9316ab8e9bd7dcded581f9a2c03c2984bd8bdd68365c5cc3790d6aeff0457b
+EBUILD freedict-eng-swe-1.0.ebuild 261 BLAKE2B 5ebe8dbcbcd2ec545ba9b55ba2369de763028cf2527dc853368102f727655b240fd0608e827363fe44edaf627e1068e2915d4dd8f01269fe99647f1ca38cdfd6 SHA512 d8ce37eb3a381369a0625f02efe31b32596ccc1be4dca80fa16f51c44d158f21c43957277ba929df1a2ae35255269f918c245928133e95bb152174e9fb8fd3f8
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild b/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
index c74bd515499e..ae8fc476af7e 100644
--- a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
+++ b/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from English to Swedish"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86"
diff --git a/app-dicts/freedict-fra-eng/Manifest b/app-dicts/freedict-fra-eng/Manifest
index dd555d73da27..5e739dd99790 100644
--- a/app-dicts/freedict-fra-eng/Manifest
+++ b/app-dicts/freedict-fra-eng/Manifest
@@ -1,3 +1,3 @@
 DIST fra-eng.tar.gz 192146 BLAKE2B 8b5fbcba1a4b603325d235a3af117d161503ef93e30839bd85de6de19912473d11408be03ab1fa6745f8f9ca3a18cd4f5060019f6e8c6f6c9080ab3d10327f64 SHA512 93ea5c277b18af15fc9c3dff93d62b0bafdfb34b6db9178cdeac9b6678af18914adcff70afabfa62138f5a7e86235fa52d7dedb37af473678bedcfa6df020afd
-EBUILD freedict-fra-eng-1.0.ebuild 253 BLAKE2B 0b8608384cb66dbc263a3475883b7d81a57c8899fc446741a5ecd87fa4231cb7bc3ac3027de6e7a79b0508c4cd978867228934e7a7e4339ca78220a861dd0934 SHA512 c8061e236b9aa6c518322368479d4b88868f9b7b1187af90802be7a9b0940b2bc1fcc8104d80b9feac58dc43bcadc7084f529a10b2a872bcc89f6927b2ec3568
+EBUILD freedict-fra-eng-1.0.ebuild 260 BLAKE2B 41028000080c94b633723363cb2da50336e1c7db2baf51255305452313849dfcfbeafa1b1760be7df19003fe749feed72a2ddd6e5de2f4cae95c0411cdc07235 SHA512 c76c8990c8161834ca314876523da7f00accf067a9871d3c8c7fd80c2d6710f577ebf30374f9c3abde8fc7d2f05dc83bae046558c184793cc5e15a5a803f5968
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild b/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
index c7528f82621e..014849f38504 100644
--- a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
+++ b/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from French to English"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86"
diff --git a/app-dicts/freedict-ita-eng/Manifest b/app-dicts/freedict-ita-eng/Manifest
index 9f52bc235eed..8f5250b4ba5a 100644
--- a/app-dicts/freedict-ita-eng/Manifest
+++ b/app-dicts/freedict-ita-eng/Manifest
@@ -1,3 +1,3 @@
 DIST ita-eng.tar.gz 65443 BLAKE2B 0301aab3f704b24ab063c501bd308ec87f63b30fbd65012be443bbf728b102d26033194367e75464a6a3cf1b917cc11c5ecb339604a3826d67482865a9ec3de9 SHA512 69124f68a417d5a6516441a993c0a2c1729d1336544459168e417c4c5586d3e8a3d88be82fd664238da348c6950a95408088028a7130b9f5d78cb8bbed22519a
-EBUILD freedict-ita-eng-1.0.ebuild 254 BLAKE2B 81c153e78efa09a7b0214ab1a99a58ffdb7c7d02191aeb163d0a92151a26351681b8538dda5943950d006531f93b951ef157e64a76da0930d0d3c7c3eeae914f SHA512 b82e5349a4d628d71905f9a6e5cfde688e48fc97046d8136cea87894248b309ee8d3c60d6d5e1922dcac1e3a2b494f7fc6b0d9d9784c322e5ed5b162e9322d38
+EBUILD freedict-ita-eng-1.0.ebuild 261 BLAKE2B 5708a87ec83e109e95b33be1c429a0789cbfb60f563f1def16b975232746e70f845902fd2f602ecc14a78cf5c28e6dded847850005bb9affb9eacd3d4086206f SHA512 38ced92a5d4476ba51a205dcfa2afd235ecc7dd79a2817373ea57e5623ecb398703ea7487834f238f078868f25049b67e96e1492921c53be36de95aeb34b20e6
 MISC metadata.xml 246 BLAKE2B 66e1efb44a6f20974356eda8887e9f51d5ac24d74b0494a334a7ce4c8e9b011b28c53a9825f5e87789f9fc609b00ff127a53b15c106614f247afaa3a9ece3bff SHA512 ee5a9cb65f6a7fddee22664b7173403d994c3cd93952748d6c17b8d345cde081dfb731510523be4587d3ecf9a91e059af76ce4ad1897b1a22390ccb7b71882e5
diff --git a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild b/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
index 1814491307a2..d7d5bf10c829 100644
--- a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
+++ b/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
@@ -6,4 +6,4 @@ EAPI=7
 inherit freedict
 
 DESCRIPTION="Freedict for language translation from Italian to English"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86"
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index ba61a6191581..ae2ce52db0b5 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-dictionary-40.0.tar.xz 603388 BLAKE2B 1fae73ea5b554786f1ee1bf641b0dc94ee8953a045e4a59b72823075b8c0905d0098827ad35f94e26d26fcbdbed1fd2980391ce582871ae6df4d273d9de5add4 SHA512 96e8c5efbba43e1a7d247703ac17cbcb8579cc633f6db74b6fe4431e0b1aed47ab76fd15cc114497b5ee76fb33b57fd9936cc869ffe905f208c836b5a231b126
-EBUILD gnome-dictionary-40.0.ebuild 960 BLAKE2B af8632e4c6374acf8d73d3f8060464c1803ebc290cd239bbad70899292f979b05e96504e1b26ec685326125cdfede8cda6fb36e8ff208745cb7f78bd6f9a013f SHA512 3e31a959ac785b7d172ae1ae48d22c6cce5165e43c41f1a05bd8276ec56cd11e1b484a88c95aabc271317ae076044b1f296f82d2a3676ea5b27757fec36fb5fe
+EBUILD gnome-dictionary-40.0.ebuild 967 BLAKE2B 1ddd573e99c27277ad8583d7173eaf38d80227d777411dd3f55158f8919d9164aea297ec40af3a508328ece5ebfbec856ac2ac9ae5c71ad1b08fd28be843ee3e SHA512 c658637b1db5ee7d4015c5a4dcfad76250b00bfc4425e2da897c769ddb02f1b19a75679280fde037c349a3c4e6bc46d85e936c908f87fc71058001162e95dfc1
 MISC metadata.xml 317 BLAKE2B 0f99dd59faa31be1761a21290c1d34ed89467c22582727cb88030c0dba83bc7ee9d390f655ab7a63a0b5cb25e8efa2f17b90fbd08c093fece6d4d873018ea201 SHA512 28137d259d69aae3d9ea5161100a0063718bf43c3447ad5d42e75c4ab212288b07f5cbc281e44d648817c2fe7bc05af0a2428a9f9d5f495b2ecefa66f16bda34
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild
index f3c677f0a953..299a866e32ff 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0" # does not provide a public libgdict-1.0.so anymore
 IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.42:2
diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
index 94e2665a613e..a0035793e557 100644
--- a/app-dicts/gwaei/Manifest
+++ b/app-dicts/gwaei/Manifest
@@ -1,3 +1,3 @@
 DIST gwaei-3.6.2.tar.xz 547592 BLAKE2B 0a0f90639b81158ef6bfc69f0f74ad70af65ae9462c93f6e507d6a1087c424da9689f2308300c5d4b8090143d8d9e2f7fe183719e37fa463ffe2b937714b7463 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b
-EBUILD gwaei-3.6.2.ebuild 1275 BLAKE2B 8f8ec4f8939a39fc050a67740fee1181039fa0c09a8fc1c9725e7070977afcebfef737982d2707d901b9f926b9bc5a017cddfa8b1a1a242d62054a0518b093f5 SHA512 a5c7a67dbb50914488f4fd5d6e9cea144ada517fae71fd5dbb8c838265b60ffcd05552b3b782e618281fe3d7d924d6076a58cb2a00ac6238af15fb2038df7baa
+EBUILD gwaei-3.6.2.ebuild 1282 BLAKE2B ca1894088e4c424e9a7220e05e106e21d6097492acf1a60fdcbf9ec6db49c5a8d68ea022baa1ed7bb6b16843f8502aa1f51be45d7cd1b833ebc95de869986fd4 SHA512 ba8530987bf874ff857a19922877817e7a09599100e18fb4adc5a23726975ca518b6d07ca4a2312c7def9f35433220cb8f168ef90e796889efe1cc3a29390e37
 MISC metadata.xml 763 BLAKE2B f54abd6930bf966738e2b45ef6812ae3d1deaa30393e6383c1c9da8e8358c9ca387cb064731479640420905b2891e87ebcdfe91ba0f563f93bdd03f8f4bb361e SHA512 7f1a0c3a295a0505463fce3a9b352152dc00f358ecdb90a48fb02b0307adcaa1100f0c34840f39d3b2caed2d93bcd1ed4a4df37b8c6fc38f4e5c4ee37f61cecd
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
index 045d9d6ad1f2..a260fad3a22c 100644
--- a/app-dicts/gwaei/gwaei-3.6.2.ebuild
+++ b/app-dicts/gwaei/gwaei-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gwaei/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="gtk hunspell nls mecab test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-dicts/ipadic/Manifest b/app-dicts/ipadic/Manifest
index 2de947666106..b85f0daedce0 100644
--- a/app-dicts/ipadic/Manifest
+++ b/app-dicts/ipadic/Manifest
@@ -1,4 +1,4 @@
 AUX ipadic-2.7.0-r2-gentoo.patch 896 BLAKE2B 69c2fb6a2379359d8060a59d0041faebd780769a0983e6797ed16d8143e0d05a046f82a0352a53226219c4888d91fd51b339a284e4e37f85d11c22e11a58f4a7 SHA512 0e6fa8f84c978c96d0fe8eebbda3166d298fa9709eec8025025e5705db04d08b3e7581f9341dad84808dba52c6dac2498743a4514701fa74289608287f3b2a82
 DIST ipadic-2.7.0.tar.gz 4300102 BLAKE2B bc6c60eb79c12dc06a30c021d5df2016f5b9c8a41540edfda3d9010716096ac25ee6a1a34b23690c86799eaa4c60fc68c499c0a20afbef865c07ec51b9ddcf40 SHA512 0c4617733d3a786f4a9d0773c50cd76da5433921dc4eb4f759b8b3c0fd3c0db411696068ee795a893063e1a7ab1bdb6afc740331c5fdd2c3ebc914324f4e33c3
-EBUILD ipadic-2.7.0-r2.ebuild 589 BLAKE2B 5eedcb3f4b7136ad18862a5830782cb071a4bdcb6f033e238fd493ffb67c7cc250e7ff86575ba3365d160b31e9225e47745ef9cec4808e9870cf8e13e010da4a SHA512 9abe5326fd119ed55c329f0817c3071a0c24fcc87f15b5bbde5bd3675396bb9ad96d8e001de9d594a7cf8e431166e65db3d16f37c11d84c8552be98095e8900c
+EBUILD ipadic-2.7.0-r2.ebuild 596 BLAKE2B 405662e5e2f6bc782ffa0d16ff4ec829e2a838983f3eb012b078af137455f6f90536c4698bff2a66368a7a1760473b9ec8c98b84ba923cb5e0c22698d71f43a5 SHA512 f41440db69e31406eb85efeff4356b7537f3b74952ce9fc68c3f4bfae9f0c757c99ab416529a841f6a3403907421bb0521f5132dd28b183dbda0f3b63f250b42
 MISC metadata.xml 314 BLAKE2B 5c0fe622b650af5c285ba089f74c20a8eb155277db1fbdf5983310a82b8682aad94bc5e25a907eea47e20403c6378883f0e8764d698bc23f2807310175ff18d1 SHA512 c1a1540d12e97551db1a1d02cbd3db075fc1674672d6f8dff0764b8e64808781f721c6ff2122dbbcec0e2eb1370c176ab6ef9d0224869305959c8e25e5dc7260
diff --git a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
index 54a6d1d4850d..eb7764de4425 100644
--- a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
+++ b/app-dicts/ipadic/ipadic-2.7.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=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/24435/${P}.tar.gz"
 
 LICENSE="ipadic"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND=">=app-text/chasen-2.3.1"
 
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 3ab23b787091..22fb4793aa49 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -1,5 +1,5 @@
 AUX kasumi-2.5-fix-build-gcc-11.patch 6783 BLAKE2B d1c2bf3227cb49a8b0c5c93ff2fefbe7df694a5196384e1e9aef9166a5e553fb55c705a52963719fb43438302a6cc57abbeb2d3f20be629d7f794a9e3a250840 SHA512 053b09cc6099a93a0bd98146913a91a60cc83fe43458a7b56de475396d258941c836cba9c44e4295b5386425b540aa2fefdfc64956c74bb78398ac2fcc852a70
 AUX kasumi-desktop.patch 368 BLAKE2B 2d54d40cf569f3bad3552fc7461fcda4be17245937b14ac183d035410698a15efa1e2d1280055b2d21cee14e3dafa48c5c27a94f525e6948f37c7eea20193c5a SHA512 c45d95fe9d39b79fda38715ac00567b1993584f47b1e6040d7ec3c93f913d0d61f2667e07d3fcf6335e7ecf5f8978627b42f639caacf5da7a1e89d25faa8b35d
 DIST kasumi-2.5.tar.gz 279587 BLAKE2B 3f2b807f76bfe1915ef978b18cf3f26efc8f64c903bc0e271f0875c1f7d5611307e2587093f2f289d9ade95370725fb13d16253ae7dfa6a063c525b727f7bd15 SHA512 066dda59d84b456c514a896b376bfc6df8ac64404f06fbfa8c369381acb6d260b1f22874885be2eab844f8f3776b944a5c700a966464ebef74d82c28bc97f970
-EBUILD kasumi-2.5-r1.ebuild 633 BLAKE2B b38d7f3c6f202698cb6a82dbf304b2416f1485aa82f16c0a83fc63ab0bf241682b7f010e19024378865ab4414642c37bb256b90d3482c6799380dfae929a8874 SHA512 97334afd87213dc59c58c57caa0ff0f8cde0a28d311865ed64c1affd7610e74d73a3e3d674594e4816b2439a12e0e41c268726f66324c1060550c62e78a0d18e
+EBUILD kasumi-2.5-r1.ebuild 640 BLAKE2B 3ba95af644dab6a310da3db3d46bc0dc7be216bed68d56c07e03d42fb7edf98e52e55091705cfc5dd19155bf23d4bd9e36ffe3ece31cf0b1c2c5299fc92ebf2f SHA512 8eb956d1d9e26af059f41a190dbff1436d5cee0bd6fa7af8c4cd377459f153dd3f2d73bdce01625e2b933b3fa7fceff0b15777220f36aac05a070017eca6f652
 MISC metadata.xml 324 BLAKE2B 7a387bb9bed602653ea71c15e9b2fa9a38028b21678c9b38aa50a765da327be04b98804403fede8b337dcb2e2df4f5207cc466490f1d9bda09176931e99f9888 SHA512 6583db125adc5f8fab8c1a5589f26345c6c730d493a270461a37e4b4f53e4ff2988f11f4caea2e830035e5faedae17c8f569dd991b05d73a9dd7b389306e374f
diff --git a/app-dicts/kasumi/kasumi-2.5-r1.ebuild b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
index fb6e4e046061..84411fee5309 100644
--- a/app-dicts/kasumi/kasumi-2.5-r1.ebuild
+++ b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/41436/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ppc ~riscv sparc x86"
 IUSE="nls"
 
 RDEPEND="app-i18n/anthy
diff --git a/app-dicts/libydpdict/Manifest b/app-dicts/libydpdict/Manifest
index e634e86a836b..122484c9c268 100644
--- a/app-dicts/libydpdict/Manifest
+++ b/app-dicts/libydpdict/Manifest
@@ -1,3 +1,3 @@
 DIST libydpdict-1.0.4.tar.gz 20550 BLAKE2B a68573a74db3b7ef5aa4565b85f17830800c4551db9d2d6cd80f0517e8c5f1adb7e1d6caad3768e5e9e7665a68eb2ac0eb7b261a7f69a5280c4c65f5787c9359 SHA512 09178c620410c5f43f52a4ffc691fc656e7d1a92fd5724ca31c6f99397d4e702d440dc0bf191e56dd83439c3067ac7638ee7ce071bc26399e8306cadbe705fdd
-EBUILD libydpdict-1.0.4.ebuild 553 BLAKE2B f228125b6d774b02d7b8d88a1a49cfc6cee982186e6fdd66b0420dfa9054fba8595f88a0b1473f6b135934a1cfcb3a73f7384054d838439195b937908b8df443 SHA512 fe3c2be57eb1589f02deb502f12b7c8a4718183d72667b9213d701fce10fe3e2ff941de88f11a922fe4514e054282c365bddc2fc74831b327cd7d6609996f51c
+EBUILD libydpdict-1.0.4.ebuild 560 BLAKE2B de49276956dd5c513770759c8e9c1397ac96b3c40bcb04cc8a0ebeacba755ef1bf8e31073d6e7259a4b5791064eacf667fc6fb796064a2e8a38a153affd97d10 SHA512 88e06909b34dd9b2d7a031d5fc21a90ee63a939a4d16c05ca5495e54835a7476dcce3e9386e6b23e2c48e26591d4dff8c0f74765ef257c8e884d599b56eb5f07
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-dicts/libydpdict/libydpdict-1.0.4.ebuild b/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
index 296af3da9810..e4316c1e6380 100644
--- a/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
+++ b/app-dicts/libydpdict/libydpdict-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DOCS=( AUTHORS )
 
diff --git a/app-dicts/mecab-unidic/Manifest b/app-dicts/mecab-unidic/Manifest
index 9014e0116b92..4bee089f3dd3 100644
--- a/app-dicts/mecab-unidic/Manifest
+++ b/app-dicts/mecab-unidic/Manifest
@@ -1,3 +1,3 @@
 DIST unidic-mecab-2.1.2_src.zip 140517811 BLAKE2B 38001714023c1de6ea5388ccc6ab9f5a910c0f40ba1f5cfee861e6a733797ee6ea528eeeb185a4354c084f71189d73478f64719bc3e0b6424cc24a8088d419e1 SHA512 db80feab873851df874781fe81430ee90e238f166b90e77755a112602e0f22a7c4c5deb4ce8bcd357d258d8d806d917652e6723bf2a1b786942952fbbcb52782
-EBUILD mecab-unidic-2.1.2.ebuild 428 BLAKE2B 00f89dd29a238f71a9b7aa4685b92c0a5d001e57647fbbecf006081337a756721e315fab06e23bd46852e2d4a1d60ae7285374f4633312d31b6a2e326e547235 SHA512 d7dd9d44f03ef0fd6d8d21ffc292c02e9e3ab1298d9c8ad167c7d4203dfe3e4f0b4fe24ae83fb54cf092f7421cdecad43b789f7dd22064e2cc7c345ecf924e94
+EBUILD mecab-unidic-2.1.2.ebuild 435 BLAKE2B edeabdb36eccac1dd84181dc3203808bdc63d67efe0ea205675aa2de20143724f576b6a43d9e19b2db2381ae0aff146228a129eef31d5953a5bb484a709c57d3 SHA512 4ca1d6ead1922a10cf157fe986bdaec45751741ef9e3a29708d56a5725c21271faab0fbb1e77d0206ceb6a7e48f8754b921a241707585af8cd2d3a2e433a9bf4
 MISC metadata.xml 314 BLAKE2B 371f43f1555d57dd160e7053a855dcb2c1833c83750fc630cd3d7bbe7e89e9e402fd43ac9b2b2fbab06b7de9141b0c72abb18dc0fb1dc15b08b3530aadc60abf SHA512 936c8c6c555d7526c0ace28087b591beaf9389f05c5fa8b9882c0f89d838fc960424e970f3223e2019766b9792e01bacc0630bb1ad9baf6dabf701ea41c62213
diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
index 2d372389d3eb..05cd94ef34d4 100644
--- a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
+++ b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN#*-}/58338/${MY_P}.zip"
 
 LICENSE="|| ( BSD GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 DEPEND="
diff --git a/app-dicts/migemo-dict/Manifest b/app-dicts/migemo-dict/Manifest
index f06fb2555a4d..bab382f3e18e 100644
--- a/app-dicts/migemo-dict/Manifest
+++ b/app-dicts/migemo-dict/Manifest
@@ -1,3 +1,3 @@
 DIST migemo-dict-200812.tar.bz2 1467494 BLAKE2B 25f4da49e0e1970df9f43a26f72f1ae85c89ee0d3b708e7f7ea46a2b3b133c59a3990a44e6e578335d3c836027543fc695334573613674ad4e100c06da3eac0b SHA512 cc42d62247c5ff0c3a4ff30a7c135173f94c4f49685df997b305486502b86144428dc104a77361d5ceff91683b0b663d0c68174300d628f70f6999cf7667f3c0
-EBUILD migemo-dict-200812.ebuild 622 BLAKE2B a6aa1ffdfeb12e17f9028e20df3051c346b2027e6f6667ef128efecd131528b72d8fe9778d9c04d5caa433b03b03effc7b2902a0659012cec91d96dfec327e69 SHA512 2f61ab25a4dd4f5e21079998957b6f73fb997041c7a1c58aa5a92776341f8eb312ff36b88d7840b95dcde664794b22e3cf7fd6d00df6de295ae499b52297e6aa
+EBUILD migemo-dict-200812.ebuild 629 BLAKE2B 0772c87c1bede900a193bd2f5977f79a5f7c301f4c5b7cd3417b45324e8699d274381b5d7e696f11914396f4cf2d5b801b5a83010788d80a0eb405950e28061d SHA512 a3f2e0ce1ca1005a0e8f865e9eaef49c7cc12c95daa40f76b4292c53d9dc5f1421546cfeaf5930000b670686f823cf975040cd5a3988721fee4196bddc79fa88
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-dicts/migemo-dict/migemo-dict-200812.ebuild b/app-dicts/migemo-dict/migemo-dict-200812.ebuild
index 310c1e8dd788..7410ee71985f 100644
--- a/app-dicts/migemo-dict/migemo-dict-200812.ebuild
+++ b/app-dicts/migemo-dict/migemo-dict-200812.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 @@ HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="unicode"
 
diff --git a/app-dicts/myspell-tr/Manifest b/app-dicts/myspell-tr/Manifest
index e1285cd2c23a..4ec1a90dfac1 100644
--- a/app-dicts/myspell-tr/Manifest
+++ b/app-dicts/myspell-tr/Manifest
@@ -1,3 +1,3 @@
 DIST oo-turkish-dict-v1-2.oxt 2109286 BLAKE2B 1097492cb0176f0c66d5c22f3de8e1a51aab0a7a9e1b4ce66b8d77c9633eca03ba0917263340b98ad2a85d8dba3ba26c63536250746e7fa46806af61a0ed4e0d SHA512 f3ce6f2250142bfa7835061b74a85c7ea3278a9d51b556571cb45c9078274d6eb44493b19a21f2dc3f2441ef146c858c8b12a04c9a207bff93d9dc21307ce9dd
-EBUILD myspell-tr-1.2.ebuild 582 BLAKE2B 97418facc48384890ae93a64e2fb0b5dd73bab019873f026c89cd302c317c38837938275b125d39cb36925476b8bb3ad0ea1ed4b8a739c4d702a8a85983b7e4b SHA512 06d5c1af37535c840edd3ee46192aa3771e981821c7dd5033a6832b1aa654242cae214f85a0ce6ce9caf7d085a2cab8214fd60aa896c346b09c383fd94919590
+EBUILD myspell-tr-1.2.ebuild 589 BLAKE2B a4cf7c531978cb744b3e00b90052a144cd7f4660c091181a2e5d3924f8f442b6ad24261c66aa5735f4e51957bbdfaa01631ee98d4ca6bd65552b09d02814d11d SHA512 623db4e6e0bdd2afd64034bc316f60ae05a05db95473a8f431923b60db7d2765e2c0aace4ef8d4789f5c5121e7c22825e9aeef2facce35104f6f5e6080d45138
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-dicts/myspell-tr/myspell-tr-1.2.ebuild b/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
index a6c77495e861..1678db134df5 100644
--- a/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
+++ b/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/oo-turkish-dict-v
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-dicts/prime-dict/Manifest b/app-dicts/prime-dict/Manifest
index e6f2e6d5d897..0019a1e39660 100644
--- a/app-dicts/prime-dict/Manifest
+++ b/app-dicts/prime-dict/Manifest
@@ -1,3 +1,3 @@
 DIST prime-dict-1.0.0.tar.gz 6756593 BLAKE2B 7348e7a46dcf5a6d15ec2c5e09c4d89e724d912071a11b48b52f9e6cff62c0c52b7736da322a69ed6662e03c4b987702691174d48331e4ed692887d72b9169c0 SHA512 0cad16048baeeca982feaa3e95f7afaabaa94f511e1e80ad332cf106ea39e226f3119bcdc9636010cb5d5e0aef10dec0b8fc4d42b743e32c51971cb45e85dabf
-EBUILD prime-dict-1.0.0-r3.ebuild 634 BLAKE2B 8217ff87a0e643d85949c0eaf15b88347ce7df3688af41a313c36790e561b00beb511b97a250b05565d8c69d3562b4878b15590fcd93d13836a15b16d6f71274 SHA512 68f2832a73c95c77e52397180f2e6f262c8d26daaf3958d3342331884c2f39458d7b35eed9a09817dab3cbb30e717782f3544c012c9e6c84e8fe23807c9f94cb
+EBUILD prime-dict-1.0.0-r3.ebuild 641 BLAKE2B 424a0522882408c65a3fa0b818466b358552dc45f40f2b7b38a4d06550d114fd9c24483b22ecb0a12bae5910d41e4ecbb2de624064428e7f8d764f2048fc3ce2 SHA512 8816feb619f674eb64846c797b89b6f1e42cad0a91924cea5f23abd86bfb90e12728c2b093de0777f84dd8f0a73ad516034c545c8bf6e94096981075ffb98da8
 MISC metadata.xml 313 BLAKE2B 500f6be3456cfb519b5121dd355601abcfd434a2fc3bbc3dd370e46c4d19a94da1845439dd2d15117e8fc10ef4e17793247baa666ab88851a3851ce36a483f43 SHA512 7cab905a238ca9b1ab6b53f513e61fed1b660a8e59cc4f1472b09a5060cb0b890f2f97242912ece38bdde343d3617bc4ab426cc87cbc35d0d39d8c17b50d9fef
diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
index ce7bff635e0e..cc593112d61d 100644
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/app-dicts/stardict-cdict-en-zh-big5/Manifest b/app-dicts/stardict-cdict-en-zh-big5/Manifest
index 9e74ecc08a47..d71d510b6594 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/Manifest
+++ b/app-dicts/stardict-cdict-en-zh-big5/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-cdict-big5-2.4.2.tar.bz2 4489767 BLAKE2B 448af91242f32c5575daa813c250ede2f1e714718b7ef26ae6599440013cc26d23369313f56425515f253ebfa17ede6ec9a70d6a3af8c1dca5da86a22fe6690b SHA512 54adeaebf0d807346abd6dde556edeb8d701e5a323dcdff1b05316d7415bdcda0646e7ab2f977d54f6aba3242df9367f54b31d98c996d6426501bf49efdf82cd
-EBUILD stardict-cdict-en-zh-big5-2.4.2.ebuild 322 BLAKE2B 8b42fa3e83f79c21102fc31bb94c29abe6ba2688f5f1d512120418cf80b580a37ca4e98baf140074029ba1efc06843ea991495aae8fe09b9354e7b7be29337a2 SHA512 a9107244448526b97db70cf0069bcbb6fae9295fb4010e49fde1c6bf9dfa52d5cde6103efb5f2fdbd136dfded67bad4aa88786a1ac375c116b3297519440d1cf
+EBUILD stardict-cdict-en-zh-big5-2.4.2.ebuild 326 BLAKE2B 7c70fbda8c071a54a1e00a168d6cebacb8c0d75561d574f7d5c5dce4927df0965c37b2d15c96cbce55642a0b880d6d96e309f121a924e3820f1af8833364f5b6 SHA512 d4ac4b459a56d81645e350be9140bb424b0c2560eecad222afaff6ab6a014e4eb673f1e6626e365304c89615f31b5c2ee6841a26b1379fad308eae9de20db174
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
index a6bbd3c0ebd5..573ac4b56d61 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_TW/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-cdict-en-zh-gb/Manifest b/app-dicts/stardict-cdict-en-zh-gb/Manifest
index 8fcf3539cca5..e1d88ad1686e 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/Manifest
+++ b/app-dicts/stardict-cdict-en-zh-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-cdict-gb-2.4.2.tar.bz2 4483233 BLAKE2B ec4805a7ebf7ce300b0c5026a0d7b423c2ea430a46e8bedd3485427e467748db093874585135610e891044d8a050169e4cd6b6e488bfc310839160a8d045f6c4 SHA512 25b2c624d2a277f0ff0ea9d1d2f609ea1bd9c9469cd843e79f242769629be2b7e70b564ace9f15e5d0eb4c5be89dd2ae159ee01eceee37b959d373221bfa87ae
-EBUILD stardict-cdict-en-zh-gb-2.4.2.ebuild 322 BLAKE2B 970bf3cd9c77125fb57d1265774f7e8ab4aa2b03399b24d77d863c7ca384c5d47c981c2e67e487f08898f8954c72176b66e4ae0d06944f7418458db732bfdab3 SHA512 0116f5cb4f8a477f60fa3983c81b06a3f839c3113959ee39096296ac229567f5aeb668058dc754e2654145d61dda180329c154ff5a4b6fbc524c9b664cbe3533
+EBUILD stardict-cdict-en-zh-gb-2.4.2.ebuild 326 BLAKE2B 5cfe2b0462c6aaad832c6904169d22e7fe4bb7e6c66ec14626c5fcc1365e4ea3bfaaf92984f12e346dee5324579aa69f61a16703b25be59890484a8a349e6934 SHA512 64121b5f114ca7c42ad58d499f0c3449d51a87a0e4ea819a46b5ad674e6368d376a01ce8adca624aeb8cba596ecaeec8de8f04fc7bb50bd8c0c8d2f9cae664bd
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
index 574e3d74f5d7..a679c94c4522 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-big5/Manifest b/app-dicts/stardict-cedict-zh-en-big5/Manifest
index c96ffaf67141..a7a5304494c7 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/Manifest
+++ b/app-dicts/stardict-cedict-zh-en-big5/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-cedict-big5-2.4.2.tar.bz2 548514 BLAKE2B 7079ea1a4afadcd42f9c48bfdc424d9f92e8b3c6a7346b3bf10ff67e04255fdb48d7445e509cdd4421c0eeb4a20ee2deff07d76ae614898f116eae12950967a7 SHA512 3244688c6ad4f81c9d4b42ca576a667ee597fd14a44dc8f2256dd1d5790435e02ee0df3dba5db332188a9257a184c3cc1905cbeaf445c5995de1ac10e71d51cb
-EBUILD stardict-cedict-zh-en-big5-2.4.2.ebuild 323 BLAKE2B 55e8407eb6ced7b6834315bde58064e517ba24de1b1042d72ca2f3febdab50d01bc231f38c8e1d5d85fc643414d2d6614f00115b00ae3d8cda7b9210b6ae9310 SHA512 a7a9a44a1490fbe33bf904b07500eaa0b25ea5bb732e3092deaef9053ab993b5cc9fe6c302e27e5f0c95af4c8213aff49e97616b4faa602fbee1ef47ba5a5fe3
+EBUILD stardict-cedict-zh-en-big5-2.4.2.ebuild 327 BLAKE2B aeb21213dda08562323881abec54a996e3cc14aa3b3d776fc5ff1c90b6119b480cb3b4a3318d25fb3d99a51e9c45340731dd8494f0d86c089d5eb19f1fb4206d SHA512 db5bfa9db3dea9d2f8164c51a010281e96bdbe8172728cda85d0eed370ccfc050023d6058504db569999a8f45c33dcfa571bce7c1b7d7c43a7e7c44f91db9b64
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
index 21979b95a9b1..c53e048d000e 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_TW/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-gb/Manifest b/app-dicts/stardict-cedict-zh-en-gb/Manifest
index b549443c01ee..84f26a0cbfe5 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/Manifest
+++ b/app-dicts/stardict-cedict-zh-en-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-cedict-gb-2.4.2.tar.bz2 520907 BLAKE2B db069c2979083462c3936cbcb163d025b8d546a8b41a41307d2ba7b4b306025dad2d043ce171dca71835deab958e1c6e5cd11aa339630ec7c02bb08c8df3c4ce SHA512 8b151f2bfb98d0f0b4ed5b178ab1ff72d92c4ba8989bdaf2f04f00a4d7097a624351716ea735a7ce0ddd4111b4afe4fc07e8dbcd583d8364d97ca14c2e20773d
-EBUILD stardict-cedict-zh-en-gb-2.4.2.ebuild 323 BLAKE2B 2c872587b56a761bd871ebcfb61e0ced84f245eb8ed46ebdcf920c9a93651aaf1c2f06a01a68b5edd52b870fbb6d5be3c4d338923396871268806bbd542faec3 SHA512 00f61dca362588ee8d7e7b8e28dfca34e44e3337cc4a8ed0ba1f094aec3b876a546e820767eefdd82454615b6d9975ee3142fdb7367fa83653e11cc1ea77a14e
+EBUILD stardict-cedict-zh-en-gb-2.4.2.ebuild 327 BLAKE2B 0a70f612b39da3e6d7c444ee69b3ffac274be90709f3148d8ffb76b719deae988d9f6de6f4ab5020351deea07cb849c1c2912bb8cafe6bb51ce151204a923488 SHA512 3a5efc14b8a29d2a009ef8980e639a81142dffecb9e075221430141cea9b2c5b5ac94b321436bfe677cfa4662bc14af54c3da9996c346670b031e40c0ae389ef
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
index cdcca3f2ef9b..6a4935c616c2 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-dictd-devils/Manifest b/app-dicts/stardict-dictd-devils/Manifest
index f87ae7e06191..c898072338ec 100644
--- a/app-dicts/stardict-dictd-devils/Manifest
+++ b/app-dicts/stardict-dictd-devils/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.dict.org_devils-2.4.2.tar.bz2 177420 BLAKE2B dee3640b8f8a2d9b01a2303b5605d496925eff49f0a12b7611e8ffc4ed27ea6949e47201b705ee8037dc04243290f43627fac3f0fbb74ea1ee7bf58958826ebb SHA512 ae2bddfc7c931ee4f995f6129ce4424c98193188f0a51e14e701145b86f0f5b33ab4c85928cd6fce9d5de5e0b44453ada26a1d04bcdf5676fe872e2372f99484
-EBUILD stardict-dictd-devils-2.4.2.ebuild 328 BLAKE2B 8d6c2e304da1d20cfb03db2c43eba021fafba954cd298f2be52b7f7bc34965d629c82fecfda7c8d96d71f767900746ae32c42bc16e141f259c282034e6f6fa9f SHA512 0ffe607235523df28868f612710e3813d000dd4bc1729b37e218948934d56ea16cfedbc14347ad96e4f1a59279e0968843bdcb7c95b2b0b4ad9ed6d8ce0c4900
+EBUILD stardict-dictd-devils-2.4.2.ebuild 332 BLAKE2B 9f7fa5547ff5787865a089cfdfe4864dfe2f79509da0aa287eb519718f6f762e0b971068ab05573305b46a5a1657122051b19870a80901b0f6cb6536dc0503bc SHA512 63dbc6c0d28841a6e53f99d92f8dae14cbcfef658d1ede2bda6b3b474119bebce19004e450b22b6683746dbfe5b02a5bd668b4776aef11e7f63669a15be9b26c
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild b/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
index 292ab3a606f7..90ee7c95f9e0 100644
--- a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,5 +10,5 @@ inherit stardict
 DESCRIPTION="Stardict Dictionary for Dictd.org's Devil's Dictionary"
 HOMEPAGE="http://download.huzheng.org/dict.org/"
 
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="~amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-deu/Manifest b/app-dicts/stardict-freedict-eng-deu/Manifest
index 806f10a8745f..68a85314d35a 100644
--- a/app-dicts/stardict-freedict-eng-deu/Manifest
+++ b/app-dicts/stardict-freedict-eng-deu/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-deu-2.4.2.tar.bz2 2152861 BLAKE2B 1aa116f2e13e0599f0bb8ac0b494d7410b2fbfa1b0b502af7cb5b5569c9906758bfdb84970841909d5436a3dc7cdad8609ff67a7965bf62949516d0042169d4e SHA512 a2acbb7d6f29f4d8addbb338daccfada92daeee3f2f2684f10e980b09ea950fe8c50e3781907412142b8a973bff88fa2d3f85583607991fc7fffe0b210cf70bf
-EBUILD stardict-freedict-eng-deu-2.4.2.ebuild 300 BLAKE2B e5329ddc46ab9ce0865fb131a3a2b57089fdd306b263b7d49b73422f72984829746f7f58ba14f2f316e700c3a9c5081c8b836ffe47d8785f6bdba8effcf00500 SHA512 fe58fe9a997dc02d6467aaf05d59a4c593e626cba9669da5c7b814f631343a3565eb2bc887c66e220f12c79eec8e9422d0fef625b5f87169b4f2c217d611efa2
+EBUILD stardict-freedict-eng-deu-2.4.2.ebuild 304 BLAKE2B aa6067a1086236667f38a11c1ca570282841abc29e11c16f6a87436b27f24208c2250e2ece076414949ab8322b8f9ee94e6bc1044582a0a51a791ea48e85cbea SHA512 8724efd836a9a5389437ea23de5480bb54fe31beeb0923778d29e719770117aad95df779bc3f5f9abfa79d6b79e37f6459519596b8d5e53472f649beb48aff34
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
index c9fffe23601f..fcc3b8e47e83 100644
--- a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,5 +10,5 @@ DICT_PREFIX="dictd_www.freedict.de_"
 inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-fra/Manifest b/app-dicts/stardict-freedict-eng-fra/Manifest
index 3f2cb50ba8f4..2b7aaccaa426 100644
--- a/app-dicts/stardict-freedict-eng-fra/Manifest
+++ b/app-dicts/stardict-freedict-eng-fra/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-fra-2.4.2.tar.bz2 217079 BLAKE2B c92a2af4eb434d5acd78b35014813aaf387c39046d86e91e43d9a9a32ae5598c3d6f841f3e901b603906b4f837f812cdee198cf8f01f6bc65034b0553d8d3edb SHA512 a86c11f10998401421604e3136ec81a2ae1a7e1a0e3f6946a7a6a0fb59b9e6a5ea9fe50a66852371a4c53649bbf5d30b003653b8c77e61b7b8ce51c4524c10cd
-EBUILD stardict-freedict-eng-fra-2.4.2.ebuild 301 BLAKE2B 5362736e8521a48357014f05c15fd7dcbc920c35dbb81ffb9b4779735089dd631aabda06cd73003c871091b4202274dba10b5b2b88b901a77204b2cdfb58ee12 SHA512 b34b9fa7e5561ae0ae95ad7cb44b069ed595536117dece21e1f72c4faf88c3c1ca27497117206600d689e7bb713b542bc30219f91ec47edf0d0d3168eaa032e4
+EBUILD stardict-freedict-eng-fra-2.4.2.ebuild 305 BLAKE2B ed7bead5476d8f50f128de2a8da6aba71b2d38b5c3ebfdce5ddfb3004912ca6c9f84ee1b299f2ee64681cd25558575d9ee3c5c9676f8aaaa5b1aa83afe45edbf SHA512 a0e01e26c5eff953b783a834ea6cd56bbacc7ee7cb4f7ea91ea464041d142e483524d6926ea8802ee8d95aea343bebb9be26059bb25b8a2d219a3af09b1e7a6c
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
index fdfe419c891f..62c5a82765c7 100644
--- a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-ita/Manifest b/app-dicts/stardict-freedict-eng-ita/Manifest
index fac89805f4d6..275015540f70 100644
--- a/app-dicts/stardict-freedict-eng-ita/Manifest
+++ b/app-dicts/stardict-freedict-eng-ita/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-ita-2.4.2.tar.bz2 75395 BLAKE2B ab077ab591ffa1e0de951881e72447a423fc872e79fd6ec57842d02e9215d66291d64ce89248808a67c4321b74380e7c914bfb828b86fbffb7711d985a13de32 SHA512 157761fe100bbbee252a48d01073e34540019dcb81ea614f85731b75ed621dec1e34042f777ecb02b4a021d1e2224c8873223f96730baf2ef52b4ad26e2393d0
-EBUILD stardict-freedict-eng-ita-2.4.2.ebuild 302 BLAKE2B f79c9812ee206bbaafbedd1b8aef4d4aca99c94d2bfeb3fc3fbb52a68f80f629b213924f41be339da5c3b27547517994539b8e05158371cea27104c4d3c77aad SHA512 628f6dbc93150aa6325484419734be383b4049e03ee336f3ca5e12afa0d0e94cc7c5c64788560cb8ec29f131f5b7b73c43cdda6662f0ac6a7491107dbc7fa75c
+EBUILD stardict-freedict-eng-ita-2.4.2.ebuild 306 BLAKE2B 428844d193f3ed0e773c8346dfaa5ae99d9ebc9124f7d44194094125ed5d615b16d2a40cf96a4ceefe1e5099e4d9f357fedbcb9f09f08cfddb4a2e61d0dca675 SHA512 5541230d449bf07a6b1cd2709c4655c99e9661fed0703a8b9b9379e66d82a745f9b681072218bf6024bf51f50ae6015923642c34ff07201b5417428b41cc51fb
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
index 5ac32f69c919..55da09b2a76f 100644
--- a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-lat/Manifest b/app-dicts/stardict-freedict-eng-lat/Manifest
index 058a229c1a95..762a09b57e28 100644
--- a/app-dicts/stardict-freedict-eng-lat/Manifest
+++ b/app-dicts/stardict-freedict-eng-lat/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-lat-2.4.2.tar.bz2 66078 BLAKE2B 6b5a533681a6b34cd07c10d85ec031257d56e678122e5900df625c4277c5964ee6582b81f53939c6bd4b9c692c0d60c52361c95a4ffc8a64e32aece682e8b9c3 SHA512 2a69500a7a3e04260065a962ae7eae4df870d2620f7afb7f1a7574bb62399a696d4b9f675d3e67a1150f818268f04c6ecc722a9d6c7bd6c3e9ec6ad66e63c303
-EBUILD stardict-freedict-eng-lat-2.4.2.ebuild 300 BLAKE2B a70f4775da45bc3d3bc20d14c4766c251eeaaabe2333cdfd3478cc6d9ff378648ef3909876e5807a6800b653c77ab86d91f57bb34a7b86453b17be7d9e7787c5 SHA512 9b87e309c786420e303f8934af4f758c1c59645f3be57f7d5669867fb42df5cb7c4d74340c899eada7a3e6b0d5317a39443464131ab390208384e80655f0d654
+EBUILD stardict-freedict-eng-lat-2.4.2.ebuild 304 BLAKE2B 9a818c12b5abf78c9d5b07bc74e0e1842794da9ed3901fd482c583a06eae7dc658390c1bf7d293279c2a61e5f1963648ebe1757ed923d50f55c641846ba55185 SHA512 646ca6d94904f125aca8db68720dbc51a38bddd99548997c2f253846c953cdb4974ee5056eaf22f05e7e5c42328c62968758b8647d9d8ad82b37f1182626bcd5
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
index 8a997dda9948..68cbf9ddcf34 100644
--- a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-rus/Manifest b/app-dicts/stardict-freedict-eng-rus/Manifest
index 5144005dd58c..767c7185126f 100644
--- a/app-dicts/stardict-freedict-eng-rus/Manifest
+++ b/app-dicts/stardict-freedict-eng-rus/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-rus-2.4.2.tar.bz2 52290 BLAKE2B ffdfe8c0a2f316202ebaacf9cfef7a2cfe42e591024a146710ec484853b18f14807d2702b42b5594452846c003c0422408b9d6ad31073c4cdcc1bb89be91f4aa SHA512 5619725fdc7e506dc94c35a578d7416589e2f8e27d1f159673ebdea7e70a7c4e49dd3222bcfdc7e086240b9b2225c2e8c7c8cf727557b1f5c81ba754601cd63d
-EBUILD stardict-freedict-eng-rus-2.4.2.ebuild 302 BLAKE2B ab84c4d7f3fcfaebcc26720e52db9981c58391870cc076d337dd84f3bf166cec49318f373bb561dded21b15dc6fbc206763cc76f804fba97ccb8bd64a0999aaa SHA512 d6846355425c900a830a8d0589ab1239a4236e90b549aff83717aafcc7e43c2ee07647a1baa2bf07e404b4f8cb027e6f5ba7e988129c89b0057d4944e8a7673e
+EBUILD stardict-freedict-eng-rus-2.4.2.ebuild 306 BLAKE2B 0ac1faace316c0ac38afe915e70f4da51397f20b64d70bba90bb75f2090e6745600518c7a605afcfa0328e7c58984638f273a0ea3cb23db2fa0536085f382935 SHA512 677a6b0b2a64b7e74af39b399d32fc68561a3c5d788f35964ed513ce9f479426433e151ff55d0a923feedea27eee568bce14af319dbaf5d933deeb62eab3f4c1
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
index fba06832b014..d5fa3c74fe2c 100644
--- a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-spa/Manifest b/app-dicts/stardict-freedict-eng-spa/Manifest
index e0a7a75a921e..790d3791e34d 100644
--- a/app-dicts/stardict-freedict-eng-spa/Manifest
+++ b/app-dicts/stardict-freedict-eng-spa/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-spa-2.4.2.tar.bz2 139711 BLAKE2B d41586773742f9c6faef2c0a3d2121e9868c03ed47fa3c0c30ebc42af4b10cf893034a1eb6f93f69e9a5736ba51db125bd9e4f359fce6dab3cb8dc0f34a4ee50 SHA512 3a9ff0f38764d76f9159e3bda63c4469f8923c56197c32069eaff40ed856b8afbebf4bcea0e111ad25705751b922304df670e518f028dec94390200246fa4a5a
-EBUILD stardict-freedict-eng-spa-2.4.2.ebuild 302 BLAKE2B 80e2e222220ca2f278a2e3c3164bbad74df00041e2063264af5fb16c5d32796294b8a058771ec1433d1852e0154bc39b092d5c201f85abbfaed226c9605bd5c9 SHA512 cc625e886bbdc385992e67e0bddddcd12493d2b7a6a37210f24acb5c28858eba60bac8f1296214439b13d97c435bff906b47cd834a3dc80aa89df26ccae55bc5
+EBUILD stardict-freedict-eng-spa-2.4.2.ebuild 306 BLAKE2B 2d029f3536aacaee96ee107803f993b11ab1f2e5bd68ce6bc738cd11743fc0b8cc443ed1a91175367bd0d9a154bb9eaef363817475d4c5e1c6b0384a2b600f1b SHA512 674d9a583b24e860a7ee4d2f5594af968bc000ab55ed81c2013d19530b796800c9d1800b97da7710eacac96ec5f3a14ab76d2fb12ee3984bddc55280bd73ceb2
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
index 082f4c32111d..f047a1bfdd69 100644
--- a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-swe/Manifest b/app-dicts/stardict-freedict-eng-swe/Manifest
index 1ed6db7938be..4a8b41b8995e 100644
--- a/app-dicts/stardict-freedict-eng-swe/Manifest
+++ b/app-dicts/stardict-freedict-eng-swe/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.freedict.de_eng-swe-2.4.2.tar.bz2 127421 BLAKE2B f792aa5100f9cb89fc8e80c815ba1536315e889b2c71d6ddd22b08114bb555af53192b43c35007ab022e8152e06ce4cd361dacc97211595361d515215f80b752 SHA512 947e8bc61f00276d4a213bd3e5bf189949633ef645507f22e5c0db53ed1e779daaaff491458fde823fb4f32ab2a38cd88db29efe10aa1787e49a78ae9ad1580f
-EBUILD stardict-freedict-eng-swe-2.4.2.ebuild 302 BLAKE2B 6a10f1ff6a87e64f8c7bdfc0aa00d03e3460f0ab3473bebe9286a0ff9ceda2a07f6536ad1e3e89245e55c1bc135da06d4df3a589e2f3a260630b9a526bd70821 SHA512 32fbe013e37f5b4b6c320c6ab905673cd246b5550f4bbc3bd5fddc86085209f54b96dc68e8d06ec6fbb5cc0b17931575ce9fae83cf1e96f179289dc576b39ad8
+EBUILD stardict-freedict-eng-swe-2.4.2.ebuild 306 BLAKE2B 69a40ab645d4dcc4557515354af083747e0b95483fa85d14ac3cd2b9e3252848821ed0e09f97846e7f402e0e5477da04aebc60dd388a2a17327d76c326211e8d SHA512 64a8da05ac8fcfdd0f04c1eda86c122c6828c4153d494c58d1261bc385b2f46a114a94a43cde6f417c21b1bb2e397fd7a28f7e2ad4968fe7e9dde14411484e82
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
index 60eb4d1cadfd..fcca73012d34 100644
--- a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-tur/Manifest b/app-dicts/stardict-freedict-eng-tur/Manifest
index e0a62842c85a..eb3a12cf46cb 100644
--- a/app-dicts/stardict-freedict-eng-tur/Manifest
+++ b/app-dicts/stardict-freedict-eng-tur/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-freedict-eng-tur-2.4.2.tar.bz2 1910557 BLAKE2B a1cb5acde133f831eaa22d7e8f44a3105a37d39f1039738fe7703df5d12c394269321a560a59919b029f698bbbdcbba491fa6686157b80ff2e8f6fdfe82872a5 SHA512 10845e466c976644f868df1078bb0bb48e7f7a701577e6f42d99b12488fb52a6c83816a1b461f5df0c43323ef87d596947088693ecc523db2f41815cea6a20b7
-EBUILD stardict-freedict-eng-tur-2.4.2.ebuild 289 BLAKE2B b11455f4a0d9976925a242e8915d8069d0b469a13e202b4f14946b002d2023865dbce3a0839b9dc129629962b2af86cc252c8ec359d2f6b51147625e60e652bf SHA512 013ce78c081b061eae3a76910ee3c56a4a0e2a92681081e577eb9bfc6a3557050d01d34becadc4a2d3774865838cf9bc161b12521d1ea4f649f1f3551c5d938c
+EBUILD stardict-freedict-eng-tur-2.4.2.ebuild 293 BLAKE2B e297ebe8a3e1818561e78650728931e84fa083edf251030b9d4b60f09bcac4e009edf86e50ced77442af5c79d831d0ba73aed375abaa95a986de25a81eb0cfde SHA512 51dc7eb5880378a7716fa4290e6a9315bd797bd3b330f705a9799c33acc7b8289740e0b91af1ec41b3a39262017749fe02ccbe591f79d7727f446fc7df9f15b9
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
index 42c60d4db6e5..74be35534243 100644
--- a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-deu/Manifest b/app-dicts/stardict-freedict-tur-deu/Manifest
index 346d419be8f6..606a0bb6ee0e 100644
--- a/app-dicts/stardict-freedict-tur-deu/Manifest
+++ b/app-dicts/stardict-freedict-tur-deu/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-freedict-tur-deu-2.4.2.tar.bz2 15723 BLAKE2B 07f70625a95f0a1ad39071e5707abf2246f7f570a9a277a2b9721dc6e28201a331394693852c638b640d9fd0849d8626cf6575766c7603830746cc5251321cad SHA512 013927aa3588a3c4384c331b8ccaf9752521aa68d3e6a2a133eebcd440312664f00727e822c28c76deaf5bbda4017c10f33d374a2ef8afad780dc3f1e7200c95
-EBUILD stardict-freedict-tur-deu-2.4.2.ebuild 288 BLAKE2B 53906d96537686fbd742598d10f8259f85814e7eba16bd8048d8d0d4745b8c0dc784892d1319d1c39bff819b01a2db76f849c4eef62723464e04c7ef461312a1 SHA512 d2942040a0c1f786070def31c789ef0014491723191deedaf946154890036449b17853d5dbb82ead506d40529d73f282d99eac15d2fcdf2576bb1ad6d7392b2b
+EBUILD stardict-freedict-tur-deu-2.4.2.ebuild 292 BLAKE2B 277320d442b3366320782df57637938167b7969ff1d5cc8cf77c56564460b516fe9a1a79507ebf5685b6e0d66283f410829cc634f6775f1d4cc117b5dcd91f2a SHA512 8ce1d2d42abe6230b9062888a8d369d94ce6d1c509f0cfb032a790f82265aedfca7eba2812d8bd269bcb3a91be519f976049c8452be95f96f86951edbd7b5faa
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
index 953535140ddf..2baaa40cdde3 100644
--- a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-eng/Manifest b/app-dicts/stardict-freedict-tur-eng/Manifest
index 1130257f3719..e92c3a1f29b4 100644
--- a/app-dicts/stardict-freedict-tur-eng/Manifest
+++ b/app-dicts/stardict-freedict-tur-eng/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-freedict-tur-eng-2.4.2.tar.bz2 15434 BLAKE2B 51dcb3bcea56575ef4f6755a798b9374c62a28865166a9e6b8b0e956656322269bc0940f47c4f9e49d8d5337623127485d41ed70125e344880e9e25a59a7a20d SHA512 d064bc0554211ce68ec8c6667a363ee4d42f8b90bfbf4eb797be79ec2e8b1c1b55a96c144a45438d509d5414d9dced5a61e5ee440849329beac4eb5eb6dc8798
-EBUILD stardict-freedict-tur-eng-2.4.2.ebuild 289 BLAKE2B c4c8a9818446ba6fa4a8b5f9335daf806694f8142fd9f0428f4c42dbea8c516875c4a0c82fa9e2d51848e11cfe7c1794423d246a13422109b030d84cf29348e9 SHA512 9a11a22641a7eeab3c335699a998dfd5a8b17b14c8eb5892fbd63af3a9e736e65ac23a1f115a211209d41d8bc4a5a568e6325df56e74e0c6e55b1df04e845f55
+EBUILD stardict-freedict-tur-eng-2.4.2.ebuild 293 BLAKE2B f435bd604bba7aaed7df706ca059171ecc23588b089746e38e68781194fb8ef9331e4064a5d3d473274aa251a2c06895aea3981cc3eb7fbfe2c431474d3bea59 SHA512 fd0131c79f62ab647aacf5f012075b9d7472281c5370695f5e209110db4ae8355affa5281073e7d3bc01b9dc5b5db73dc19d16348d871566099c28ce409308b1
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
index f602e94aecee..657287d88b45 100644
--- a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/freedict.de/"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-jmdict-en-ja/Manifest b/app-dicts/stardict-jmdict-en-ja/Manifest
index 4e2238c7964b..fd95f615f417 100644
--- a/app-dicts/stardict-jmdict-en-ja/Manifest
+++ b/app-dicts/stardict-jmdict-en-ja/Manifest
@@ -1,4 +1,4 @@
 DIST stardict-jmdict-en-ja-2.4.2.tar.bz2 2343208 BLAKE2B 132b890925f0741a18f42f61bb9faff7563180cf81e2dc6ddd0c8074cb47bf072875afd72d7b0db27a906e5db0fc1c92a958803c7d5f955153baee45414802b5 SHA512 1d1091ec5fe137cb5fc441ea7d14e573989f6a7fd63004be7a917a0de4ce75ca13d1b8ce08bf778bcedd4decf12cac7385454d6942fda2f1634bdd0f6a058877
-EBUILD stardict-jmdict-en-ja-2.4.2-r1.ebuild 350 BLAKE2B e482ca21b2d9163160f1d90fd2edec48b1ee248366cfdee01b566fd2e8f9e55deb5deeb4d5762a8651c95d5e67ca85db7d11da68bc6751291d44b0a8cb1a16cb SHA512 1d60bf9ed4e64663447620d61db67e8fd2001dcb377ed88e1583710a8782ff3fffe36c0c34b518094f149e59ebcc418582a6121063e253320d26b92b930a9e6d
-EBUILD stardict-jmdict-en-ja-2.4.2-r2.ebuild 361 BLAKE2B 1ac52c44cd89da3ab3cb551ecff256ac366b284a1c044545268a8db23545dd307fe429d73a539bd4e8e82bd162dcb4f7c980475ad4c0d0de95cd824ce3f71bf3 SHA512 b2419e878ca65ad40053d2e076a5fe8e23d4cff94f3dd0a39917b01ba614e5d1cff668f118929c21f65ba8589616e45c6e99e854bcf6a89c9871a8e9029ac402
+EBUILD stardict-jmdict-en-ja-2.4.2-r1.ebuild 354 BLAKE2B 5c9ee31c10d08de912f42766141a6d6eb0f702528ee19cb5c67523277b2bc87a1b781be28439f40adcbd7e1136797de9dbfd1eb15b1f872d133f0e7bfa491c9f SHA512 6d28322b8036407d3e80fd2089a59a88601e80100d55900904fd1dd08636587d1cd1023c49e04ee1d995c3e37e79fb5afb31253e0ef80c0bc5856dfb5004359e
+EBUILD stardict-jmdict-en-ja-2.4.2-r2.ebuild 368 BLAKE2B dfafc6a13d5f0218adfd59d564898c1f2e8e8c8ef9317794b020d2a2342618170afa34652195b9e41487297e63ecc8884b7d51251af39e4e5ee786d20961f65f SHA512 3721f380050d210386aaeb090f0cd79db20f0a6fbc4b01f33ffd219a3fb95a233758d67ddfc921ee69725f61c29cdf767820c6d09f7d340bf33244b1bdb52970
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
index bc05e195f10f..05c1aae9c1db 100644
--- a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
+++ b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,5 +13,5 @@ HOMEPAGE="http://download.huzheng.org/ja/"
 SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
 
 LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild
index e9f8650cf66e..ca2b277369e5 100644
--- a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild
+++ b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="http://download.huzheng.org/ja"
 SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
 
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
diff --git a/app-dicts/stardict-jmdict-ja-en/Manifest b/app-dicts/stardict-jmdict-ja-en/Manifest
index 3ab21f861085..98ff6f548360 100644
--- a/app-dicts/stardict-jmdict-ja-en/Manifest
+++ b/app-dicts/stardict-jmdict-ja-en/Manifest
@@ -1,4 +1,4 @@
 DIST stardict-jmdict-ja-en-2.4.2.tar.bz2 4017230 BLAKE2B fa3e1b1d8526ec38edc09a0ae5350766db537e7929257d28290a08f2d7fe9d731dd7c6238e68ce1be988cd57cd582655ba291c425c0e30348660339a8b26330c SHA512 9a6c49cce6c22d58bfec64c2b7948a569890c6c357db5a2de5f87a8cafdbbde38d579a37142880daf278a7b200d8ceda64bb5a3af5e233381b5378064e7676d8
-EBUILD stardict-jmdict-ja-en-2.4.2-r1.ebuild 350 BLAKE2B a6286b33573a28afd400c19c28967d800855fe58cdd229189d6e0e1015560742e82633246365a9111ec9bbb444249577503006b81543cae704552ed745ee11e8 SHA512 6eade09b64529fbb2e5e423b20582cafb6b072de7b28c36133e989406eb74982554e90524248e0467d310c4d6c94798272ab47290c37e09faf7b2c967fbc6625
-EBUILD stardict-jmdict-ja-en-2.4.2-r2.ebuild 361 BLAKE2B 209e04a92c0e0eea701d9dab535d0a56bb1c9f0ad1fa9c9bea779b20aeeb5a21b3139ed8407c4d1df795765925ac094b2fcfe4ee84c2865b9059e574ae41d9a9 SHA512 336dda325d6725a4f362c6173de0bb766963f77f483fd4fb3c75e14184bc08c24576874b5638d7a074f36e8439d564c1cebb48302954fa338a7c3669f11ea116
+EBUILD stardict-jmdict-ja-en-2.4.2-r1.ebuild 354 BLAKE2B f5568bd278bdb0b8b34b8fb14fbb5b93fd2f16023471c210ce06bd92229e5d98b422249ecab59de8020bac743ee95fa322cb22426cefc4c49f929fc5e05eeb39 SHA512 6d493ceb206daba51eeb3d8eb1c102b4473a7a4c2077e4c376a101b1d9cdf9e475d0e8af57c5d386935aea57497a3d850d699739b638e973f5fd2e382317f822
+EBUILD stardict-jmdict-ja-en-2.4.2-r2.ebuild 368 BLAKE2B fc60ad37aa4c29099839fab4f94578d53c0a777707f67c248bd10397bd49e1daf9190c5550402db9f739f1f34c7fea4eba4f120dde95b9bce83b895e6cc2f9a3 SHA512 432cd2194ff6dbfff28013a9f4f071243b23779762a1d49b886e9791d831d3d2c39c3e31825c8090ca9445aa63bf1740edae2014327f2aad8370a0adefc126cb
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
index 5f763f89377d..32087ed1ffcf 100644
--- a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
+++ b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,5 +13,5 @@ HOMEPAGE="http://download.huzheng.org/ja/"
 SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
 
 LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild
index 54dbecd7f128..197b8b028052 100644
--- a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild
+++ b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="http://download.huzheng.org/ja"
 SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
 
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
diff --git a/app-dicts/stardict-langdao-en-zh-gb/Manifest b/app-dicts/stardict-langdao-en-zh-gb/Manifest
index bc5e6f4b708d..76923510f086 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/Manifest
+++ b/app-dicts/stardict-langdao-en-zh-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-langdao-ec-gb-2.4.2.tar.bz2 8743872 BLAKE2B 1c2b0857e8022560ebca3513dfdb9de32bbac185ed5871d7cedd9b133364cfc484425101c9298b981f1a2991800ff1ba478e9fcf66394f3b18425203145b4df3 SHA512 0d108814f04a3a1e3947ccda09b5c89101d819a8fdfee16fcb1c8c8eacca0213adeb396f3237d66b461b9a262f0892e8209607e1a16594e957ccbd4960020a7c
-EBUILD stardict-langdao-en-zh-gb-2.4.2.ebuild 324 BLAKE2B af0d344157c1d7284520800669d6319ef581c705343e9401055b08e1315d10f0dbd9e059bbb0fad0a9e6c093608443a81827f7fb02923e15883658c122aa1cc2 SHA512 66a3a564c728f777e4fa3a9ef68ff892c06cf211d52ecc59253a50dcacc8da251704fdf583831ad89c2d91ca6358fc07f5a52af6c2e7433e10f16d8c05fcea3a
+EBUILD stardict-langdao-en-zh-gb-2.4.2.ebuild 328 BLAKE2B 997c593b596248b91513991e74d0ab8b388cdceb406bbc0f2021131971174833c6df1ea2b84894ee08a6366760ec03649bc0d6ba141d1879720efcddb840438a SHA512 ef88b16ef816c9e4ef2b873f45920b2c7fb576484eea071cdf138cf57dddfc50f3a21cd3470d84a94d86f6cd8c4f76ec3dcaaeac940818fc38af4c641ae81770
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
index e6f2b5a44eb0..b21be46590ee 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ppc sparc x86"
+KEYWORDS="~amd64 ~arm ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-langdao-zh-en-gb/Manifest b/app-dicts/stardict-langdao-zh-en-gb/Manifest
index 17cb9624f9f6..2001e0de6bf9 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/Manifest
+++ b/app-dicts/stardict-langdao-zh-en-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-langdao-ce-gb-2.4.2.tar.bz2 7345014 BLAKE2B 6ba9ee32c580bf57f16821b999535d8bf2d5fe12e1a48d7d11b31f9aedce75d732aae1181957ced5ee212e43f7e2f1d766908bffed1369c4f1c925f40c6d8fb3 SHA512 e72069732799f61d3ac4649febf859e7f32fe75453c2c275c4fa8948765823e8afb94494204dbe52c28d9f4c36e91e0fdb76b7be720f7de5ce17a1ac323500d6
-EBUILD stardict-langdao-zh-en-gb-2.4.2.ebuild 325 BLAKE2B d970bd3791f0c4c39cee7260e0dab2ccad092d9ae8368e794d11ab467a313445f64a2b94754653bd51d2c63682bb6206bbdec15fd4f01fe4800fef74b58b0f1d SHA512 05f70024a3607bed2a1d446cc94d45d53ae5aa28f56b979377006618b3ec6617dc28aa3e1665a75a7a5c49a289c57252c90f223e0de4451e2f99d8ea9377c10e
+EBUILD stardict-langdao-zh-en-gb-2.4.2.ebuild 329 BLAKE2B 930ac6c5f2ebffa1a4ce7eea1ef186de0c216d088c185b7e4990b6bfa6436f3ccbb3b31c3d1cd4a25727d8d5e82b387f916ff5e7eb9d7bb4478af28d94793ac5 SHA512 e5324499f25b2765c3e4652ba7675ac17cd7a7c74d2d641d9a75891706a09897c231df3a82680b4e357bc33b1fc44cc934a227991efbdfbdcd7d1a69b3618655
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
index 2f77e37e702c..dda6a9e372b1 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv sparc x86"
 IUSE=""
diff --git a/app-dicts/stardict-mova-smiley/Manifest b/app-dicts/stardict-mova-smiley/Manifest
index 705340eb3190..2463d5890417 100644
--- a/app-dicts/stardict-mova-smiley/Manifest
+++ b/app-dicts/stardict-mova-smiley/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-dictd_www.mova.org_smiley-2.4.2.tar.bz2 3625 BLAKE2B c1d467fe64bdb91a9478294e34a3b21b3aabf96657f268f4efbed99034e438b04e0e16ac9269a508451fa2b992e5feb9ecec50ad0bfd0d663ae2b0c853f5c019 SHA512 bb9900449affee53d7051ca8f247318fed4c97802051b3a2b78801780ac77d0f5bb21e6286feb9054f265d59f543eb80c49471918f2c1d323bfae350f37b89b2
-EBUILD stardict-mova-smiley-2.4.2.ebuild 329 BLAKE2B 8ccff5e840ad1fe86711e8c1cd8a74a96ed9a842fc24f950d5102c71a052fb1ecb614eff5a23ed22b167d80c8553a62a26ab8b9d9372c3a41595291e4872b241 SHA512 a4d0cac59e4e221f69ebba69e88553a897abe29d192e0bdb2f40866de5007721f72a583e26d3c67ea0261140d615c319e57733aabfe19eeeb43f23a819781308
+EBUILD stardict-mova-smiley-2.4.2.ebuild 333 BLAKE2B 1a1884d5fd056b6beb52c2a4d1cf9a6dd08eaf103eeb7ee53081e75fa73d851089f65b052562655920eff05067f36d0690c6d4f88ef22805fab17ae5049242fd SHA512 d9b77c33a8158e96c282289f9061bf17e9874e68492296dc82a15110a7c1c208efe57477bbadace1172a3b02d15480c923d575f50721b5e05d0514bb33996d42
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild b/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
index 1ee09828d54f..7f39aa600b5a 100644
--- a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
+++ b/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,5 +10,5 @@ inherit stardict
 DESCRIPTION="Stardict Dictionary for Mova.org's Smiley Dictionary"
 HOMEPAGE="http://download.huzheng.org/mova.org/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-oxford-en-zh-gb/Manifest b/app-dicts/stardict-oxford-en-zh-gb/Manifest
index fb2ba3ffea3f..73e32542b1a0 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/Manifest
+++ b/app-dicts/stardict-oxford-en-zh-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-oxford-gb-2.4.2.tar.bz2 7673526 BLAKE2B 9f4dadffd457e83b3244ca490ff7867975398f00b348aa1f2fab5918b9e9343de2a9d25a9e7db5031562a4523b918312de5695193adbb66e46f7a1d43f34cd0f SHA512 f5cdd87f6a90a714ec0d71a9883e504a8bc1113ff80ccec0c85cc8d862ca1048327822f2dabb163eafb1542b85e634c082c1fcf936ccb5459620e081f69f3e88
-EBUILD stardict-oxford-en-zh-gb-2.4.2.ebuild 330 BLAKE2B a9d61094b4a55439b32088ceb0a2d048b61fe5e2b9c1546fb0e7b9e9a93e728c252f83bd432dbb6987fc32310c0906a41f1979087e1085c826960af898abe63b SHA512 049e550df35eee7d51e2abb1f0dd027cc7e5a47ebdae5172b523e629bfe613b02661727a58be8e51801c87418b85259fab49158193722b7aa769b0afce1e333e
+EBUILD stardict-oxford-en-zh-gb-2.4.2.ebuild 334 BLAKE2B c1feff2317558bc300cf10be92bc156514ac86862175696ffb5d2e14142885990c130697ca3c057aa1e51f40ce645c47f763d4aee014759be8201549409cb5f1 SHA512 5436dff8bb8cf88cb9ac8723954f90813bcb019415b36e63b9275e6c3d0162f386171e26f612e72a38cc44001cb03907cffa448fd14bce542e9e1f180d2a5380
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
index 8c5a34b6ee37..6e33aa93cae3 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-quick-eng-jpn/Manifest b/app-dicts/stardict-quick-eng-jpn/Manifest
index b3c114560b67..2b1971f09c6b 100644
--- a/app-dicts/stardict-quick-eng-jpn/Manifest
+++ b/app-dicts/stardict-quick-eng-jpn/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-quick_eng-jpn-2.4.2.tar.bz2 792487 BLAKE2B f6d2e6b5b32e663c18f1984bb892aec5f9eba946bc2fac843b3577dbc338b2f18f2bff101cc5db236a7231a792cc24b978ec2ca46a58785b0fc4908c98de520f SHA512 82202a1741af52e8dd841e24e3b670165bd60780c31a3d97a9a62f82d94ab3e61b036b93405f938bf585b6356593c4678079e521616282ee5f626b92d0ece1f0
-EBUILD stardict-quick-eng-jpn-2.4.2.ebuild 292 BLAKE2B 95f88f73fc1ac1b5ed4b736bfbe8be0d18fdfa943ccd0aec7a57ada04003c7d454f35e688d59d966712e6ab9abdc91e9e9bf78dcbb140c4a2d318fd47ba74bb6 SHA512 bdedfd1c5084db962f0d0c8e93b31e66de416965f680e513b37c13d4b0621a01c025ff32da29eff8d4e0fb29e48d402e3a04ef8d6d728b1ae6f375697d099496
+EBUILD stardict-quick-eng-jpn-2.4.2.ebuild 296 BLAKE2B a6faa0a96f85c6ce357b944332e23f77b969fe683111f59803116e1401b2d30e749c74e272a916a1763e877515d144969a8e0115d5749734a2d441ffbbc64618 SHA512 4884723ec20fcf0b251609483c8c85748cef09d36413febb900a0df7459ddb043e75ebe6ca1a84d2a86b3e969c5e51c18064c6b82f5cfc80a093a5f46665d1c6
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild b/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
index 75e7279248f5..a9f48bd863d4 100644
--- a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/Quick/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-quick-jpn-eng/Manifest b/app-dicts/stardict-quick-jpn-eng/Manifest
index 9ca263acd4d4..26c1bfd6d50e 100644
--- a/app-dicts/stardict-quick-jpn-eng/Manifest
+++ b/app-dicts/stardict-quick-jpn-eng/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-quick_jpn-eng-2.4.2.tar.bz2 842456 BLAKE2B ed1cf7a875595cb8bd7b90c00784446b45a61f35af460543a3699cf38a5f1458c8099ddb169044edcc028a2265e627731159bb1e51fd3a83c7036ac168a88b67 SHA512 bc188995ea1d333b66e70f54fea73d31dd2a1f50c3d2eb3a11f3ae785a2d136fbbc1f8656ff5c2206cd6ec2bebbfb7779765afacf9ae4a9761ef6d0761743c0c
-EBUILD stardict-quick-jpn-eng-2.4.2.ebuild 292 BLAKE2B 5a541f59971dc32c1f37df2c1b2e20f2ee84d7b0ab1867bc823ca6f57986dbada8e6bd0619737f82dc64d6187a5bbf7789428522490bb5208d3513dbee0f29b1 SHA512 8a3180a10fd5b267edded64e5197a851c36bc9e5e9786f487977464a6d5ca9bc3770ec755728e1e4bec96b99b1d40b9989e4fffa156aafbbd85e80f1d96095e4
+EBUILD stardict-quick-jpn-eng-2.4.2.ebuild 296 BLAKE2B 217acdced06a9f91927963329c1fab3635a2df67903b1a241167785bda9f310034174602c69ea47218ca618d9fac3b5633bc0b4a9255c18043deb16ec28db1f0 SHA512 0427ac8bdae7ac5fa6ef4a499674624feb894febbad893c9a4a69ad487847f60143ba5f3c171d2d8f8f6f71a3f3c1ff877dae8f0431792666fddefc90d785539
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild b/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
index 77fd2960e98b..e5d58aeba9a1 100644
--- a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/Quick/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-quick-ru-en/Manifest b/app-dicts/stardict-quick-ru-en/Manifest
index 8511f6b17906..2cbb682fc4e1 100644
--- a/app-dicts/stardict-quick-ru-en/Manifest
+++ b/app-dicts/stardict-quick-ru-en/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-quick_rus-eng-2.4.2.tar.bz2 320743 BLAKE2B ef94437159ccd615e9e5a2d519f347eeb505039042b5714a6b53cc55544ba8996a8ad500709d41cbdcbffcdfd50e247b53a26606fcdd0a4b354a45826c7bb1cd SHA512 a9f2e7c94b888ce1bcb58d34de00fa66e160873048d6144adb56aaf45fcf361cd10ef35376a02560eef12466c18d7acce4e45c5872cb949e8ff9f3743e899169
-EBUILD stardict-quick-ru-en-2.4.2.ebuild 359 BLAKE2B ed54bc06f9111a4ad28626ba92702f7844b7f54670e2e1186356abfb6e29789f094ef308c886f634b887a6852dbdb2bd06d9bec795c96664a6c19cf9db0a12fe SHA512 85e4cde6c5111327cb571d7c93616eae415810bb40f19eb7d866f928dc2ac28222ef767f5131e6e309be62d718e8f0533a4cab51bf68b1d5630aa1fc08ddc1d3
+EBUILD stardict-quick-ru-en-2.4.2.ebuild 363 BLAKE2B d11a64165fe6406b6eedda83a744b914a4a15fb6101061e8c6a36a80fc915cea9892a6a696c0a34181475464d35ef095dd6cfd89f3544da0ccad0b810930e7d0 SHA512 7c920eabd855148bff28b18e61ddea510ce521d1408483fb4f25c01044b871ca6e68c9a516340e1d3e8a03209a129a70c38ed620a1cae4721da60a66d402e6de
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild b/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
index 366d6427604e..03659502301f 100644
--- a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,5 +13,5 @@ inherit stardict
 DESCRIPTION="Quick but still useful Russian to English dictionary"
 HOMEPAGE="http://download.huzheng.org/Quick/"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-big5/Manifest b/app-dicts/stardict-xdict-en-zh-big5/Manifest
index b3f21d418349..933fc9587d59 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/Manifest
+++ b/app-dicts/stardict-xdict-en-zh-big5/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-xdict-ec-big5-2.4.2.tar.bz2 3565145 BLAKE2B 5dbaa6be1e1d284f6be2a6e38bd011596227abaca86b1c4b7fbaf7f879c5f32b21592c4ed2283a1a0ec46fbf1f328eadee39fe9c76ee99307aa3cf4593c2be34 SHA512 bb8cde597cdc197bd71d28795396d57c5504551f2811ace7c9c1d7b62105c95b49218a39c70a1e412129fcb4956f626a08d19768be0fa1e73f445d2cec8f2f84
-EBUILD stardict-xdict-en-zh-big5-2.4.2.ebuild 325 BLAKE2B dedf2033a13ed3407d802c19924d3092b2bc5c363e74bbc83ab2157c9c3fc7070b99fcfe00510fdb0c6583b8bb7d82e42342ee98530f130f11df37d763afda29 SHA512 9efafa7aeadaecf0764525e5da3b9b1134739251dc2bf398a797f50adcdf5688ef1cc0eaef40ca147fc0579403093de538278c9d6a5e21a90287c269625b00d8
+EBUILD stardict-xdict-en-zh-big5-2.4.2.ebuild 329 BLAKE2B b33664d6bc6b28eac81161e054a8a14c4283719631ae61bb018306a92dde017e37963a0605d1ea8899941c14d4cc837b0b37caa04e90b23d9faad7d63cf58adf SHA512 33a9ee9bd611a157493319521949a4023e5dd94d4caa218b0dc2075425e9f0584ae9da728970c1866ca7eace33606b6c3612a31c9ae2e792e0ce1c3cee4292ca
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
index 85a5238eed1a..2ae3750f957c 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_TW/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-gb/Manifest b/app-dicts/stardict-xdict-en-zh-gb/Manifest
index 8354dcac0b3b..8af9c0e3032f 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/Manifest
+++ b/app-dicts/stardict-xdict-en-zh-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-xdict-ec-gb-2.4.2.tar.bz2 3588346 BLAKE2B 28cfd8e614379a0cdbc3d31ce79401402b163621ce399667b772b3cb556bbeb1d7d6b0928a6ed74117768ef1531768da8e805d4e7f6d7f4540785700ed282951 SHA512 df868e9e48e093b172a49690a831ad492957a39748cc4f59615b995b39473a511c7a7d09a16af0062a3a525312c0650c673ee1cb1378e321f0a95733b76312bc
-EBUILD stardict-xdict-en-zh-gb-2.4.2.ebuild 325 BLAKE2B 4cc553e3f68f1f6a07c3695f2e9597fe8710f2d6f21bea2bd16de2de6348511a74e1c5d72cec9558051f0c6e9641171b79bd3845aedb485e799031c4b662570c SHA512 1c1782fe020223dc34f3d9fed59e6000febca513fe0ab2b545ef055d7e31f46728e94b01f17bc1d30cf87564581c9c6fcf5ad1b1e6996bb48f926e864c54d256
+EBUILD stardict-xdict-en-zh-gb-2.4.2.ebuild 329 BLAKE2B 886522a346e321fec66fcb7679b5ab7fca403782747a0c939f93d05cfc9168e51c05500742039dd661d93e5825139c1649fb870235bc23fe6ad93ff7c0889900 SHA512 e275d0bf15f4b00afc983366fe1ec0ceb2afdc762828b9a0d20aaab6bed79bd61423896ea55761fb41500cee2fcbaf781503d5019cff1910bd43119a64e98f73
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
index b18cc42b001c..b16257949ec6 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-big5/Manifest b/app-dicts/stardict-xdict-zh-en-big5/Manifest
index cc8617d1c30e..f8456c0c9954 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/Manifest
+++ b/app-dicts/stardict-xdict-zh-en-big5/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-xdict-ce-big5-2.4.2.tar.bz2 2397897 BLAKE2B 09b0b515553316ce57f99bf44489084c16f0315a191302ba374da2e9b2d5396afc41700e21bdd9f58a6e4d6ebecf6cb9b73be3d61dfe3a733ab6343a098c8a36 SHA512 d07fe8af3597f99696c98d90676ecc035aa1b2c4dc33160b4f347f93342b4dbbc3f9bf20b737d6502770ebb048e557508bea5cf0c516759093372b0111d1384a
-EBUILD stardict-xdict-zh-en-big5-2.4.2.ebuild 325 BLAKE2B df411f396235aac760fb0af6db8b3d484cdefef32864a1158533e262430cba3a75d4427d899c8adcec89f2f11cd27a695f86671a97a698512cfc326c7bd15958 SHA512 fd8887b6ef7194a8bf3c77e404e81d0fd4cac27edc2900a57470f9b20a1bf96ceeec85659cf11c38b1a5fbc343b6da9d3c1508bc822ee9784cf0228f76e96568
+EBUILD stardict-xdict-zh-en-big5-2.4.2.ebuild 329 BLAKE2B 473046098a054bc4e7b690acfac1a3b1b74052495aed81abb626b8dcca7d540117c4d5bb2bac5188f89a90742aa673929bdbdee2e5f1fc15a2bf548beecb86d2 SHA512 be256899afa5bf8b3f544984dd7f334da774df53b28504bac141a1c4ff2d3df08c756c07b348baddf4b20312e6162f20be18beba1b01d68ec9abdef98b545bfe
 MISC metadata.xml 424 BLAKE2B 2c3a93933508bd61db7e4e60eb695ca932dc7e6ce68dde8f059051d2deebb839cdfb44b824c6e486cc9bf2780298e114014fb999ba44d5a15f3c7d4763f1dd74 SHA512 b1d6d0216124705a7416fa8c2653df5e97ffc77fe41977044de1d7a75e3a57eab5128c94a633fbd5cbe45b66facf6b22d492b4f7ace33c324760241233ce6e5a
diff --git a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
index c7287d103d7a..546fcb112d4e 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_TW/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-gb/Manifest b/app-dicts/stardict-xdict-zh-en-gb/Manifest
index 01daff58e71e..8066ecc23f9e 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/Manifest
+++ b/app-dicts/stardict-xdict-zh-en-gb/Manifest
@@ -1,3 +1,3 @@
 DIST stardict-xdict-ce-gb-2.4.2.tar.bz2 2438365 BLAKE2B cd612c5c95023352c1bdf47d0a8a059f02c0b2c9dc47b3a7bbb046dbcabece80a80626f95d487798d982ae50d72a566178691dc1727eb1cc4e3b0d79b41b0317 SHA512 3b1b2cdf0bb69371c73a50930e2ba48cc04e8a6b7326a80417f12eac79792c40c0b4276a0ec696e26c43e6615b89f0f8abbc30320f71160c7902283be96eebe6
-EBUILD stardict-xdict-zh-en-gb-2.4.2.ebuild 325 BLAKE2B d99a9f480c5aedf2165a6877233a4ec129ccb38580de446b37dd747113930b1e3f6590ed4b3acd6995ac17f182ceb959aeccfd564f147d8ebcaf3e1214f97816 SHA512 91afbd5ab5fd550f3d0dd21c9dfbc3096cf45a76e952b5df2db2235b07683b291cd6dee2543aac5002d4e18e52f6914e6c78f56545652caedfc0cffc0959ae2d
+EBUILD stardict-xdict-zh-en-gb-2.4.2.ebuild 329 BLAKE2B 58f2e79e5c32e53870da967f7aa24e56239292ed8c04d49c8b130af9dfd91cd38afcebf6a104519739e1fa7ada25c52e6ce6bea359e6fd4c1b35c719973c5344 SHA512 3248919abe9923ccc838f351037bff297f108e4133766ffb28584125428c277b1b2713ce9a28c51e08fbb3253e5ec622491e630c2853e3c34f643122d33270fd
 MISC metadata.xml 329 BLAKE2B 6c4f1e1b54db0ee33e255c3a28ab25aced66f58e3a7b0886d87ecdc4433e92666b38e4ce1bc612f2dd5230dd880536c67ee169f1da11433c26cb7f01ecae2fa6 SHA512 dfdcbbb2808e0823b2f1ae3e213292d57b42702a2bfec14d60a989cf7d60be0f423f65a24a1fa1fec1f14e23aff5755c616aec0ed91c73da85d05a4f508372e9
diff --git a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
index ec50d69ea794..8e200547bcbd 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,5 +12,5 @@ inherit stardict
 
 HOMEPAGE="http://download.huzheng.org/zh_CN/"
 
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index e8def7a11bf1..25d098683124 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1,5 +1,5 @@
 DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
 DIST verbiste-0.1.47.tar.gz 781085 BLAKE2B 39f92bffc2165b49a2cd66ced4337aa4eb4253a1d767f0c26cea0bc10e965a5547158ab0de796b76016fd46bd220b305a14c9be42b76f5a25f0fde85e4ff1b97 SHA512 cc06d3e4a09b9edf2fe3996f527ae05fa50af909cc5ea6ed830d1b4f5706cf9b29028160cff842a211148e13d736f7e2cb74f10b3c5fd84d93a1038e05a26cbf
 EBUILD verbiste-0.1.44.ebuild 1077 BLAKE2B 471a7b35cbda9b96fc7f9a3ccaffa551dbd2f5d187d40494214530e0527691b8cc581654ed7f6da74a74ce80843a7c220582ff9191f46682c034b1610cbe3c41 SHA512 71854c5a75f47c23b87d229c1849164d3f9b248d4cc78a8786a9656be8726d752f9331f9b03415d9ebe4273cf4d56ab2eea49a660b7354c0775c3039444c0164
-EBUILD verbiste-0.1.47.ebuild 1077 BLAKE2B 471a7b35cbda9b96fc7f9a3ccaffa551dbd2f5d187d40494214530e0527691b8cc581654ed7f6da74a74ce80843a7c220582ff9191f46682c034b1610cbe3c41 SHA512 71854c5a75f47c23b87d229c1849164d3f9b248d4cc78a8786a9656be8726d752f9331f9b03415d9ebe4273cf4d56ab2eea49a660b7354c0775c3039444c0164
+EBUILD verbiste-0.1.47.ebuild 1084 BLAKE2B 3b51aa81abf03300c16440b199eb79295ad6946c44e29ad163d67d1c9de7077e657e58af9646c2701cc7e78a48ebb4b03c548516117847e04831d25b71696646 SHA512 24dcc9e1963b8089c02a866d52d446b5d40aa00582ecf1bd4fbcf25f3e708cb675a9fa0a4214830cc1a76aafc18a089efa0088a7c7ee1c363f63cf1d693007c1
 MISC metadata.xml 216 BLAKE2B 19d9ce8f9d3cc8937114af6ce009bbc41960da15d2a24c0f5b220fded2276bd2f4d6fc3771998f2a89e71e08489d64c88dc188845038c1e2ab0f23aa74a5376d SHA512 8033d58314e669936806a9c4bd8101859b282b67ed653cfd3bcb178f3db32ce89d29bdce1faac965d6b8a32c3c56d11d89064c74e5a2efc002ed06265b161bf9
diff --git a/app-dicts/verbiste/verbiste-0.1.47.ebuild b/app-dicts/verbiste/verbiste-0.1.47.ebuild
index 216d19d2a72a..b69e75d422a3 100644
--- a/app-dicts/verbiste/verbiste-0.1.47.ebuild
+++ b/app-dicts/verbiste/verbiste-0.1.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/app-dicts/wnn-ldic/Manifest b/app-dicts/wnn-ldic/Manifest
index 64ab53bf1b9f..5b9ad75111f8 100644
--- a/app-dicts/wnn-ldic/Manifest
+++ b/app-dicts/wnn-ldic/Manifest
@@ -1,3 +1,3 @@
 DIST ldic-1.04-wnn.txt 333702 BLAKE2B 88340da9f4456b338f291c52b110d2507f0ce40a25fbed2793bbcc7cb9f0b5d1e780584c2b24238fbd13f76d0a0b205668ae44aedbff255d97576b4a41a7c0c6 SHA512 26e44e5163b72f99f7aae9fdfd8f57ba8c117764bdeeebd78ca092352532197a99e7e9ca57efc59dc37114713314bc1bc0fa5fa179b708542af381d6e09cfc89
-EBUILD wnn-ldic-1.04.ebuild 843 BLAKE2B 111b102747e9712efa52d8d8e3c32e89f38e081415025e71f861128eb568cd3aa111fd021e4a97aca5eb53e301fed71534e7ac847ecf95a154b9d30532d48ebc SHA512 6ae9ae70d927f1496e7a5d023cbf6e3f15ff07859c5e0b1e64aeba68d07c42756ad2b077072682a57034d5953f3985890d43bbaf513fabf7391eeff6f8a66e3d
+EBUILD wnn-ldic-1.04.ebuild 847 BLAKE2B 7ff721daaba03cac12977e94342c69d0098cbe27224c386e4c2d4fadf4f8b35f4a621ec37abe948a0f756fb18fdf2b966224f9b5e2ff45d869d2893b28255ca2 SHA512 d6f585d9e6b4e251fad24bcf135d6139d8dbc6ed9a6ea37352421debe54b135cce5987612b7562ab126fe582691fac5e96c0c3cff077f8a4aeddfc8877f92fab
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
index 9c3817297866..0f45b493a69b 100644
--- a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
+++ b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/ldic-${PV}-wnn.txt"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="app-i18n/freewnn"
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 6b866fa3c126..75042b4590d5 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -7,5 +7,5 @@ DIST wn3.1.dict.tar.gz 16358468 BLAKE2B f3df09f39ea29fce3378122f1a93d713acb8be39
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def682fc38566d6abd3832bf0f7eae3b65b63e8b16aa21656bb81c1696bec0d179028ea8bb4687e5566a6d679bc55e300b9c SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb
 EBUILD wordnet-3.0-r4.ebuild 2099 BLAKE2B 7b936c3a1fe97bdd0223e06e5199b879aed52346542b50f774f15b8c633e2a237e3d0f8c0e191f0491bdf39e3f167f58c8c6df29d4a8b1c78be0cf88fc7421b2 SHA512 1ec886133b23f931052faee2a0a059f380879524f36f035676f4ac123ea0215386520ddfe1266fc030dea285c41e2f727dd0c0630458bfd8f85dc5d4b141062c
 EBUILD wordnet-3.0-r5.ebuild 2149 BLAKE2B 3860850921c4f54b21c92540870204210bba2a74ee9feeb05dd39c7cfe8b02ea7f46e24a0a73c6715d0c0e59af8454544dcec6e4b620a4941f5acf71b5de3398 SHA512 4685d889a731157f4a9254e713e1138539715289d1b50ae74cbdf63fc8205e36772c1abb5013173e5dcc955c21a2f1d1504e8337cffc73817473855abfcce78f
-EBUILD wordnet-3.1.ebuild 2764 BLAKE2B 64814eb3acecb8fabf824243e0f95a5cce1d8db1a2bb05c4ca7c2a3f1fcd486151a08441e638c9b7b6aa62b0cc5ff9a140f6bdae94271516e988d0fe722008de SHA512 426ddb6ecf3ba6daf6c27e35d967233c251885df6ab568887572eea44fb9b1b2ce71dc2e293c8c6885ca9a72afe8c7c795ee381646d835a42c7706d0dd824105
+EBUILD wordnet-3.1.ebuild 2771 BLAKE2B 095bcb04229fdff461d1198b2cd46a5eb15be069a4799721b4c82cc93d9b3db3e68881c753a3cefa0f38899e9d19593573558f9340e4b047922279129ab5c157 SHA512 5ac6e0691a3798e3094ea864c6d4112f604c0f94de702178d80932eb31843b5344cad42fdf599d5dc72574e839f9e80241c3c23eec15fe67b40b16eb4fcd8359
 MISC metadata.xml 389 BLAKE2B 43d6aca669a34a791eea459cb4e2906b573e09bc03d6e79ca9432c15ebf89286a28378ac20a28467bbc6f6bf629ed20ea4e608a09762be8a677c0e3b7134d6f4 SHA512 562aa5c687da46765c959bf235ab0dcd5ef6edb9f105d46c50853dac8685a68ae8e9507662c0fddb2af155ced2aad54fa4230f467c48ffc2ed2fb72c98144297
diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
index e6f8e9318c1b..ff31be0b663f 100644
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ b/app-dicts/wordnet/wordnet-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="Princeton"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 # In contrast to what the configure script seems to imply, Tcl/Tk is NOT
diff --git a/app-dicts/ydpdict/Manifest b/app-dicts/ydpdict/Manifest
index ad76a3010d38..60b9d077aa36 100644
--- a/app-dicts/ydpdict/Manifest
+++ b/app-dicts/ydpdict/Manifest
@@ -1,4 +1,4 @@
 AUX ydpdict-1.0.3-tinfo.patch 322 BLAKE2B bfde4da1cb49749e8023f7c8ce56dad45b9ee39e974eb59df41e40a4770debdc8f47f4ae03bba41739bdbfbde5ba90315f454e3fa8f5cf8cee668ffbb109e0d5 SHA512 70e0b4b528dabcf9889eaff2909e11a8481ece94ff50d90c7c53e1b5f655f3954bbf694446ee3cf4fa2ac21b1c329d627412337f17da2e8a0a1ba73a45304857
 DIST ydpdict-1.0.3.tar.gz 185721 BLAKE2B 1db80dc20dd6d71c4b7fed2051bbfae1021fd1ea15ca1f993e8e095912fbcc8d599d8f480143d185fd11c6a1414d7f29ae67a9f5cffda624b434d198cddc5c68 SHA512 ca50c485f10aa4c4691a27a474a5ae814be3bb183b4927728f14de67af1e11a281e5272fc5777d6573e69dd00d3da2223b78d729132764338c92489f20eb17e8
-EBUILD ydpdict-1.0.3-r1.ebuild 1121 BLAKE2B 6354b7c70264bdaf49e82beea5cc4988a2a864ee1ab4dfcec8f971f52938207e7259e2e6a06cb4d4c4f31f8b1185be17086f49e816ca3565c904585a50b4f690 SHA512 10de9cebb29fe14aeda6bec748a043cc1e7b6bd9ba6ea19c43050b9a1280198c3d165c3c326acf9281f20a76c7d3689f416eae29d8046c01a3ddedb0d591db14
+EBUILD ydpdict-1.0.3-r1.ebuild 1128 BLAKE2B 123b72f70e9486fcff45df65503d9550616eb0354059b7c8ba035d78fd3ae76e53b2c1fe691e0e462d2feb8261a10e3946434fbe0805c37e0fbd874ec87e4122 SHA512 bc02d02d05550878549fbd1e795c5e4d7ba76058ad160f46aea5dba3b7b6b462e6dc6f6525b5da27a75e16ae9113a1d08b4f0dd05fb2ea72ba16e34b7fe66e46
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild b/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild
index 16c2253d2d5c..a8c5a6d541ce 100644
--- a/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild
+++ b/app-dicts/ydpdict/ydpdict-1.0.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="ao"
 
 RDEPEND="
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 52089dc24048..d121b836cc52 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 06e168942c1a..6dd00e81ca93 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,7 +15,8 @@ EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c2328465293
 EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
 EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e5dd90d90b202fb36c0d8c247487d19cc8614c9c938b81598c0f97ef43f846dc14e3160b06f10d2608b5a517ba58 SHA512 2de603b0688d3648908b86ce0c7737e8f8e31500a07fe84c57a19d53e0b3d8039a949d88ea097d40074ab1eae0780cba164a3e8e03ae94a94e1d90298360cf6a
 EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
-EBUILD emacs-27.2-r4.ebuild 14415 BLAKE2B 3ba0a0bb5066670fc671deece5fee4480aca1a088f98830d9c6d7f01928d531f41ec0c050eb590d89545af4a7f63195b7b08cd7de115b78ee0c79fac44064fb2 SHA512 94b84e6a8c0d0711f77de7ac5102150cebae6040a2b744cbdd445f6c884825be9b4a897574d15781c33a80017aa0bdcc05ba4bd861b4193fc641f1458dab2fce
-EBUILD emacs-27.2.9999.ebuild 14283 BLAKE2B 12dbe5a161e22524bb4d02d0d659b62a8f1940a9a6382b898e6e23c268112f583938225b4f94c8ccbe2bf2e7b70356539a8623eea12e58ce5d2ee272fea16a20 SHA512 1e70761bb0b13dd24515f0e7e9e0e1676d80ff5bf7bd0138d8cc7518a8ae1b20907ba7b12c27b904ec871576a634ee265cd894a7c2e2235c7d7101c16b0f6dbb
-EBUILD emacs-28.0.9999.ebuild 14448 BLAKE2B 88fc7d442c04c87045b2715fe72845289acbaae4e5586965fb58353e48c30950090b6550e75781f9d1c3ffe135bf97d504409e7247ad933a0866bf4e53627901 SHA512 646f9df3bd50ced09b21d28b045c7bd88f6b7dfaf7c341100d4a7c8696de1235c7b410ae559378824a150896eb17b2d420fdaaa32552b3047e6d1de0a4231fa7
+EBUILD emacs-27.2-r5.ebuild 14417 BLAKE2B caf2f97a6ee109d0bb460f076408a10bde808758d7b19a6d0641f3aa73996681b4eab5b99e8bdec4127dab08eae848da8a3358a1e8a8a9086199d78793987335 SHA512 bb9411a6d90dac795b446ad86a5b586ed4aa8140534860ecaece4a738b7c7d801ec0b42c1e4a0793483be5a070a040aa0af484eed63ee561743b6a8e3361e04c
+EBUILD emacs-27.2.9999.ebuild 14285 BLAKE2B 87ca6c37fccc5e6d24111d6167920d28de47dbd3a77bc50003c0c3a89f6e654c1f51a05b9dbf4a1a200e4f40fd1cb4cab30f3c2f53d3aefe6e676b175db7cb84 SHA512 c2b9c90534fa1a9d67d7f50044b94c6136e572d9cbda836fd9a046434ee65d3e64e5b88a123496a4bbeb487156d66e2960461f82a71d0c59f3229273c3616af9
+EBUILD emacs-28.0.9999-r1.ebuild 14452 BLAKE2B 68d57670ac0d6b470e259fc709b2f3e855db9c2dbe64ea5d65a383eebe2e4f82b2fc13dce1fc8a6119e5189843d1337ffc5cd73425c46c20478f45e0aef9364e SHA512 b365d7c1a75a95ec3e9b6341c204436ebb67de08ff6514fca960c32ed2da1db460fd0641dd4492b02ea8d2abe47dbe39c30a92f60c06aa0edda3cd6fec529cff
+EBUILD emacs-29.0.9999.ebuild 14450 BLAKE2B 64ccaa69ef1ef032c58f1d54b1f8f5c45ea6e7d443792e19b440541e1fda9c167ba6d7863f33fd648289cd53864c817cba5af0322c00512b48e732fb81252218 SHA512 71a8bef26f44970ae7dcb63ae1dfdbba2f0bfaed6a31e5311a6197447afe3511b66a927c1f449ced7213a88ff9000d1cc4c46578c157c3379c50d0e2e3e193e1
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild b/app-editors/emacs/emacs-27.2-r4.ebuild
deleted file mode 100644
index e0f01a2c3216..000000000000
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}
-	!app-editors/emacs-vcs:27"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
new file mode 100644
index 000000000000..e2efcba31d59
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}
+	!app-editors/emacs-vcs:27"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index d3ca04ad9dd8..9dd86d34a32b 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	gmp? ( dev-libs/gmp:0= )
 	gpm? ( sys-libs/gpm )
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	kerberos? ( virtual/krb5 )
 	lcms? ( media-libs/lcms:2 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.0.9999-r1.ebuild
new file mode 100644
index 000000000000..156f7ef44d15
--- /dev/null
+++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? ( sys-devel/gcc:=[jit(-)] )
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid
+				toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
deleted file mode 100644
index 9050791f1d9d..000000000000
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? ( sys-devel/gcc:=[jit(-)] )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			Xaw3d? (
-				x11-libs/libXaw3d
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!Xaw3d? ( athena? (
-				x11-libs/libXaw
-				x11-libs/libXmu
-				x11-libs/libXt
-			) )
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid
-				toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
new file mode 100644
index 000000000000..cc1da333c7fd
--- /dev/null
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? ( sys-devel/gcc:=[jit(-)] )
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid
+				toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 0718c7b037ce..8895af48ca85 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,5 +1,5 @@
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
-EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528
+EBUILD hteditor-2.1.1_pre20161206.ebuild 1061 BLAKE2B baddd36402c3db59a937daac681c9a452ec528c37e3920f260367d8f66edade7827ac19d6682ca132c2356c5b82ec6a451334a9e3f2d8f1db9c5219d1e9f874b SHA512 b1a6a701ff9a2ee77a76fffc4a89ead2c8dd6c5fb52c94800a2010bd1ad5cd7b5249f6854ad6657706af348cb84ecaee56bca42f0b05d88aea6e27b78a99deab
 MISC metadata.xml 376 BLAKE2B 95d795c64db08ec029ca3e697d144fc92efa003e34d08b5e47143fcce22c53bde664b17147c88d55e21cc1ed7999c83f0c3e77e6528147d4b47b1c7ae4b86f83 SHA512 e728a6956ccce1324699fc0c5496cb5428f7a1d130647a3331be2e21f89cc9f21fa49ab412b9b0a48f993f2e3bcb601276f8124e0dd38ef656f3dc0cf376dfac
diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
index 9b87e74ff978..d74e18c724cd 100644
--- a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable
 HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
 #SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 # tarball is done as: 'make dist' and then rename to mention latest commt
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 1979cb832b19..710ae17fd6c2 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,4 @@
 AUX kakoune-2021.08.28-php-filetype-fix.patch 738 BLAKE2B d9f940a06b03b65c3936120823c98412a303032804f31725edaa591c4dd02d204c64fb440f03b72c62e268f99c7333b8d6be345ce254ed5ffc1c36dbe942be88 SHA512 be24943903e4e2cc728234be29119b5e2f81aad80c8ba88d400d31daa008045e7a81aa4c89670293e0b7267ee0e6e79ab9ac1480ced41dadbcffd6f22c46dc90
-DIST kakoune-2021.08.28.tar.gz 654429 BLAKE2B 8cf769d2dea74fd8bab8261e4d79276af089d73753052fdd3776bff0adc72bc20c43f840350076e675c633de2175ad83960fa2ccf85fc852c7c81bd4888ced2b SHA512 1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f
-EBUILD kakoune-2021.08.28.ebuild 824 BLAKE2B 12458c9944844d80e0de4141772f4efceac95d50a3f7ef01f09e4f808ff99b9fe74f060246d7b8d6aec59bb39636bc0e67e027d3a37360de15cbde40cf4133a2 SHA512 f75555899e6d3a54f9a543a1a61520caaab162adbfef69e6112ed2785f20821c31bf12ebfc8dcec2ea505604b0684b95f3200bc8fd634760cbf43dfdf538514f
+DIST kakoune-2021.08.28.tar.bz2 535791 BLAKE2B b04f23b29def72659925b104a203033cd547ec9483225e35a216276716b2d31da76e1c4a239b60a1e72f3e3f4777997bc59560f6ccd4a0e3eaf509e537ed85ad SHA512 a304f1ce3295196468784e27f019d155b5aa0305d90adf5ae65c74a9be4ee740df400ebeb819eb059bb42efee503daa988a2ea929fa6d60ec63ad408be9b575a
+EBUILD kakoune-2021.08.28-r1.ebuild 825 BLAKE2B 096cd7bc5e73144917c58bbc9fc16ee54c3079a59340bcbaff8f5904a3e6b6526342a3dc95d93433d869d8f1a0f257cef24593c8bde8c2fb10e371719dc241e4 SHA512 1c1cd3bf0b0187a1cac36d4e48ef9ccbb8975e9271e301b5ecc11767b61f7638de460cd02659fa547d2bc218bb12cceba5d6d274157717cc147373901d65f861
 MISC metadata.xml 512 BLAKE2B afa8631f092bca6c3307dcd610340b39e41da979781f0f1ac391e873ae063088599cfc96c99bc81cca0c1244905ced51e3736b1fc387d0d9fdb8233be2810427 SHA512 a7e4da11480bc3f8bd09253901d9528235ce9a4f00a418cd5f58c898244850cafe944d6a828e1b871a2d98faba179fd9f4ddab99695a6762a4a7a290f1311a2f
diff --git a/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild b/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild
new file mode 100644
index 000000000000..66fdc47a76c7
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-php-filetype-fix.patch
+)
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/kakoune/kakoune-2021.08.28.ebuild b/app-editors/kakoune/kakoune-2021.08.28.ebuild
deleted file mode 100644
index f44978e99739..000000000000
--- a/app-editors/kakoune/kakoune-2021.08.28.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Modal editor inspired by vim"
-HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-php-filetype-fix.patch
-)
-
-src_prepare() {
-	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C src all
-}
-
-src_test() {
-	emake -C src test
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
-
-	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
-	doman doc/kak.1
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 04d8e92d6186..4f498a65647c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -4,7 +4,9 @@ AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
 DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4
+DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709
 EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec
 EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
+EBUILD neovim-0.5.1.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
 EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
new file mode 100644
index 000000000000..99aa8bbbb72f
--- /dev/null
+++ b/app-editors/neovim/neovim-0.5.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
+#RESTRICT="!test? ( test )"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# TODO: add tests, dev-lua/busted has now got luajit support.
+# bug #584694
+DEPEND="${LUA_DEPS}
+	dev-lua/luv[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,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=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+		-DMIN_LOG_LEVEL=3
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index dfff19122284..0c0b06e0964f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 11a58240c231..df0605b21928 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -6,4 +6,5 @@ AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53
 AUX vm-8.2.0_beta-texinfo-encoding.patch 197 BLAKE2B eeea93146d8dafab49b961c4a2b3ff981dc4269fab1fe6eb9124575341439a9fcdf8819eeea395ec623c07a2c31018770222265f1835361333d543239b63278f SHA512 ba227fa27e6b19f23b487e254703a4665dedf3cd4f6887db71cf76dad4ac66c52608a1e978c2eeef851e6f2241aeddd5249fd8824d5194105ed172c68b9fb6a4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
 EBUILD vm-8.2.0_beta-r1.ebuild 1612 BLAKE2B c2b341748409ecf9042e7d25af8592a5ad2de97d75785f2797a5f6557c2f46f3c808c1c36d760c399d40cc07d8fdda471da73764a7d11e8c1f3ae57c5584e7cb SHA512 6e8eb2f2bfdf01fdc73caa0ed248b3b356f18297a868fbc5c367d1e6111568f0abfe623d857371f0982c1e28582b3273ba0ca393ccdaf2345fd61cb5ff5434df
+EBUILD vm-9999.ebuild 1314 BLAKE2B a3c1a93c06320825e007f49cce5d31d87b5cdd89329c70b99ae5f457a5324fe78e0f2d6fea319dc4d1bf1d287c4de5605b45b23e04328b82521b5ffed2cecf14 SHA512 c266cd618df313d6e11e365a1253744dd29d35f62d428b039db8ae3057219fa42351bbd9caffd767808345945571ab736622791baafebff7c604c7f8729d6515
 MISC metadata.xml 786 BLAKE2B 4d7d128f096199813e8b0ebadc2f350b109291852dfe1b66e2a856cd61878684af48871da231f7d50a5d89d8a3d5b891be738928a51d6e1ff50a4ed137b45938 SHA512 40b80ffb860fd3571a8ce16fbb23e628735bdee47afd9c16ada902053caa58ebdf0537d0be0e000795d27e39661589c9679d1c4b86a00dff629ee4538fc074aa
diff --git a/app-emacs/vm/vm-9999.ebuild b/app-emacs/vm/vm-9999.ebuild
new file mode 100644
index 000000000000..7834ef8f589d
--- /dev/null
+++ b/app-emacs/vm/vm-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp bzr autotools
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+EBZR_REPO_URI="lp:vm"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bbdb ssl"
+
+BDEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${BDEPEND}
+	ssl? ( net-misc/stunnel )"
+BDEPEND="${BDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}"/vm-8.2.0_beta-texinfo-encoding.patch
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# delete duplicate documentation
+	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+		-o -type f -exec rm '{}' '+' || die
+
+	dodoc example.vm
+	# NEWS is accessed from lisp and must not be compressed
+	docompress -x /usr/share/doc/${PF}/NEWS
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 04172e7cb932..87a38f9f4d72 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 27d1dd7cd7be..a24b648bdb02 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -17,4 +17,4 @@ EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc
 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 1969 BLAKE2B 6fd241e3f2d5f629c9d944795db8342b22f6a12fbf1a15047c3e0bd675a775fd04b3132c583440dd23d9b589a0421496713c98894c3da0e249c481e7b80ad661 SHA512 dde8c7270307f7e465ffbea8aadcda40e445b15148a5e04dd35811941cce45120c8feb95da96db7eaa6ed15504f157ab20899effb2bf116ee641575798bdfdf1
-MISC metadata.xml 381 BLAKE2B 7bcad06eeacab0fc1d5eb07706c19e75426b4c86bea6aec1b196a42b051dbcf62614536f1d2d07f5c6f8272daf34ab9fbf3bc4663da2e61628100f12772499f6 SHA512 88b993221d7c3f7ac33771021c8d2569119023c4c607cc5ef148d08d0aef8a4fa8b34849dbdcf562c1cbaec91102690a002d3a415545e699a5bed93b01bbc295
+MISC metadata.xml 490 BLAKE2B 8c3c3e42032adee05919a0c0dcaa95e500b2ff6de2589c092b97866b36b3a8c5ea5d7be5e5d389ee58a231bafa90544a645d3fa43ed3d6b85c50e16ba1daaeb4 SHA512 1cddad6ede1a3f006fe00356daaec908945e4cab3ec286ca0abd4acf343479be0ab3b59f9c591e21f3c94628afaee5e318ef50c2740e470cda85a33563c6f642
diff --git a/app-emulation/docker-compose/metadata.xml b/app-emulation/docker-compose/metadata.xml
index db7928ad22c7..790ae6322fc5 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">docker-compose</remote-id>
 		<remote-id type="github">docker/compose</remote-id>
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index bfe5ad7076e0..e4ed9d772e0a 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -9,5 +9,5 @@ AUX dosemu-1.4.1_pre20130107-nm.patch 1491 BLAKE2B b4a493a882ee82b5e8ae9ba9397b8
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 3107 BLAKE2B 66c5a51c0e8b994c173e6e93f082a2fc008242a53d585f3aafcce3812b526904762d1f38f980c59ce9fa8cc2a1df069413b494ac1b797b44acd65ca628c825c4 SHA512 becb59939f23bdc9b82e6334562612fe0a9442b7d5e53cd4d7d0ecb0ba89d7658d9178d6fb2654e4aa57e44b2949fc5cf827430453749fe41cbe633a1fbd20fd
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 3104 BLAKE2B 1f0ce12f3128b0280a93e8e52f78bee1bb00111ea3af6f5c8dc030fe9a60580cf4f75de907db79bd1f7607565d354c99f1ee827b1bfa8dabb4ceb58b42050435 SHA512 419421f440d8f7e195aeaec9301c697fc7848c7c2c95add35bb129ef52c85eee2581b1ac263771dc5cf7070250f549e2388f15874c24157fcfcf37055d1bb79d
 MISC metadata.xml 349 BLAKE2B fedd50e957691cd0f390899d1895eae1883db66df4518b7e12d16cb5a942e7b3748bfa06d7af38dfbab2386305c473713f6303eb2746573c68dbabaff7b4a5ea SHA512 a6b190200756ecb3df7744aaba0f431fbfbb3dd327c652782c3dd3cb2fbd16694cdc223e63b7db471532497786702fdb0f93848297ec2c686815789ccb60a86b
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index 192b65353b7b..0dd838852b79 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -13,7 +13,7 @@ COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
 DESCRIPTION="DOS Emulator"
 HOMEPAGE="http://www.dosemu.org/"
 SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
+	https://dev.gentoo.org/~sam/distfiles/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index dbedc4e45891..ac0166401368 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,14 +1,15 @@
 AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f
 AUX 10.1.0-mount.vmhgfs.patch 1305 BLAKE2B 5482c6ab87c5e14e229088eb71c3e6833674eae09af4f4171ff16ee752fd354828c7eab1f7c85eb5f23f14d9412c15e4566f872d709aaead4ff7d7cf8dbd06b4 SHA512 3cf1cf89f8e39d676075a56643e9d0aef22609234166195cb31cea2cb3daf6d90cb5aab0aa84f446c34dabc9ad67ccc5532276fe1c20d5cc5a723240b1313694
 AUX 11.2.5-glib-2.68.patch 6419 BLAKE2B ca772719d7328deeb784a4bb6e7e1bbee56704bab2d5faf81e1df719877960333df7004aff9775e2903b4ac996495e5cc150bace69c84d10568b75956ca6fc36 SHA512 1e99c9b61406aeb0b071b1d3706074f900c8b8afa57881c9e13e712b6ae1cd61702795e7f01580b748c52fd58be47fa1c23bfafbf497da74dfd1924d8e4fdab2
+AUX 11.3.5-icu.patch 840 BLAKE2B 7f49ef8e2f93bf813cd88504d708b66132678e6686f862e0c6b3fe4626386d8e6de0fc4fe1b5d860652873903cc3faabfe75c6d04becab2f0cd318cc4624206d SHA512 29f80dc1d918a8462484a405f827f02a6367270d5143c22c2a01e905350649fb1054bce696835cc98300ab3a4e53436665d47d74a12a69178c230fb22dd81d41
 AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
 AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d
 AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002ed64b3205f0b4ad05d4d92ae059a1b451cfa043488d15dd31dd8c152342895cd296052757c854124b SHA512 de3265980076f87ab8e0b459b2b6d60dbcf6e8453bd26200d9e05938246add8d320681c7faa3c290c8851c9a3949c62ddfe524b7e1581daf508115f340111881
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
-DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
 DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B 2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84 SHA512 b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
-EBUILD open-vm-tools-11.2.0_p16938113-r4.ebuild 3169 BLAKE2B f82fa2d219fb85c836c3935d15d8069c7b04566bb09c939b5a88116f80f21b99f3520e9819c703d2714d7f8e4e203cd656f00c3c708d2229c606b90f222622ad SHA512 3223eddb1813bec285a60d300da328251573a09044e514dcb74c9fae008ebcb7becb20552a3d90c07277c60023fb8406426c838926d868e4e983ac5e5d7adf45
-EBUILD open-vm-tools-11.2.5_p17337674-r3.ebuild 3168 BLAKE2B f901525ed954503befa9a410ead53b1a8ff011dd91a4f00f558ddeda1846325d4fecdddabc5138853b7097e9d7ca8f1eb94fa6ef5bff8eb1c703716396d079c4 SHA512 a4463fe80831d886bb6c64d1ad3b35f30df449095ee2c2eda6c3be84c017aed9aab822edaf1438429093e8ae8e4396e1c489db5a2a6ad9c400ead853d8c635f5
+DIST open-vm-tools-11.3.5-18557794.tar.gz 4218935 BLAKE2B 41e3f5877a5074bfb206870d7bdba613a468aa104d6d497dcf16e80b24fcbdd2195fcce370b150ced4665dd19296ff27dc06922d2742a43f5bf70b1b5eea9d48 SHA512 fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
+EBUILD open-vm-tools-11.2.5_p17337674-r3.ebuild 3167 BLAKE2B 32a8d690136cd89d5c018c8af0f3ff40490da007de3746c7965b470ce088525d77d02602e64c643c3eb55c8be9c5c2d7c00e76c42eb64927cd108b309ca4fb73 SHA512 9fc0103d4f8625d3378cb2b42719d934aca0a5e63d0d99a496592eaf2ff330dfb7579b525b8232d88611f29ba3628040cf7b157b536e0c957c7fe5618855d381
+EBUILD open-vm-tools-11.3.5_p18557794.ebuild 2992 BLAKE2B 1745fa3cfa555ae920358eb435b04c0aef7f8bfeaeb27ddfc21e9d7abdbbcf79d1c80672b68f9030e31374f8a95063d3a7c76444bc0c4fb056008e22292d4864 SHA512 f91a87cd51a8ae207b549da57149770fb66f563c3bd5d37731418a3462884d10d0d56b8b7f3d9e4e92b3bf1b2edee63247f72ce8074f98454d41860efbc80b54
 MISC metadata.xml 1099 BLAKE2B 90cf8ba3bc47e8daf898c4dd6ae0044bb5e4483e0ee83400718176962b7d739ee8fc046614fb7ac051ac24cf08756d4f0e04ddd5d07c39c28373ff6edea51a64 SHA512 5f9f269727b6467b77c0554019d34e27de94d25b93e85fe28d5eefdc5318dddaa45e03ccfbeb2353226982eb3e6cd3b76352a940af6cd579dbc776dade8fc1ef
diff --git a/app-emulation/open-vm-tools/files/11.3.5-icu.patch b/app-emulation/open-vm-tools/files/11.3.5-icu.patch
new file mode 100644
index 000000000000..d51c0cc60a37
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/11.3.5-icu.patch
@@ -0,0 +1,26 @@
+From 08caf83eaa0e66cee8f3e49479cd201a10bb3919 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 25 Sep 2021 21:14:25 -0400
+Subject: [PATCH] lib/unicode: add ICU_LIBS to LDADD
+
+---
+ open-vm-tools/lib/unicode/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/open-vm-tools/lib/unicode/Makefile.am b/open-vm-tools/lib/unicode/Makefile.am
+index 4284c51c..40261fba 100644
+--- a/open-vm-tools/lib/unicode/Makefile.am
++++ b/open-vm-tools/lib/unicode/Makefile.am
+@@ -25,7 +25,9 @@ libUnicode_la_SOURCES += unicodeSimpleTypes.c
+ libUnicode_la_SOURCES += unicodeSimpleOperations.c
+ libUnicode_la_SOURCES += unicodeSimpleTransforms.c
+ libUnicode_la_SOURCES += unicodeStatic.c
++libUnicode_la_LIBADD =
+ 
+ if HAVE_ICU
+ libUnicode_la_SOURCES += unicodeICU.c
++libUnicode_la_LIBADD += @ICU_LIBS@
+ endif
+-- 
+2.33.0
+
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r4.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r4.ebuild
deleted file mode 100644
index d835f5255091..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2007-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info pam systemd
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${PN}-${PV/_p/-}"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
-REQUIRED_USE="
-	multimon? ( X )
-	vgauth? ( ssl )
-"
-
-RDEPEND="
-	dev-libs/glib
-	net-libs/libtirpc
-	deploypkg? ( dev-libs/libmspack )
-	fuse? ( sys-fs/fuse:0 )
-	pam? ( sys-libs/pam )
-	!pam? ( virtual/libcrypt:= )
-	ssl? ( dev-libs/openssl:0= )
-	vgauth? (
-		dev-libs/libxml2
-		dev-libs/xmlsec
-	)
-	X? (
-		x11-libs/libXext
-		multimon? ( x11-libs/libXinerama )
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libSM
-		x11-libs/libXcomposite
-		x11-libs/gdk-pixbuf-xlib
-		x11-libs/gtk+:3
-		gtkmm? (
-			dev-cpp/gtkmm:3.0
-			dev-libs/libsigc++:2
-		)
-	)
-	dnet? ( dev-libs/libdnet )
-	icu? ( dev-libs/icu:= )
-	resolutionkms? (
-		x11-libs/libdrm[video_cards_vmware]
-		virtual/libudev
-	)
-"
-
-DEPEND="${RDEPEND}
-	net-libs/rpcsvc-proto
-"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-	kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-root-privileges
-		$(use_enable multimon)
-		$(use_with X x)
-		$(use_with X gtk3)
-		$(use_with gtkmm gtkmm3)
-		$(use_enable doc docs)
-		--disable-tests
-		$(use_enable resolutionkms)
-		$(use_enable static-libs static)
-		$(use_enable deploypkg)
-		$(use_with pam)
-		$(use_enable vgauth)
-		$(use_with dnet)
-		$(use_with icu)
-	)
-	# Avoid a bug in configure.ac
-	use ssl || myeconfargs+=( --without-ssl )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use pam; then
-		rm "${ED}"/etc/pam.d/vmtoolsd || die
-		pamd_mimic_system vmtoolsd auth account
-	fi
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-
-	if use vgauth; then
-		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
-		systemd_dounit "${FILESDIR}"/vgauthd.service
-	else
-		systemd_dounit "${FILESDIR}"/vmtoolsd.service
-	fi
-
-	# Replace mount.vmhgfs with a wrapper
-	mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
-	dosbin "${FILESDIR}/mount.vmhgfs"
-
-	# Make fstype = vmhgfs-fuse work in fstab
-	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
-
-	if use X; then
-		fperms 4711 /usr/bin/vmware-user-suid-wrapper
-		dobin scripts/common/vmware-xdg-detect-de
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild
index 65a8e5d713de..ec165bf63f26 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
 REQUIRED_USE="
 	multimon? ( X )
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
new file mode 100644
index 000000000000..6c9aa7cdb10e
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2007-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd
+
+DESCRIPTION="Tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools"
+MY_P="${PN}-${PV/_p/-}"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth"
+REQUIRED_USE="
+	multimon? ( X )
+	vgauth? ( ssl )
+"
+
+RDEPEND="
+	dev-libs/glib
+	net-libs/libtirpc
+	deploypkg? ( dev-libs/libmspack )
+	fuse? ( sys-fs/fuse:0 )
+	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
+	ssl? ( dev-libs/openssl:0= )
+	vgauth? (
+		dev-libs/libxml2
+		dev-libs/xmlsec
+	)
+	X? (
+		x11-libs/libXext
+		multimon? ( x11-libs/libXinerama )
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libSM
+		x11-libs/libXcomposite
+		x11-libs/gdk-pixbuf-xlib
+		x11-libs/gtk+:3
+		gtkmm? (
+			dev-cpp/gtkmm:3.0
+			dev-libs/libsigc++:2
+		)
+	)
+	dnet? ( dev-libs/libdnet )
+	icu? ( dev-libs/icu:= )
+	resolutionkms? (
+		x11-libs/libdrm[video_cards_vmware]
+		virtual/libudev
+	)
+"
+
+DEPEND="${RDEPEND}
+	net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/10.1.0-Werror.patch"
+	"${FILESDIR}/11.3.5-icu.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
+	kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-root-privileges
+		$(use_enable multimon)
+		$(use_with X x)
+		$(use_with X gtk3)
+		$(use_with gtkmm gtkmm3)
+		$(use_enable doc docs)
+		--disable-tests
+		$(use_enable resolutionkms)
+		--disable-static
+		$(use_enable deploypkg)
+		$(use_with pam)
+		$(use_enable vgauth)
+		$(use_with dnet)
+		$(use_with icu)
+	)
+	# Avoid a bug in configure.ac
+	use ssl || myeconfargs+=( --without-ssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use pam; then
+		rm "${ED}"/etc/pam.d/vmtoolsd || die
+		pamd_mimic_system vmtoolsd auth account
+	fi
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	if use vgauth; then
+		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
+		systemd_dounit "${FILESDIR}"/vgauthd.service
+	else
+		systemd_dounit "${FILESDIR}"/vmtoolsd.service
+	fi
+
+	# Make fstype = vmhgfs-fuse work in fstab
+	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+
+	if use X; then
+		fperms 4711 /usr/bin/vmware-user-suid-wrapper
+		dobin scripts/common/vmware-xdg-detect-de
+	fi
+}
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index eee8cdb4aca5..acbfddaa3d74 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -3,5 +3,5 @@ AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3
 DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
 DIST spice-vdagent-0.21.0.tar.bz2 164103 BLAKE2B 298122b334f880ffb8d77d3a7d822b70debce56d62bc3004bbac37445f10236a47706d23501ee3f82520c45b65deec12c9578cf4a8b9ac138df8b1c0b8cdb784 SHA512 1ff1a89e75301b1c2c89f26ba4bce8d4df29bbff6387ade128ce847ca30162a2bc731c70c10a8d129518e64bbca6b8271fd11ff3e340899182a65a5295051bff
 EBUILD spice-vdagent-0.19.0-r1.ebuild 1415 BLAKE2B e022aa27341f85d4be3c959dd00e79e50d22123b5694cd582e039f5f2cdc7fa4652d8e03d6e54ca8d70abb4e432f6ee8a539a785c7ada2fa4f4b5e55157e17c2 SHA512 de135baea6ac61d01fc6c110e087d235c67ea0ca84d0c8bd5e6573fa39c8d258dbc0f476919eeca9bb459d15d62362c48bb0e5a805d3050561c35926748244ad
-EBUILD spice-vdagent-0.21.0.ebuild 1417 BLAKE2B 70512075a4f0b9312d8a4f340597f64e859e2db70d6a6b011c2e087bfedf8b432b46629c0da0f0f1fbbbd33c0db3b24074343c5af28d7379fb44d78f93de02cd SHA512 73ffed71671ab227ccdf15a8051727ad2404301060160e0eb3b7e419e990a3c4fc150de2e71ce8e1c315c89e83d922a58ee85e8d6892a6a3d2ea8524b2198764
+EBUILD spice-vdagent-0.21.0.ebuild 1484 BLAKE2B d282bcb9e7371d6c3a6488acfdcb8b78cc38a944936bc6ff1c6fd6c3c1bfc77ce98c416f4e951889c484beb97e5662fe08ef47cf1358c8001a66a82e5668ae7a SHA512 1d68c854b3585441cc4540d19fc628e4d264a2151f6c2ab87692d387ec5af4993450ee70082664aac95006cf4643eaf6a7a3f786deacb20ea71eaa1363d0bf78
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
index ea8f4936384e..ead55ae36cb2 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="SPICE VD Linux Guest Agent"
 HOMEPAGE="https://www.spice-space.org/"
@@ -60,3 +60,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process spice-vdagentd.conf
+}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index c7778230d629..32c12c2573e5 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,6 +1,8 @@
-AUX vagrant.in 1872 BLAKE2B b30abe68fa76b9f521481ade296d5a05eed214b5c49ad22c29f81d82051f0d669680f002eb5e58d7ec6bf73ebe984a693ce471c54028ff7adf0bcca07fd31096 SHA512 0b9be4e39735c2d8f9ee0fa0002e7740212c9abad2af0b670ea17493a7312125b6c865fb1e01f2b5ef9d72541b4094e3df04173cc2d379b718eea6ae046fdc7f
+AUX vagrant.in 1872 BLAKE2B c3c5acf65ef1187061609837ab7c3df429763b6561ec462f9ce92b6d262bc148f809f17fe83147b4f2e79b6f0f7473b675e3f31234f510c2e3bb5a729b43acac SHA512 04f686e4bc9990afc7b5dd23a4165dba9e7abe1196a349c54c5b1148c1d0140b6fe0c4dfe2774d34440e6b812d186e72d6cb70095d7eccef4ff337dd04bf56b6
+DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64
 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87
 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
+EBUILD vagrant-2.2.18.ebuild 2351 BLAKE2B 5c4e30d2cc2959349ff6c4c7fd4b567377f403163b8b068cbc96c51b8a6cdebb0cb6cf441f058baff9c413a08a68b35bf2f24b0616553cf8d881438f92aae68e SHA512 0e99860f7ecfc75f5f6d9e0258527b831fad5ebc4a4bebc5d34dbf0e71fe46963829a27b043ba742e4b2945d412b0421362d0c12c6145049f2734b172df7df28
 EBUILD vagrant-2.2.7-r1.ebuild 2559 BLAKE2B dcb267f7c75f4bd744f2a83e416aa7005c8576f8d36326efd38b6dc634034b366ddf99016f24b5ced6a8ee87d8b7247db5c16e362f171be98ecd81c46d7d133f SHA512 e4f0a36c8b36625ad0ae660ed1eb4987f1a12f0d9c96316734cdcc31975f75621ea1e3f7a18162d780dc3d33e266e66f4fdd9014be557d50fbc1894ba602d852
 EBUILD vagrant-2.2.9-r1.ebuild 2561 BLAKE2B 4b510524099dddaa98fcc3a5df7a92b16e5ec2bc9983e55699a3d31689a5b1cc83c9467c248f25309ca9d9f226763664a33b4f9e4594a7e7459894586d1697a2 SHA512 e7ca458227e86b43cf01d3c76bd20342560256f8f35a483767a0e65ebd0a34d513de35d93f1b83c3e94441b5657c7bf5185127f85061eadaaeafbf0798a1eec5
-MISC metadata.xml 330 BLAKE2B 9236bad34c099d2d419a97f28920586a4b61e0473e0eea9c332ff4bd749f174b0b6082fd61dde7690c30faaf1339a5938bca52dee7baf1c6f3820288e70513fb SHA512 ed7d3b2a602cc2c5d71025c2b5bf4b18c5ea14e6a810b5378b8d6c10c409096a6819a1894d6beb4f9a612b4d895ab9372633ecd06ef8c6d0a6f79bb325fc289a
+MISC metadata.xml 535 BLAKE2B 203604a2a73e7fcefba9bd8feed9886cb76fea74972704966b3d2a7577e6f1ae5787f38bf0fa6b5d843a3df56d1642c568c88a1b09141a0a083af014fd1af5d3 SHA512 1a6056d30f74a608af168120dcccaff027e67b63560152146909f0ecfb48863defcdf824e07c88d60bb70249107647e1bd0dc0502715e841c4d5237234783335
diff --git a/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in
index fd35177c6fe0..5760b56839c8 100644
--- a/app-emulation/vagrant/files/vagrant.in
+++ b/app-emulation/vagrant/files/vagrant.in
@@ -4,7 +4,7 @@
 # Vagrant installation directory. This sets up proper environmental variables
 # so that everything loads and compiles to proper directories.
 
-for r in ruby26 ruby25 ruby24; do
+for r in ruby27 ruby26 ruby25; do
   # not all ruby versions are guaranteed to be installed
   if ! command -v "${r}" >/dev/null 2>&1; then
     continue
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index c6c277270f03..74e70057d3ea 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="virtualbox">
 			Use VirtualBox provider.
diff --git a/app-emulation/vagrant/vagrant-2.2.18.ebuild b/app-emulation/vagrant/vagrant-2.2.18.ebuild
new file mode 100644
index 000000000000..208e7ee15372
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.18.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 optfeature ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-4.0.0
+	>=dev-ruby/ed25519-1.2.4
+	dev-ruby/erubi
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.8:1
+	>=dev-ruby/listen-3.1
+	<dev-ruby/log4r-1.1.11
+	>=dev-ruby/mime-types-3.3:*
+	>=dev-ruby/rubyzip-2.0
+	>=dev-ruby/net-scp-3.0.0
+	>=dev-ruby/net-sftp-3.0
+	>=dev-ruby/net-ssh-6.1.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/vagrant_cloud-3.0.5
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.3.3
+	test? (
+		dev-ruby/rspec
+		dev-ruby/rspec-its
+		dev-ruby/webmock
+	)
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+	rm tasks/bundler.rake || die
+
+	sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
+		-e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
+		-e '/fake_ftp/ s:^#*:#:' \
+		-e '/wdm/ s:^#*:#:' \
+		-e '/winrm/ s:^#*:#:' \
+		-e '/rb-kqueue/ s:^#*:#:' \
+		-e '/ruby_dep/ s:^#*:#:' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+
+	optfeature_header "Optional emulation/container backends:"
+	optfeature "VirtualBox support" app-emulation/virtualbox
+	optfeature "Docker support" app-emulation/docker
+}
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 49ed61ae3080..8496d25a5e64 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -4,7 +4,10 @@ DIST wine-mono-6.2.0-x86.msi 87498240 BLAKE2B f7e20876732cbdfc472d5f850b167feceb
 DIST wine-mono-6.2.0-x86.tar.xz 43071332 BLAKE2B f334600697375757c734ff22274665b3bc1cb7495d465e1d209b240b9b2aafdd93f9f246f5415e9f36526bceee6066a13fe01a81d93779dac35687fe0d44f7df SHA512 7e5ed7e4abf88d915d59715b107722135af08bb43e6356f9ae95fdafc539332150a82f85b67d15710ae4ece6c883733bab142f59894f70acd893cac85f6ca905
 DIST wine-mono-6.3.0-x86.msi 86689280 BLAKE2B 5c3cbe92dc055e97fa6dc894659cbd2666bd6a2ae0ee08c998c5326379a205596d89127d22aeabdf73c99aa8e4ade4d5e05663d0a1e1f9f1d322c7c18a4cd4ea SHA512 e71accf7d649c576728a41e9dda5dc9c21e3ebc0330e01be30c1f196bdb2925c5fefb6e9337cc8043f4b42721702dda4dc9224cb7a31e322410f4002d1f84f42
 DIST wine-mono-6.3.0-x86.tar.xz 44392520 BLAKE2B bdaa64005564a134605f924f256a709e40cb713bd1f24f2ac5e82a095e353a81487c74813c88e74ed02905cc23a3bf50e99e908a3536a9671f4920d9093cbe75 SHA512 d39bcbaa65e4299711351516e74d559887b152caa3731cc72bbb23412ed76f5b8cf124c2f46241b677b074277c680120a645f738cdcd840ff60465b20deda3b7
+DIST wine-mono-6.4.0-x86.msi 86398976 BLAKE2B d1d553f6115618744bea65d7e88fdf19bfdf677ad5c948d9d598fe461ad668f778e5a8ae2084c584c9d6dae9bee68b85f9837c20016ab82c2401644dcfa06c1a SHA512 5e0eda47bd73b4f1d2d4017c1e6f1d14c9801067e085e9c991532c50454dd22b6594bd05733b4aae8a1010e8b443ff2bdbe70398880ea569142b33e253892f12
+DIST wine-mono-6.4.0-x86.tar.xz 44177712 BLAKE2B de08e829ade18be0d0896742aa66f3dd9ab96eb0c994ae164f0fc64fb6306dd278714bbea3cd20d9a04625bc502764a875d57fa530489a22d4f69cbe20696cfb SHA512 4e793ab755e3a4b5ff1dd0354756a9635482db6fd98fc90cb710edfd5e1f553e124913e323681bc82827655a5b1056d33c1f9632b5ea1e3e72d547cd780f2d2e
 EBUILD wine-mono-5.1.1.ebuild 658 BLAKE2B d54b9115e6f11315cd10a07a68c2e8f6afa48ca12c8a32c2ccfa198d51732f869c011c124f58ea07abaa491e5dc7914a6cb38ce60189e2a109731d67920d4e86 SHA512 4c457d143b0dfe54317961f77947dbad60be83cabd3e335922a7b728ff266ed6fef4aa14fe9e561c02fe679ad11b6dde5bc366862b185dfb3bf152d828a316a9
 EBUILD wine-mono-6.2.0.ebuild 660 BLAKE2B df73bc6c9a6866f408ea1d0751e2e8b3b1b2112a296f0f8f34fc1a83e6e2a3b4a83fc267e7a73bbfab8550a679edec9b95b1a92d2663aae208dde085588f9519 SHA512 a9d82573e2b61f84ed51b64a83d6ae4793077d17995402cb6822eb9e71d6cfe2c441eb70f706eb6b2df3b03ea7025a46e4824567c86189cc8f3a1f578a043e9b
 EBUILD wine-mono-6.3.0.ebuild 660 BLAKE2B df73bc6c9a6866f408ea1d0751e2e8b3b1b2112a296f0f8f34fc1a83e6e2a3b4a83fc267e7a73bbfab8550a679edec9b95b1a92d2663aae208dde085588f9519 SHA512 a9d82573e2b61f84ed51b64a83d6ae4793077d17995402cb6822eb9e71d6cfe2c441eb70f706eb6b2df3b03ea7025a46e4824567c86189cc8f3a1f578a043e9b
+EBUILD wine-mono-6.4.0.ebuild 660 BLAKE2B df73bc6c9a6866f408ea1d0751e2e8b3b1b2112a296f0f8f34fc1a83e6e2a3b4a83fc267e7a73bbfab8550a679edec9b95b1a92d2663aae208dde085588f9519 SHA512 a9d82573e2b61f84ed51b64a83d6ae4793077d17995402cb6822eb9e71d6cfe2c441eb70f706eb6b2df3b03ea7025a46e4824567c86189cc8f3a1f578a043e9b
 MISC metadata.xml 738 BLAKE2B 45cec53a33f954fa8e3d06e75f8d1cf7fdc01b46ba5df2b6de61fa966574e85e32d7b5db5bd424ceefc88099c98a8b3967d3ef1bbb45f3087899c174f4cfa6d8 SHA512 6537c87136e2188f3f5d2e03a055e5231ee13cf483fab052ee538b93e167d0d8d947d9237684acc44d504bf2480aeed3ff293ae31c5b57db251e81fc52278e24
diff --git a/app-emulation/wine-mono/wine-mono-6.4.0.ebuild b/app-emulation/wine-mono/wine-mono-6.4.0.ebuild
new file mode 100644
index 000000000000..b396802d99cc
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-6.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	if use shared; then
+		doins -r "${P}"
+	else
+		doins "${DISTDIR}/${P}-x86.msi"
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 952716168891..1cd3f07ba086 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
+DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
 DIST wine-6.17.tar.xz 24838704 BLAKE2B 98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db SHA512 87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658
-DIST wine-staging-6.14.tar.gz 9658088 BLAKE2B d64bc0476b3d46b9ba812c956bb1eab1e4c3ec0dbd2145ae1f38c95ebd9b7151222e375690c1bd601f3416f362e50ea3f670e9940977005dc67623de22e82485 SHA512 5b4db5c1af316c8e18e2e318152a44e45521dd939e3a341dd533e819263109237c4fd0e25ee2b23bb7cc75f4c4afd7d8900b23d83f955e4ff56ee5fe7aa84fd0
+DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
 DIST wine-staging-6.15.tar.gz 9654539 BLAKE2B 943cebf79bfe906a9dde42cfae13443059d89cd8996a2d25fad685796605a3a45b05f960c9dfb05d968ed919a23b273ecc56aa4fcd98cc38dcc45c22813d830e SHA512 652e8319e4a06f64b7e4c05a139194b6b7189777632d26d79a3160447339cc5a93b42d810d8379eb7821485ccbbe8cd8e16e09e5223886027fae2f7737b8a115
 DIST wine-staging-6.16.tar.gz 9655388 BLAKE2B 50feca959b0ff9056ed9e6f81f3dd11350391f30e4048ee6e4d4e5feaa837e31b580c22e63b6213fc77d866b362eb7922fd2c076bd9b6675abfe591a178a2d9c SHA512 2789200466adaae2f4fa4afcbb6aa88619748e69a2cb39c1ac957b408c8021e2cbac7ad0b1f2e295cd87640f494e173739df076743ec0606e4b13e83d0ac2824
 DIST wine-staging-6.17.tar.gz 9655082 BLAKE2B 9f2e0c800f221ecacba71942ef306fa5e2e8510572467ee528a58b0a63dc416281036eea419c55f46c7688418121184e620017e077ea873f3aadcda29f51f3ae SHA512 c1eaa3682effd7a555ba2deed85a196eca5a9824634f3daba9453d861b0c74c456f6cddf0c1f47e003dc31c4ff7e7b049234e20afd2ce6bc6cbe6e03e87101ec
-EBUILD wine-staging-6.14.ebuild 21926 BLAKE2B 8c37ab954d9b015068d617ad9a22ba8025ef3a7f30c78335b782da14e707f5032dd1f9ea55c4cc7582ffdcecf367dce5924626b4df1e1afbf9ff3ab496b59abb SHA512 57a2eb3cb33bdb360c6dae8ba258b3d5c308c9262df68a87db36f5430f682ad54e3946d6286cfb592ac37ae761cad9065c458687a5100ee01b24d2f75fe86689
+DIST wine-staging-6.18.tar.gz 9663936 BLAKE2B cd1a0314aa3bf890d57432e0680e13927a7ef4c50f47fe9bc17980208a77137508703d9b3155cfee6a340d954e832e99d66663d26518b425c4e60d8a3fd0ad2e SHA512 f718b4a6f314e8db4f6ad4cb41449d251d973b0942072411a70749398cec9d60ebcf29078cf00a895f665ea7e7846c3fd7e5553d04b3b451ae757c95fb49af58
 EBUILD wine-staging-6.15.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
 EBUILD wine-staging-6.16.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
 EBUILD wine-staging-6.17.ebuild 21397 BLAKE2B 5169ae698367bf3f5f55d79076e845256201fa3b8cce967435e372ec6a713f9a204ece9c6799718ea213e40ff9fde6fc8c66fd97e5d7546c14248d7eda19a1b1 SHA512 31e4f43358293ac5966858c5320c20716328136018f9a2f4bcf649221a38a77da864bcdafdc0f06fb31eb157ad3d3f4f1ab70c9bb23b3a7d5d2e7b5087528be0
-EBUILD wine-staging-9999.ebuild 21397 BLAKE2B 5169ae698367bf3f5f55d79076e845256201fa3b8cce967435e372ec6a713f9a204ece9c6799718ea213e40ff9fde6fc8c66fd97e5d7546c14248d7eda19a1b1 SHA512 31e4f43358293ac5966858c5320c20716328136018f9a2f4bcf649221a38a77da864bcdafdc0f06fb31eb157ad3d3f4f1ab70c9bb23b3a7d5d2e7b5087528be0
+EBUILD wine-staging-6.18.ebuild 21397 BLAKE2B 8ed28d43731c72cb560e4b406e085dce48641361deec6030a62ceebfe1ab2df995b5aadc54aa71360f7a341561ca811b5308aa64615b5590d732b158c2196e41 SHA512 4e255c2d95d2d9e66c0ce084c9b8ea27dd8b8e80e354db754d344f4bb68120e6ee9aff34a553420964d0e3838e16141a1b192f421880aba9ea1f3b82bda8683d
+EBUILD wine-staging-9999.ebuild 21397 BLAKE2B 8ed28d43731c72cb560e4b406e085dce48641361deec6030a62ceebfe1ab2df995b5aadc54aa71360f7a341561ca811b5308aa64615b5590d732b158c2196e41 SHA512 4e255c2d95d2d9e66c0ce084c9b8ea27dd8b8e80e354db754d344f4bb68120e6ee9aff34a553420964d0e3838e16141a1b192f421880aba9ea1f3b82bda8683d
 MISC metadata.xml 3967 BLAKE2B bc3c9d997d843fea2119ca489dcc61624e29d86d83ed0cd2934a0f15137037b4625be02ad0e04088cf6658318a6256d6e27e91b0b64b8d1c905aa20366598185 SHA512 2106df5a805fc9800a51c0a511f9f2fc283283f1e927ae0ac904976222e97f878f874a8b9e0b00af05f8d3a59e8e367bcf451338144169f478354cace01d1c83
diff --git a/app-emulation/wine-staging/wine-staging-6.14.ebuild b/app-emulation/wine-staging/wine-staging-6.14.ebuild
deleted file mode 100644
index 99423da3b703..000000000000
--- a/app-emulation/wine-staging/wine-staging-6.14.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	MINOR_V=$(ver_cut 2)
-	if [[ ${MINOR_V} != "0" ]] ; then
-		MINOR_V="x"
-	fi
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		wine_build_environment_check || die
-
-		# Verify OSS support
-		if use oss && ! use kernel_FreeBSD; then
-			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from a"
-				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-				eerror
-				die
-			fi
-		fi
-
-		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target i686-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-
-		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target x86_64-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${MY_PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${MY_PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name *.la -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${PN}-${MY_PV} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-6.18.ebuild b/app-emulation/wine-staging/wine-staging-6.18.ebuild
new file mode 100644
index 000000000000..a6c1ddd53923
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-6.18.ebuild
@@ -0,0 +1,645 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+MY_PN="${PN%%-*}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	MINOR_V=$(ver_cut 2)
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20210925"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.4.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		wine_build_environment_check || die
+
+		# Verify OSS support
+		if use oss && ! use kernel_FreeBSD; then
+			if ! has_version ">=media-sound/oss-4"; then
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+				eerror
+				die
+			fi
+		fi
+
+		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target i686-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+
+		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target x86_64-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${MY_PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${MY_PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gcrypt)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${PN}-${MY_PV} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index f8a707ae863e..a6c1ddd53923 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
+GWP_V="20210925"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -133,7 +133,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
+	mono? ( app-emulation/wine-mono:6.4.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 958b85ece7f8..c234744cc5f1 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,15 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
+DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
 DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
 DIST wine-6.17.tar.xz 24838704 BLAKE2B 98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db SHA512 87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658
+DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
 EBUILD wine-vanilla-6.0.1.ebuild 18928 BLAKE2B a0410ef88afc4230b111e59c531bf6e7ef186e89b42f6ce05d32c5e25f040afb14fa57517421ac5a207d297fc10914f12433d209adb9a80b9102771f2d417f76 SHA512 e845cbc96df01d9b81328bf04e36822ef892998e33367345c08152b67869c8b96115a9e8d38bb89d7083394e72529962ca3c8b90c6b0f040c43baa70821b042d
 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239
-EBUILD wine-vanilla-6.14.ebuild 18897 BLAKE2B 39847117b0a7d36dc30292780af1b5633ecbd617961a3991a950f0a3f440270c2811df7476bb125edc5465e81a250869d7680e3d5f8225efc9ebef460bf4b446 SHA512 f58436347505b474e01b827c5c3d0565bea1716c9b2a2cd767cfc82327d36a7837eced155d6db164cbb4922ac66287c74b808f3cb14e7b2ad5c34cca1a64f53e
 EBUILD wine-vanilla-6.15.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
 EBUILD wine-vanilla-6.16.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
 EBUILD wine-vanilla-6.17.ebuild 18368 BLAKE2B 8831c62b5ea103040b9d25e6cf4c21b71aa44d8cf795da78ac553f7ce4bc6f4e103dfcf18868776d1bb241c421be841472ab244398d0cb8a70edf51a04f7dfc5 SHA512 e32b6c1aad3c5baef9e6434aaae82b753599fc9a4f36b84fc9f7ef4230cd9fae767ba7df127d434ee627e4556ebcde10a848f086cb88938e7bc21d7a96c8d133
-EBUILD wine-vanilla-9999.ebuild 18368 BLAKE2B 8831c62b5ea103040b9d25e6cf4c21b71aa44d8cf795da78ac553f7ce4bc6f4e103dfcf18868776d1bb241c421be841472ab244398d0cb8a70edf51a04f7dfc5 SHA512 e32b6c1aad3c5baef9e6434aaae82b753599fc9a4f36b84fc9f7ef4230cd9fae767ba7df127d434ee627e4556ebcde10a848f086cb88938e7bc21d7a96c8d133
+EBUILD wine-vanilla-6.18.ebuild 18368 BLAKE2B db6f70e7d343e722e0a675d2da0cf6c2e0a3b9bb00f472329cde15cf0c47667675e6a882d2b19e9e2bb229bc99806003b2dd227242838691068f1150da492876 SHA512 068508232f34f1fd2916d793b34c2c4e5071a5c63a9af6fa8c997600617b986d1f85a43febd303ce218f1c3134abf06b75401d24ed3d3519fb50ba245291d7ee
+EBUILD wine-vanilla-9999.ebuild 18368 BLAKE2B db6f70e7d343e722e0a675d2da0cf6c2e0a3b9bb00f472329cde15cf0c47667675e6a882d2b19e9e2bb229bc99806003b2dd227242838691068f1150da492876 SHA512 068508232f34f1fd2916d793b34c2c4e5071a5c63a9af6fa8c997600617b986d1f85a43febd303ce218f1c3134abf06b75401d24ed3d3519fb50ba245291d7ee
 MISC metadata.xml 3494 BLAKE2B 0543d2465381f5dee52e2080ad8bf639a26f45d402ee646c5e815b5de93db4e64c1271e8daa464e30936eca3e11db96699ee382299df90992b39bc2fb3c32cbc SHA512 cf6a81b5a9fc7ad4b3fb35e57e64f6651becab199b2dd60016b74127b385a2da172e826d963e3c3aacefc0382b928b69a0ecaab922cac94c766eb7fa4fed1295
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild
deleted file mode 100644
index 6f3f1c572f47..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-
-	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target i686-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-
-	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target x86_64-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name *.la -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild
new file mode 100644
index 000000000000..5209a25f537c
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.18.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20210925"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.4.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+
+	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target i686-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+
+	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target x86_64-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 70c9eed8db2e..5209a25f537c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20200523"
+GWP_V="20210925"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
+	mono? ( app-emulation/wine-mono:6.4.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 4ed47f4f8c71..bf06fd6bcb9d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 33a794dc9ac1..2c512a1919ff 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -7,5 +7,5 @@ AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151
 DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 BLAKE2B 1f3a920ef7ddb4cddaa95de4d60bccf20c8e6d207216e406cb7dc503411e932b4578ed1c3c302249a94e0ede1d948aa62f5ced804d0d142ed5e04dbbd6789277 SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3
 DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
 EBUILD freewnn-1.1.1_alpha22-r1.ebuild 1143 BLAKE2B 2f4411d1112e6d61fead2a04aedd9a9f5d5e6f0d638466397fc967fd11a254ca3b42cf17801e74560512bf9c353e5bf143d7ce1d270b3fbfe4d0b3497acc24e3 SHA512 bc7b353fc06e19a81a66a954da2bca6d337fb241a7de28bc9eed3a1914e6902b8049053ee13469278e441b44bd321640124108d7c0fddd1fc134f35ca80eb147
-EBUILD freewnn-1.1.1_alpha23-r1.ebuild 1610 BLAKE2B 5e8fe44dc058b6081bf155f53888ee33207f4b109069172a1636ae4c009f059ac08c866274c521126332e16e55b4b4079645cf19689345f2a75df58c931e355a SHA512 b29832bc8cc471a2d19a3871ec79c6b188ec76570ebb973f66a51bb4e4c0a827f3e7f3ac8b6d2ce867fc380b17cfe0a2f5b2cb45bb5328a91a297cd26e2e2685
+EBUILD freewnn-1.1.1_alpha23-r1.ebuild 1617 BLAKE2B 8bb452834bf848cdcd71f13a979a7e51bdc63655024baad43c8a13849c3b2d5e6551408486e9618b13adf9ebb3f2e58968f43232dc5b1f01208620c377c9d5db SHA512 89bc1ef2cd44df83eef4b18aa320fc2d678eae18c2fe55d690ebe5e7bf01a7b52aab118ae6cfa5d67d8c4e918c535f3b4447a0041ec69eb589182d878f340ddb
 MISC metadata.xml 380 BLAKE2B af3d2cbdd580d378c5ea860bb25c1672fab029b90a9f073c3f96ed01e05e2924531c6cdcd6c069c3440542e777095c41cb6e8de7f4188a17f4119c97902659d3 SHA512 90539b884de3c4c04ad8b916570d0b87698b192fb60fee8c7f78e916e109ad3e9e2157cc248b7f6b59d59990f5252bc6092a80b1235ba5fcc9e8c94597a68575
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
index eb63b8b14092..883a60c349c3 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="ipv6 uum"
 
 RDEPEND="virtual/libcrypt:=
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index ad7f61e6479a..225c0206d0ce 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -5,5 +5,5 @@ DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958
 EBUILD nkf-2.1.4.ebuild 2271 BLAKE2B 33bd683f6c33dd527c468fbb864ede39309e470841a98411dd6d89991c804be9d760b5c3573608851be2ce2354c5b1ed7b40ec9c652690998def3bd5c0b3d512 SHA512 ff1a5f0359d4b8a2e447c05ebfa883378e2474067afb079e4793f83bf333063b8dc555146b43d7843baca5dc0f961dfad1b0fe0a0dec07b4709c485af19edfa0
-EBUILD nkf-2.1.5.ebuild 2321 BLAKE2B fefcdde330680b9158a89910af10fa6c093b2189e49def4054792374e571cdc600eb6d2ccf212e4e356b35241184761194fbe1f9254e19f40c31299c86932585 SHA512 a3f77b7faf0f3f3e41dc7ec1f8643a2950196e79acf1cba54e230c9fe6975f4b6416fba147e2af9758a47343e8bcf3fcd9b4649e89bf76cdf8ec5075535b7c64
+EBUILD nkf-2.1.5.ebuild 2316 BLAKE2B b8e984fd5e3e58825a3cb3e7bb85b108c6b1b9c6065f1a708de96d9cd4298ee1384be2ea9a3b90910f4b15221b7805f7ca40cf460c3e2b49d818de4825ead53b SHA512 1e01b532207ad235645d573d052dc9d3f3a556c9d5f68822aa8ee37d6da314a55868c0d52907933a15652156562fa69fd66f947eb1d79b0f0a92e65a4d1c853e
 MISC metadata.xml 311 BLAKE2B 6dc98896431519c441f04539509e209b57ef943a8745262121b31b50e369bea456dc2352ada25ee3e6fafe78cae56d9a18771f03b0f754954c0073999d501f0d SHA512 b3ae811a780ab4dfb83746350fd7a39b92ee16de5ff440e5061b0113788f3eae71cf15f0fdd39636148f923f52f2b3fdbc845494ffaa0336e9dc2d0e11c3389f
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index 7720d4a3faec..fe8b98b53eb7 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
 
 LICENSE="ZLIB python? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="perl python l10n_ja"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 48bc0956ea5a..b96db5876661 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -4,7 +4,10 @@ DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf20
 DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2
 DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
+DIST unicode-data-14.0.0-UCD.zip 6985828 BLAKE2B 2d36d35ded44fe1ad7966dae93e388c8c92d4404c811e495c0b4ea1c6482c4ed1488dff37b608cae230163bc4dd66cf8ec40d5db6e60541cd7719673c91dc5b1 SHA512 17fbfb3ebd3a75227526d87e19feb70c1b0ccee656e421e955aadc88847ed2597437eb8cf19619e2a49470d286b285e219aec18d6b29dab47cfa8317a212b458
+DIST unicode-data-14.0.0-Unihan.zip 7116482 BLAKE2B feafb77e8a1694efe940be226735f88c2e08be43408b8c12de87b86860d3cfacffb3d7d287e4fbf6b7fcef1055f3fe6b74f312312dd7d1886cbc7a394a7df983 SHA512 1827e512dd1bd27f3553746275dc90e3c3add38590d56da3901eccb56b94fee9e2dd806514a866ca73dfe4770ec585d200a6b6a7a4293c2ff572a2f5b50ef091
 EBUILD unicode-data-12.0.0.ebuild 760 BLAKE2B beefa6fc74ff1a1321714103d948ff3fb24fa07d0d65bb3c75b3e48cd08ce151f3eaf85dd14bbdf3507b6bab4a899df3929ff77d7d5eddc7f5927f2620db1c27 SHA512 a62eca3cfde5f97e9c016aa9849e89fc0b7971af60584373bf074c97563d7aee14fef58f909f0c4891f1b16206a99a8219b6d916ab0ccfe435ed83de62f77760
 EBUILD unicode-data-12.1.0.ebuild 771 BLAKE2B dd6af401676af571b01d33c42fda0f30e3408a7781864eb31f7c34e8aac77f773df526192bfd7d8f8c2dac938f4f2beb90b4b1d55fa674efe9080668e60cf246 SHA512 bd35048a1ab835ec7ae8d3917cb988cb73aa2625f9e95a351d22b5c33a8429afdec1e48a8f82c6be4ca2b201ccc638d1fc0ccea10647c9861dec26a21797041c
 EBUILD unicode-data-13.0.0.ebuild 777 BLAKE2B 3e8ce9f469bf9026d880f75f7ec4287813c27ab138f041c539c3b715a045952eed45904be7be0fea4734c83e21f7d49f41abe9536194d965a2ecef61471e0469 SHA512 c29f7dd4ae672847fccad92f5491af35789e1a45320539ede246cf8238864947435be187c40bd3569f5f6f833abb1c0a8811754b4dc73b3d7ded9b4c1e495149
+EBUILD unicode-data-14.0.0.ebuild 764 BLAKE2B 03a30fe6e082c6c11b39e5dfc576e64e9dd3915da8e1d0aacdf242790cb27172211690c0cd96d565d04c76e23fe96ac72a700323affcac131d3ec8a48c403ead SHA512 69e0f35d0b94d85d61704ffdd7da9428f8b645c455df2b05bff8a2809af614cf76c200ef4fc89cdbf9b3e04327ed6a65cbf92db95264291b0df0050789d770c8
 MISC metadata.xml 348 BLAKE2B db346dadc3a3333cdd52371d751f814244a22770e00306f9e53b6ca4a70b6dabd107e1c8d62b2fb2b333ce60db28f4b8f8f900ffdce07aba4246e2eef16563a4 SHA512 a6b846e15f4b2903ebe245954bdee3c7c5adfedd0f6d0a05c32defc8cd6f35df804c11567af92911400626fd846320d2338175c1921821adce1db04d5c40dc6a
diff --git a/app-i18n/unicode-data/unicode-data-14.0.0.ebuild b/app-i18n/unicode-data/unicode-data-14.0.0.ebuild
new file mode 100644
index 000000000000..e0780f6a33f9
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-14.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="https://unicode.org/ucd/"
+SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 68c7d6da2eb4..5140d719bee7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 29c36aaabba9..b13a79e0ed21 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,8 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
+DIST nss-3.70.tar.gz 83917362 BLAKE2B 51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51 SHA512 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855
+EBUILD ca-certificates-20210119.3.70.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.70.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.70.ebuild
new file mode 100644
index 000000000000..589797be2800
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.70.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="app-misc/c_rehash
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index c4dd2e02832f..fdf489b75262 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,7 +1,6 @@
+AUX ckb-0.4.4-libinput-1.2.0.patch 1188 BLAKE2B 36ee73dbd1f8ffa70fae27dd4915837d09eef2226d908aa4cd8e7b5c9bde2a645cb212535d33879efdefee687ac52177979116a0ef81ee921f24fad1654608de SHA512 1d39cfe1bceb8b950f6952e57c7848870a3ffd359adb2245b570dc9fe928480b07cd5332e3cabb9b47090b4b3216474f380c5679db963611c7657bea7d3ac083
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
 DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
-EBUILD ckb-0.4.3-r2.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
 EBUILD ckb-0.4.4-r1.ebuild 1222 BLAKE2B 9bbe18f605c63962190d6b9ff32b9f15481e9b561d1979ca7e885ea06c67b12e39427a26cceb9210f0ecc89a10928d7b3ef9676f28106bf1ee330c5fad9e4f88 SHA512 49d385934ae7c6948f73086950e1aa0a82c7043c1b563282f649c84d37372abd07879641f022486c1d4d3879b8dae3efa9742636b08edc1b8a5b67560e49dd3b
-EBUILD ckb-0.4.4.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
-MISC metadata.xml 320 BLAKE2B bf241b479ab5a1cbb3e876bad561a31e8c5d9cd9a5e20d4d6d0019486e469b2e54ec4527652a2ebbcf0bcdc644acb1c03018c366023c3da109fb4dce26d45c5c SHA512 86bd38bc7682bfc9e670c00a9f9fe73cbe6289a34fc046a6dc3c9a7b7d170285f50199be4df283aafb2b6d013d8615179c1ed228febd78ca5a4c1cafa3425351
+EBUILD ckb-0.4.4-r2.ebuild 1270 BLAKE2B 66122b7f5a540f2deb6409018acfa5410c8442ddd773a4c00f01b5e0c4bce9d194728fa47a2873e41811cb2c0b378c9d551553bd309c05e4fdda02e02b112221 SHA512 c834ed41c22b438c582a22aae9025e61a2258df7e849ab31a8dca532e07547dccafc246a2ba192e4fe98b9138344597585b5a1b262151ba77068c592f3142c11
+MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.4.3-r2.ebuild b/app-misc/ckb/ckb-0.4.3-r2.ebuild
deleted file mode 100644
index 296ba6dabec8..000000000000
--- a/app-misc/ckb/ckb-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/pulseaudio
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The ckb daemon will have to be started before use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service ckb start"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start ckb-next-daemon"
-	fi
-}
diff --git a/app-misc/ckb/ckb-0.4.4-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild
new file mode 100644
index 000000000000..e5c7f3974338
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.4-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/pulseaudio
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${PN}-next-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libinput-1.2.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-service ckb start"
+		fi
+	fi
+}
diff --git a/app-misc/ckb/ckb-0.4.4.ebuild b/app-misc/ckb/ckb-0.4.4.ebuild
deleted file mode 100644
index 296ba6dabec8..000000000000
--- a/app-misc/ckb/ckb-0.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/pulseaudio
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The ckb daemon will have to be started before use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service ckb start"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start ckb-next-daemon"
-	fi
-}
diff --git a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
new file mode 100644
index 000000000000..211d5e4ea01e
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
@@ -0,0 +1,29 @@
+From dc4dc54c5ebac7e4b455d8df35076fc044a581a7 Mon Sep 17 00:00:00 2001
+From: Tasos Sahanidis <tasos@tasossah.com>
+Date: Mon, 20 Sep 2021 14:48:18 +0300
+Subject: [PATCH] Don't enable unneeded axes in mouse device
+
+Specifically, we used to enable HI_RES wheel events without ever
+sending any. This breaks scrolling in latest libinput as it expects
+us to actually send HI_RES events.
+---
+ src/daemon/input_linux.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
+index 68cc0ebb..a9ac8c8e 100644
+--- a/src/daemon/input_linux.c
++++ b/src/daemon/input_linux.c
+@@ -25,8 +25,10 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
+             ioctl(fd, UI_SET_KEYBIT, i);
+         // Enable mouse axes
+         ioctl(fd, UI_SET_EVBIT, EV_REL);
+-        for(int i = 0; i < REL_CNT; i++)
+-            ioctl(fd, UI_SET_RELBIT, i);
++        ioctl(fd, UI_SET_RELBIT, REL_X);
++        ioctl(fd, UI_SET_RELBIT, REL_Y);
++        ioctl(fd, UI_SET_RELBIT, REL_WHEEL);
++        ioctl(fd, UI_SET_RELBIT, REL_HWHEEL);
+     } else {
+         // Enable common keyboard keys
+         for(int i = KEY_ESC; i <= KEY_MEDIA; i++)
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index fd46f36caba0..3eca60ac4892 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ccMSC/ckb</remote-id>
+		<remote-id type="github">ckb-next/ckb-next</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/jp/Manifest b/app-misc/jp/Manifest
index 371b234a86b5..7d066843ccf6 100644
--- a/app-misc/jp/Manifest
+++ b/app-misc/jp/Manifest
@@ -25,6 +25,7 @@ DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde282
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.4.2-0.20150131031259-6086d7927ec3.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
@@ -92,6 +93,7 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
@@ -297,7 +299,9 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST jp-0.2.1.tar.gz 33339 BLAKE2B 85a82624afba85bccfa1c6fa86dab611b000fd6a862cefa466c778d252f945a4ea4252b23fb35f9487f8a4e763cf8489fae1cbfa7ba747d555f9b07e3873eb64 SHA512 6eb793f436294726093673cc273d72f72d2213a7ae6cbaa6d3da9c1d698250556e6e650802476f547d5abfba0e4e5931a9674a9aa80434df93f143a5ec945e33
 DIST jpp-0.1.3.7.tar.gz 80528 BLAKE2B ae132a2f7c850916d859077bed51a5a7c4b1ca86c054a9ca14c63af1a0d837c2803d8b6e6d95a27b2a66fbbb1cae5c51b5d28a25e216e0ec4bdd2a8e43393ec0 SHA512 942fa8bb2795b9e253703ee4f7409da20c907b36a4e432a89d37e2fa329729f4afe10cfe33387e74120a6325ea701bce1d262a5b81173fb6fbd9e95cc9a95bc8
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 EBUILD jp-0.1.3.7.ebuild 16780 BLAKE2B 2b4fce0781d38aa752b5dce405258013c9773206926cc3e5f1324f4dc75d8aaec92ea7c97673bad1fa983fcf3b75cbecc453dd0c06bbc073c3ee10fcf2edc5cb SHA512 39864732fd224edeea839385edf7a4a4aea530b3fcda050f346e9285b4674043574d86d80d87b5c30be25cce404bde214939d4b603109767ca86348f9d304da6
-MISC metadata.xml 653 BLAKE2B c6b6a9ae280aa601e257d79a4f1b9ce894d9cd5a7398aa3dbec9ba065b4507ae0c50fa00d2dd23b30c83f312588cc12dff20386f16de1f7dca953b6672e3e63d SHA512 e1ec136ff3793d6644a6d685b86bd3423af0794e698670ac9b1b4e3f6f2fb32d57947792558b6c64d4fd8992473603ea5e71a2965b48c32bc484506223490966
+EBUILD jp-0.2.1.ebuild 1717 BLAKE2B 34f79163a5906f56117f602fc0ca3b3db1227f1d660d6048747ece1e5ba1d0181f5d98be21a345bd1986e52bfc09bc9e744c70320ed1f8599a213a65824a6316 SHA512 9d8efdfcfe26c2224d0ce79d655c0e99da47f35012689ed49868c721e38e4c3cf1e3404d5898f79442a27d286bb242c6000b77edb08164c05e290f9dd308e5cb
+MISC metadata.xml 653 BLAKE2B ee4597bce95593e56d747528f3359c80e00efe584c2a7939375c59a1be036ffa0bfeb251b0040d6f432d97c242eed8d5a3bbdfcfd8a7fd5ed5242e76f7f8d892 SHA512 ab3edb7b0353892050187071668c619d1207f5cad287e19b8e07a863d0f454952a89679ac3a60ed17676f056b2415fa9b3ca25f1ccf1456fd8c76e4bf249dd34
diff --git a/app-misc/jp/jp-0.2.1.ebuild b/app-misc/jp/jp-0.2.1.ebuild
new file mode 100644
index 000000000000..e3f78b97a353
--- /dev/null
+++ b/app-misc/jp/jp-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+EGO_SUM=(
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/codegangsta/cli v1.4.2-0.20150131031259-6086d7927ec3/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/urfave/cli v1.22.5"
+"github.com/urfave/cli v1.22.5/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Command line interface to JMESPath"
+HOMEPAGE="https://github.com/jmespath/jp http://jmespath.org"
+SRC_URI="https://github.com/jmespath/jp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jpp"
+RESTRICT+=" test"
+# The jpp flag is deprecated (see jpipe for jpp).
+REQUIRED_USE="!jpp"
+RDEPEND="!app-misc/jpipe[jp-symlink]"
+
+src_compile() {
+	go build -mod=readonly -o ./jp ./jp.go || die
+}
+
+src_install() {
+	dobin jp
+	dodoc README.md
+}
diff --git a/app-misc/jp/metadata.xml b/app-misc/jp/metadata.xml
index 3dc0f27fc92a..7662427db7e7 100644
--- a/app-misc/jp/metadata.xml
+++ b/app-misc/jp/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/pipebus/jpp/issues</bugs-to>
-		<changelog>https://github.com/pipebus/jpp/commits/master</changelog>
-		<remote-id type="github">pipebus/jpp</remote-id>
+		<bugs-to>https://github.com/jmespath/jp/issues</bugs-to>
+		<changelog>https://github.com/jmespath/jp/commits/master</changelog>
+		<remote-id type="github">jmespath/jp</remote-id>
 	</upstream>
 	<use>
 		<flag name="jp">
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
index e7a652d7ab09..ca66e5828f8b 100644
--- a/app-misc/jpipe/Manifest
+++ b/app-misc/jpipe/Manifest
@@ -1,3 +1,359 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.4.2-0.20150131031259-6086d7927ec3.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fsafehtml%2F@v%2Fv0.0.2.mod 77 BLAKE2B 33a370c97f77819f63a43dcd71588e134ea15529888b0c91fc622c11ccf486aca9814c0e4be70019518eac5f8456f12a92fe1b40c2a41fc1e546670ce4ffe258 SHA512 8d7e11e79cf9672cc319684738b1b038c4c012d35e17aa1ae603c8ac5b7a5d7fc5974171340f1aa82a7b16a8dc2c64780801aa284298bfa1211dc923297d1960
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjba%2Ftemplatecheck%2F@v%2Fv0.6.0.mod 88 BLAKE2B 0e41d461f345e74649b38dea6e96d83cf3a1c994634ec816149c19d8e6a08f620b8ef4c91e592ea66631e264144576ef55280bdbe4b47dfcbe88c0f49246c8f2 SHA512 b90a29fc945aaaa4b7c6e99504a3f4ffbb463f837839697dc44c35b4ac95f11a2dc5ae9e0b02820519f012e249d59799a351e78057fd3e3ee0c8ca62ff00d53e
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod 274 BLAKE2B 4c342f63063d4e810f971cbfd09e076bc8763b0c0ca985a26b83e0f0431babafe7724a45df3e4d8e0f094bfa786f3e2b2cc0b5b470a2a6920f8e06595dc585bf SHA512 892695c807816eb820f586b9fc1bb16fdbdc8aa9d81203f97b5d1f9df4ef6ad02b3ba259bbb9abb5a1c96ec403c7e5ac1ea84eff453a7fa8027ff7af35582ca2
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip 190543 BLAKE2B 692f5c496466f8d914c1172446f3cb79b1ff9c9e08d7afe44d8af3fe1248b6c1b31fecca3fdd8343afc2b014535dc8e1d3f49a3c71f360d46933ee28002c4c40 SHA512 12bf06f87e15ee039ca148873a13f5944ac6aa6800999ccd5df5175a79fca03edf4672236e2c25ebfe1a28a0aca24d0f6965c8b040c09fb648650976baf8c305
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip 109691 BLAKE2B 80448b0c68b6b929d8776ab78a6ef0ee956c82ffcdf2a1269c4658c896c2e7e9b0d11ab27219ca73bf1db3de3900ce3c89ba586d62fd4e0142313681b0f971f4 SHA512 1cfadcfa834663de819e8995a000b6d58dad804c614011ba99cd3d0936adae43a8f9a41522a0e55748459b456ed12abad7c89627329fcc7977005ea2ac711a14
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip 1634371 BLAKE2B b13afd43d8734f143af16046780b9225a874157e0562068c8c3198dd23f7ff4b3e14f6654b578bc7520dd3c299411ca2d77999a8ab8459a765d05e74d03e81db SHA512 b7c4ff1752cb582263b837048e28b52fa219db5f7316739692d4c2d20bb2a9b8ad3645e92b3b1a72cba0817e4587ae04465dd351bb17a719bc92e193cb29cc76
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3-0.20210608163600-9ed039809d4c.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3-0.20210608163600-9ed039809d4c.zip 3547092 BLAKE2B 15283e37567ba912e3be7c8d46b0f8af26c12405bbf16670ffa4cd32d4855a5cf1017deb791d38674f0302e5db11d2a9dd20b2b7070a46da951f7d1e25a22acd SHA512 0839d65ebae1f192cc133fca8c8103fcef660ff2ef6e76048d9e7530434564256ac262ab2ebccd95d4e8641db04ed3359ef0d3609bf6638bc46b0070d2924b5f
+DIST golang.org%2Fx%2Ftools%2Fgopls%2F@v%2Fv0.7.0.mod 673 BLAKE2B 592d2890df10252d65f8f95dcaf16e097b78c82096ca591dd998beeaedc80d1afa7c8787feb09c3d8eb9d37bd80ade1b3fcf00acededdad4b2f551ff42fd6f5b SHA512 75022848373da07dd8ae7a8904286c80ea5ea7abb055c652e1f97261b3c8af77423fe0cbff1cf104611c209e837737e8f96f1391b7df09d14af9a8ef154bd1fb
+DIST golang.org%2Fx%2Ftools%2Fgopls%2F@v%2Fv0.7.0.zip 143598 BLAKE2B 45abc57702a6c1904460173cebe5ee43233f8c555d831d692f1e12fa816f3aae07d88a8d1dc86ecee48aea514a91b27abfaaf25161368f87e3daf1e13b5fed7c SHA512 a4df646aba129110c5040e090dce15c82f4c3426f882444975558ba4c6cd8e9aa06324be5d87eee52d2c72b96d2520c115133868677ea1f1a57966e3a7d383f9
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.2.0.mod 110 BLAKE2B b291f7cdc01864bad426482e821a4ad847544766fab23bb879cf810148a1e56b8ba03f16435c4972e8d32b77badd4c877f54716ed303781f11ca58549888026c SHA512 53e3bb59aa6a5af629950db1c08c42249448b01830fb18856fa2e3c8f2e1c50a944ad8eeb1a34200c69fecb3bd045b75e5dea05ed5c3c4889ef0f36e0542df29
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.2.0.zip 715429 BLAKE2B 44ac5f90d6b270967674fbcbd90699c081ffcd9666ae0f6d3555d8be083079ee79713e585e0bff0308ebf4316252fe6da92dd8282123a756b45073e23601add3 SHA512 57524f6d66f04155259b09e6ba37b96e02d5a2bc90da7ea2228900a958624d731d7b2f0e730695b2a6eb24ccbe3ac0e12d8add65deaeeead01dfd44ef2cb9988
 DIST jpipe-0.1.3.9.tar.gz 7659 BLAKE2B 91ade62f8a41c895acc56fd3019b56cd23a1550b689db7e4ee0ab5da402bd63d423dd6b5570c864230075a96fe251254dd8ca8c9954329af2606805025be15c3 SHA512 ca8f91a9a4cabb8daad4fc83221950c059fbe4fae984d084546bdba7b9726242e38043480fdaa674a5967864538c452f5577b0b0b9d565a7a273245d98f16730
-EBUILD jpipe-0.1.3.9.ebuild 1014 BLAKE2B 18edc1af57c75b8ac8cfa4751f756dace7062404b5b6a531a9a699ceb509045bc3fdcdd03a95bbb411c621eeb847e6195cfe65498d9ac7b993d1833d6b5e405f SHA512 1be69ef07c43452c4c92b30c9a958bb3caa560228b19556d8475582a7f8eb0d3df002c3e161ac2e50ccdb6d5efe17997e600f0cc47f72ebf5e4f64f811e61758
+DIST jpipe-0.2.0.tar.gz 25188 BLAKE2B 427de1de0f6cc8e716065eda71d13bdae69e939e54dbdc8cc86077898d0d8f3feb4e77b4e8bbbe3f2c9218a7dfe8fbe2d20e6fcdf03f900dc09676610c58847b SHA512 8028eb555bec9fd590207b5052d14b8735deeead9e027cec3ae5e8d3a40aa05495857db8aa60a41cd405f279b823f74474262b55bb7e91316df790769f1950a6
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod 265 BLAKE2B 4232ab3ecc78532cc067fa124745e08caa46b0e645bdd40f9001e895a0521b2741c0e36811fb69356124514a494a4545807d7a1cadecceb10fc373656557a943 SHA512 e27aff713fba5d9157eb7f201e72d23f89ad65c18cfa7205f1e5e456772e7fba975ea54fad8841229370bf21fad6a2a2baec6b2d377c23bd0a6c4b5b48e1e3e3
+DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip 173668 BLAKE2B 086fd07f1dd1930c30e7b20a21b4c708240f33f410d641224c3024b4576fa8ec51a68bfae39df685f396b52f4a4d1db4d69f2f598f4563d3239846f32e600d12 SHA512 ae6aa55fd322bd3f871026feec818e55aaa1d935d129d28ebab3bfd308d564cdfc086a95ea041b1a861e583e0d3238319e4a5ab837727cd181a03d36e8dab6cc
+DIST mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.mod 153 BLAKE2B 2bfaa583b85e6f7f8464961a272aee2143fb9dd02f3fa32eb62ebe35e12546f0051c0706d4570a6b4f727eb701626822efe4c54f25c19bae10bbe13c0be54c7c SHA512 86dee749e3287eda1f909851b729b38b6e39f58fdccaf1cd9a8fc086ccfc3e6b26db66ca2be82d0ad4bf653448542a55c20b27b193c887a97273a706beeae67f
+DIST mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.zip 23465 BLAKE2B 9b0bea59e5b3acd7aa154d2b8cb59a6f16db6e0bcda97f61bd5270a44aec95cec99b261f59815a560bf7fe8f23489b8f9abcf14d5d4b0a6dd3ceb468abd5bb96 SHA512 c6513be73d9d6b8bc07b126b10747c51e95e0497327a17ec02de1ece61ea8fe466e9012094432f29752b778aa00362a54a3b80e433828a8396116ee625614f0c
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+EBUILD jpipe-0.1.3.9.ebuild 1020 BLAKE2B 99e7502f3790fc9fe2711126d6134feed3fabbb1898dcf2381d98c3a86bfceb5bc9a88c5433d708849cdaba72dbbc67dc32b43f0b92af27f64e098fbf4711d7b SHA512 cf3c1eadb5a1575aa39d50159f604b160b75d6f541248c7adbffae0c57b4ed83f0831bbaa495dce4b02918fee6a1c6a3559e506fe81491983a8209d1fccce903
+EBUILD jpipe-0.2.0.ebuild 20716 BLAKE2B c187f4a1cd7a03c9dcfb263a4ef1bae13c3f8d738bd3eef3a09e97c503ce900e2a6a476246c68baca1657d5a0af9b10808cdb5609bea8cd3b185148cd7198aef SHA512 5275bc36af5a024ad868462492c95510c9c0396c2cbea5f0e8c111004487457bc254ad61a86b55735786a8f7d54f2667e567ff6a6cccaac1eb702d265e5471b3
 MISC metadata.xml 523 BLAKE2B 531998e8d9ced9d9230fc6b0bb7b66406223f0bac941757cbef18b70f3843063666ec47459151f21bc330106286d4a0899e773761712fa1ea8eb990e6c0a9545 SHA512 dc667dede0ab53da577e565255daebaad2a725a22c00a1a943107a6d6d0fb42ff59c9b732bde11a47b766272314c0910425258a4ae246c11d17f6f1c9c43880e
diff --git a/app-misc/jpipe/jpipe-0.1.3.9.ebuild b/app-misc/jpipe/jpipe-0.1.3.9.ebuild
index 27f6530f1420..460087e4da30 100644
--- a/app-misc/jpipe/jpipe-0.1.3.9.ebuild
+++ b/app-misc/jpipe/jpipe-0.1.3.9.ebuild
@@ -17,8 +17,8 @@ SLOT="0"
 IUSE="jpp-symlink jp-symlink test"
 RESTRICT="!test? ( test )"
 RDEPEND="
-	jpp-symlink? ( !app-misc/jp[jpp] )
-	jp-symlink? ( !app-misc/jp[jp] )
+	jpp-symlink? ( !app-misc/jp[jpp(-)] )
+	jp-symlink? ( !app-misc/jp[jp(+)] )
 	dev-python/jmespath[${PYTHON_USEDEP}]
 "
 
diff --git a/app-misc/jpipe/jpipe-0.2.0.ebuild b/app-misc/jpipe/jpipe-0.2.0.ebuild
new file mode 100644
index 000000000000..a6473d584262
--- /dev/null
+++ b/app-misc/jpipe/jpipe-0.2.0.ebuild
@@ -0,0 +1,455 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit go-module distutils-r1
+
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/firestore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/codegangsta/cli v1.4.2-0.20150131031259-6086d7927ec3/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/safehtml v0.0.2/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/consul/api v1.1.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/hcl v1.0.0/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/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jba/templatecheck v0.6.0/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rogpeppe/go-internal v1.5.2/go.mod"
+"github.com/rogpeppe/go-internal v1.6.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/sanity-io/litter v1.5.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sergi/go-diff v1.1.0"
+"github.com/sergi/go-diff v1.1.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v1.1.3"
+"github.com/spf13/cobra v1.1.3/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.7.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/subosito/gotenv v1.2.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/urfave/cli v1.22.5"
+"github.com/urfave/cli v1.22.5/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/goldmark v1.3.5/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.4.0/go.mod"
+"golang.org/x/mod v0.4.2"
+"golang.org/x/mod v0.4.2/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/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-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.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/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod"
+"golang.org/x/tools v0.1.0/go.mod"
+"golang.org/x/tools v0.1.3-0.20210608163600-9ed039809d4c"
+"golang.org/x/tools v0.1.3-0.20210608163600-9ed039809d4c/go.mod"
+"golang.org/x/tools/gopls v0.7.0"
+"golang.org/x/tools/gopls v0.7.0/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/ini.v1 v1.51.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.2.0"
+"honnef.co/go/tools v0.2.0/go.mod"
+"mvdan.cc/gofumpt v0.1.1"
+"mvdan.cc/gofumpt v0.1.1/go.mod"
+"mvdan.cc/xurls/v2 v2.2.0"
+"mvdan.cc/xurls/v2 v2.2.0/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Command line interface to JMESPath"
+HOMEPAGE="https://github.com/pipebus/jpipe https://github.com/jmespath/jp/pull/30 http://jmespath.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	!python? ( ${EGO_SUM_SRC_URI} )"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT+=" test"
+IUSE="jpp-symlink jp-symlink python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	jpp-symlink? ( !app-misc/jp[jpp(-)] )
+	jp-symlink? ( !app-misc/jp[jp(+)] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/jmespath[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	if use python; then
+		default
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+python_prepare_all() {
+	if ! use jpp-symlink; then
+		sed -e '/"jpp = jpipe/d' -i setup.py || die
+	fi
+	if ! use jp-symlink; then
+		sed -e '/"jp = jpipe/d' -i setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	if use python; then
+		distutils-r1_src_configure
+	else
+		default
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	else
+		go build -mod=readonly -o ./jpipe-jp ./lib/go/cmd/jp/main.go || die
+		go build -mod=readonly -o ./jpipe-jpp ./lib/go/cmd/jpp/main.go || die
+		go build -mod=readonly -o ./jpipe ./lib/go/cmd/jpipe/main.go || die
+	fi
+}
+
+src_test() {
+	use python && distutils-r1_src_test
+}
+
+python_test() {
+	"${PYTHON}" test/test_jp.py || die "jp tests failed for ${EPYTHON}"
+	"${PYTHON}" test/test_jpp.py || die "jpp tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		dobin jpipe jpipe-jp jpipe-jpp
+		if use jpp-symlink; then
+			dosym jpipe-jpp /usr/bin/jpp
+		fi
+		if use jp-symlink; then
+			dosym jpipe-jp /usr/bin/jp
+		fi
+	fi
+	dodoc README.md
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ec415c3e48d3..795a43054ec1 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,10 +1,5 @@
-AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
-AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
-DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
 DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
-EBUILD mc-4.8.26-r4.ebuild 3294 BLAKE2B d8757bd527ba26203b485b4fb0b84b0efb1d8bc5c43fef9306663d0082798c01ce9d4fd9ec07d7099657d0bc2f45af76dd939723e7c155bac151a7c5c8e59893 SHA512 4aa5ab667b8ba6a075eed3ecf862bc1cf1bfba3de5b741e2eb35e4cf4946aa4102d03482adefd8cdbc7928c9bd263c224b49e5f081ac11f7e37e3825467e6eab
-EBUILD mc-4.8.26-r5.ebuild 3559 BLAKE2B 2843b66d0604277dde030fceca6c4ace346cba7d73b777548fa96bf7cd4ee8c468c2eb0dfc678764b771e8ad06fa97e6db8c191cc3f05e2384470d4c39fd2654 SHA512 8aefcbaf20baeab318bffc5964e8c507ca3df8153f383cf8517401375d44188aa4b5037cccb02b76b9a46cfbcf00b51b7eaf10c96a02d016f6d4bd5b2c961859
 EBUILD mc-4.8.27.ebuild 3277 BLAKE2B f0ad166643a2f22cac89583cb6793e47462a96a9d5acef7870fec3598403cd356e2bdedab092601371f3aa18a3e76596caaae3fa48a454051aa5af39c6bbe6c3 SHA512 282ac6d42a7de75cc3973ffa4259d33ce32eb0b7f1714f136f2dd349f09481fbe6aad7086d0f5bb4d6a0a24389bae4bd7b0962c5c573718bd5019750d676b605
 EBUILD mc-9999.ebuild 3187 BLAKE2B e23cd19959a0708d24b5035e6af3df69fa8e345b403f6b8bb7b19d67ee2929e0bcf5148ab1c4a81962afe6db98a7b17733896a1e7bcc8a8485f9fa17950012d2 SHA512 5ae2b7579a5f05c56c39a5d3c568e1ddd1d2f3ceb0bf4a0c10203a10feeae7ecc76a597c8d16d654969bbf80c4f0789e3cfeed0893dc9b209ab5b7deef2a4f86
 MISC metadata.xml 887 BLAKE2B d4e9a4e834ed9a45774f52f9274367a8bdcb771c9e551e3d596ad0669aedd445e45456b1381cc1ca1db9309e5b35853e070ef3a2a4efa13f5f3050b2135026a9 SHA512 7349c248bbf172832b9431bbc1f097d5be264cdbfc6a0106b52f3a1c01938185df7a877b4c47ab645170806acf05d4c8455cf949e9df8de6c5b7237f0b8e4875
diff --git a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
deleted file mode 100644
index 0a36f47f3a40..000000000000
--- a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://bugs.gentoo.org/776988
-https://github.com/MidnightCommander/mc/commit/1ed638d66cf803f69ac12ee80a72d217f2146e43
-
-From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Tue, 16 Feb 2021 16:29:51 +0300
-Subject: [PATCH] Ticket #4180: fix zip handling.
-
-After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 zip archives opened with
-an error:
-
-    file -L -z archive.zip: Bad system call
-
-This caused by using /usr/bin/file with -z option, because seccomp (a
-security sandbox) doesn't allow it..
-
-Solution: use -S option together with -z one.
-
-The file command accepts the -S option since 5.33.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- configure.ac          | 66 +++++++++++++++++++++++++++++++++++--------
- src/filemanager/ext.c |  7 +++--
- src/setup.c           |  2 ++
- 3 files changed, 60 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5f372dc3f5..f2351c99ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,23 +115,65 @@ fi
- AC_SUBST(MANDOC)
- AC_SUBST(MAN_FLAGS)
- 
--dnl Check for -L option to file
-+dnl Check for -z, -L, and -S options to file
- AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
- if $HAVE_FILECMD; then
--    AC_MSG_CHECKING([for -L option to file command])
--    AC_CACHE_VAL(mc_cv_filel, [
--    file -L . > /dev/null 2>&1
--    if test $? = 0; then
--	mc_cv_filel=yes
-+    dnl Don't use the file command if it doesn't accept the -z option
-+    AC_MSG_CHECKING([for -z option to file command])
-+    AC_CACHE_VAL(mc_cv_file_z, [
-+        file -z . > /dev/null 2>&1
-+        if test $? = 0; then
-+            mc_cv_file_z=yes
-+        else
-+            mc_cv_file_z=no
-+        fi
-+    ])
-+    AC_MSG_RESULT([$mc_cv_file_z])
-+
-+    if test x$mc_cv_file_z = xyes; then
-+        AC_DEFINE(USE_FILE_CMD, 1, [Define if the file command accepts the -z option])
-     else
--	mc_cv_filel=no
-+        AC_MSG_WARN([The file command doesn't accept the -z option and will not be used])
-     fi
--    ])
--    if test x$mc_cv_filel = xyes; then
--	AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
-+
-+    if test x$mc_cv_file_z = xyes; then
-+        dnl file is used; check -L and -S options
-+
-+        AC_MSG_CHECKING([for -L option to file command])
-+        AC_CACHE_VAL(mc_cv_file_L, [
-+            file -L . > /dev/null 2>&1
-+            if test $? = 0; then
-+                mc_cv_file_L=yes
-+            else
-+                mc_cv_file_L=no
-+            fi
-+        ])
-+        AC_MSG_RESULT([$mc_cv_file_L])
-+
-+        if test x$mc_cv_file_L = xyes; then
-+            AC_DEFINE(FILE_L, "-L ", [Define if the file command accepts the -L option])
-+        else
-+            AC_DEFINE(FILE_L, "", [Define if the file command accepts the -L option])
-+        fi
-+
-+        dnl The file command accepts the -S option since 5.33
-+        AC_MSG_CHECKING([for -S option to file command])
-+        AC_CACHE_VAL(mc_cv_file_S, [
-+            file -S . > /dev/null 2>&1
-+            if test $? = 0; then
-+                mc_cv_file_S=yes
-+            else
-+                mc_cv_file_S=no
-+            fi
-+        ])
-+        AC_MSG_RESULT([$mc_cv_file_S])
-+
-+        if test x$mc_cv_file_S = xyes; then
-+            AC_DEFINE(FILE_S, "-S ", [Define if file command accepts the -S option])
-+        else
-+            AC_DEFINE(FILE_S, "", [Define if file command accepts the -S option])
-+        fi
-     fi
--    filel=$mc_cv_filel
--    AC_MSG_RESULT([$filel])
- fi
- 
- dnl Only list browsers here that can be run in background (i.e. with `&')
-diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
-index 4e6f10c6c5..d6a09df7bb 100644
---- a/src/filemanager/ext.c
-+++ b/src/filemanager/ext.c
-@@ -71,10 +71,11 @@
- 
- /*** file scope macro definitions ****************************************************************/
- 
--#ifdef FILE_L
--#define FILE_CMD "file -L -z "
-+#ifdef USE_FILE_CMD
-+#define FILE_CMD "file -z " FILE_S FILE_L
- #else
--#define FILE_CMD "file -z "
-+/* actually file is unused, but define some reasonable command */
-+#define FILE_CMD "file "
- #endif
- 
- /*** file scope type declarations ****************************************************************/
-diff --git a/src/setup.c b/src/setup.c
-index 77c07649d5..2ef07f2569 100644
---- a/src/setup.c
-+++ b/src/setup.c
-@@ -317,7 +317,9 @@ static const struct
-     { "old_esc_mode", &old_esc_mode },
-     { "cd_symlinks", &mc_global.vfs.cd_symlinks },
-     { "show_all_if_ambiguous", &mc_global.widget.show_all_if_ambiguous },
-+#ifdef USE_FILE_CMD
-     { "use_file_to_guess_type", &use_file_to_check_type },
-+#endif
-     { "alternate_plus_minus", &mc_global.tty.alternate_plus_minus },
-     { "only_leading_plus_minus", &only_leading_plus_minus },
-     { "show_output_starts_shell", &output_starts_shell },
diff --git a/app-misc/mc/files/mc-4.8.26-shadow-crash.patch b/app-misc/mc/files/mc-4.8.26-shadow-crash.patch
deleted file mode 100644
index 4eeee45bc8e6..000000000000
--- a/app-misc/mc/files/mc-4.8.26-shadow-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/768285
-https://midnight-commander.org/ticket/4192
-
-From 6394547dbffbad44ea50c64c282de4b610ca07bf Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 3 Feb 2021 09:47:13 +0300
-Subject: [PATCH] Ticket #4192: fix crash if shadow is out of screen.
-
-(tty_clip): add extra tests for area boundaries.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-ncurses.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
-index 03235cd5b..5cddf5059 100644
---- a/lib/tty/tty-ncurses.c
-+++ b/lib/tty/tty-ncurses.c
-@@ -152,9 +152,16 @@ tty_clip (int *y, int *x, int *rows, int *cols)
- 
-     if (*y + *rows > LINES)
-         *rows = LINES - *y;
-+
-+    if (*rows <= 0)
-+        return FALSE;
-+
-     if (*x + *cols > COLS)
-         *cols = COLS - *x;
- 
-+    if (*cols <= 0)
-+        return FALSE;
-+
-     return TRUE;
- }
- 
--- 
-2.30.0
-
diff --git a/app-misc/mc/mc-4.8.26-r4.ebuild b/app-misc/mc/mc-4.8.26-r4.ebuild
deleted file mode 100644
index 26d020ad5a26..000000000000
--- a/app-misc/mc/mc-4.8.26-r4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shadow-crash.patch
-	"${FILESDIR}"/${P}-file-seccomp.patch
-)
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# patch touches configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if use spell && ! has_version app-dicts/aspell-en ; then
-		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
-		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
-		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
-		elog
-	fi
-
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.26-r5.ebuild b/app-misc/mc/mc-4.8.26-r5.ebuild
deleted file mode 100644
index 7bd110cd7992..000000000000
--- a/app-misc/mc/mc-4.8.26-r5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch
-	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
-	"${FILESDIR}"/${PN}-4.8.26-shadow-crash.patch
-)
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# patch touches configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Bug #759466
-	if [[ ${EUID} == 0 ]]; then
-		ewarn "You are emerging ${PN} as root with 'userpriv' disabled." \
-			"Expect some test failures, or emerge with 'FEATURES=userpriv'!"
-	fi
-
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if use spell && ! has_version app-dicts/aspell-en ; then
-		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
-		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
-		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
-		elog
-	fi
-
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 83fc8ac63944..a2d2ab3306a1 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
 DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc
 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 1827 BLAKE2B 3df55178a78795994f8cf08b2928aee81457ad56f199c695c049982851fbc3fcd82eb6476c857d9416e7dc97be57cdc277ecda02b4e187cb16f92bfd2dcc2d46 SHA512 f0bb756f0ceab0c85b3fd7f1f2a32a08af7b0363abf14b0873ae74b54a78443acdf699290f82e09b549a97a70f730f3ad7147be9e95ed5d145de37d4ffc737f8
-EBUILD pax-utils-1.3.3.ebuild 1985 BLAKE2B 27648dccd249761416b7549cb7084fef9048e7e18f598b072e30b2676de8566f9dcc8b1525a50aebb5d559c2db1d3fbd8596cb47432cd42a4313a6b5a29527e3 SHA512 5471611f0a9f2a3d1907e23c3ebd8a0a429ab7896c1febd088099db8a0fed7c583888b50d193345f181666d44432db092bf5b95cdc84e913fe6f5fbbdd9ee9c8
+EBUILD pax-utils-1.3.1.ebuild 1864 BLAKE2B b2226f202956b07cc741eee6309dacd4320585c9512f2996ec8c5db07b8c64337484ad051ef5ccd6dd211edf7864e525c4d43d25b03130c7edaddbb851340a67 SHA512 d4caa6d029e2c8ed42b32b7a0b58b06fc098fa977d1f1794b08ba1dd1d7bd38a830c468ec40c6329c8fe7baf6263ec17937e393e5d6bee0a294995219ac004bd
+EBUILD pax-utils-1.3.2.ebuild 1824 BLAKE2B b9fd79853f11ea82294ee32931e8928193d1b098ad160ba3c83f2b65ad1342d72c3eb4770569ba805b39d01447770fa04d094d12e970d72439dd794a6a5a8955 SHA512 68350a1d75ddcd95a59c93114fa0d29f000b94f3592526ead7c42f2dbf66c07707c51e6ea732d7a7cdd4ada861e6cb7985859adc22ab173faa42323cbea6dc66
+EBUILD pax-utils-1.3.3.ebuild 1982 BLAKE2B 4af356cc1990d951d753123e9188f84a4f9ed01201e386e859056fa351225bc49d33d6fe90717c4eb2bd04339ed091498a7c953c22f34f2f828e3ef6fe23783d SHA512 1d274eb63c767aaa2c7ee2e99dde23a34d4a34e888ded13f37e639390586b8456728a0ac8e67aba1d3db98dce3d89cc5a9a70d63e70036874571e4bcc14e489f
 MISC metadata.xml 678 BLAKE2B 347b6f8175b20bfa4f592b41b15f5fa8228fb3e657ab86b4692aef468130e7625e41ec1266a89ed1fb2a81d608eecd957e773863b440afd7bf83873a357ec7ce SHA512 e6739b52ccaf7f8e4d0c3b173c85b368c974fd62b231ce83513c342b9e3148b5b29aa7f985af929d3d07e9d5808ff6aca575b88dd23f0b25bb89d952fa45dc70
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index dc857708cfd6..343870e9abe2 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 toolchain-funcs
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
 	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
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 18d015fe0ab6..f99948a5de32 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 toolchain-funcs
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
 	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
index 6f36509b33a5..097d367f740f 100644
--- a/app-misc/pax-utils/pax-utils-1.3.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
@@ -13,7 +13,7 @@ inherit python-single-r1 toolchain-funcs
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
 	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1e517a9b9c1f..4824e658a5a8 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 3229d497f206..dc3b04551772 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,9 @@
 AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
 DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
 DIST texstudio-3.1.2.tar.gz 83987451 BLAKE2B 0649a4f2a429d1d7a6134e154c338f623de23c8b05829a169599f6950b59190736a0f4c2a4dc0e57ae2c47a5eb26594639660a8b691adbb768cb013061d5c1d8 SHA512 c8ce74cca6620ba725c4e8ff66564cc4804f3b922877af5c4952a8cd5b43fdf2deb88c1515f457f75a67d7d29ca1d6307779b8304c0b78b37f585c61a12221c4
+DIST texstudio-4.0.0.tar.gz 88426776 BLAKE2B 616ffaf35a4f2c5e5290517b38301c575b91251374ee96dc58560f40115ffd5e4e68830fe927283dcdf0f9c9b38815fe04a86a7e58e2dc7936b2b32e38bd6662 SHA512 9025e0709145ed9c352f9cfd748087b331fd2894c913d7b7707254050ea41d5df74077c8f94cc3fb19c4700d468d55e91895da1ea474759d83af499ef436cdbc
 EBUILD texstudio-3.1.1-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
 EBUILD texstudio-3.1.2-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
-EBUILD texstudio-9999.ebuild 1656 BLAKE2B 8bc3fd18051e2efb3f3fbeb0277c07955e01a82d8751123b55dd04b95ceccbd9f743a2a4f55f714e146f4313bd7ea91418cfc2d14398d1987510a38918ae814b SHA512 eaaee42397593ba11891f683798eb5a13223bc4bc8e99693a8c5023fee1f0a3d1bd04c67d0adf43044187ba3f9150f054eac2a82394ad1abb0c23e0a9733e5ad
+EBUILD texstudio-4.0.0-r1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
+EBUILD texstudio-9999.ebuild 1661 BLAKE2B 7ab31d156cb4b4a192ebbd96628f4f427ffe8f2f05296292bd3c98590c73110d5022e929df11f009188c347e108d5d460498ce44e243cfd91e49f9d8b2e7a405 SHA512 293d1621312fc9c5fb580a868bd67a43434c671b3b623048e9b93e6093d292e3975b292c1a7f6014853e44f803b0253a87a716ee30fa68bfec251f6dead07780
 MISC metadata.xml 523 BLAKE2B a16bc006c6ab5dd0536e77a5bbe1681cc84c3aa5be50bdb567eccecab426688c751c0bec2c34bf221ec54f5ba772236a81a227067e426bb545755a129ebb6e41 SHA512 91f8748cb661e3e2ef7c027d02aecccbe23cce00c0da8486227d237ee6429e84ac9a8c2b32d4c518a4583d0643871b0c50c838d3c40004c0df7ae9c8ecefceed
diff --git a/app-office/texstudio/texstudio-4.0.0-r1.ebuild b/app-office/texstudio/texstudio-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..1e8cd724e856
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.0.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PV="${PV/_/}"
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="video"
+
+DEPEND="
+	app-text/hunspell:=
+	app-text/poppler:=[qt5]
+	>=dev-libs/quazip-0.7.3-r1:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+	rm -r src/quazip || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
+		-i ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
diff --git a/app-office/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
index be66de953bf4..8c4937f86d75 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -22,10 +22,10 @@ DEPEND="
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
 	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
@@ -52,8 +52,8 @@ PATCHES=(
 src_prepare() {
 	xdg_src_prepare
 
-	rm -r src/quazip || die
 	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+	rm -r src/quazip || die
 
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b6ce7cee96f3..c6738247de14 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 589b92a76b33..e6bd1cccae66 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,8 +1,6 @@
-DIST iwdevtools-0.5.3.tar.gz 42845 BLAKE2B 9e6b634e8409cffc57fde36157be0186943d4df07c47f0b07eeb0dd5071bc3e4c7b84e543a46cd2ff4e49d9b9b34b9121b3583bd227479f1485ec5957dee4780 SHA512 8458abba687135caaefd1cb0adb8af079a2cf94ca484a4bb95ef2b32e00eea46a2c8df7d305d4b0bf7121f46a92ac3a25cd9067e22ad9a314f289f77379a1684
-DIST iwdevtools-0.6.0.tar.gz 51788 BLAKE2B 1b37e3097cd77201398959272c09d6391746036530c6341b7b2ccfccc4361067dc46c6e3b2c729717855e346a7ebf7279f8d0fc0a760203527a1431e2366dad0 SHA512 0c192c9a6b52eca99574eda8da8d41b051a502cbbf891188e323f376f43472aaa72c2f8ac78f4790c4f41d610aa0927180a3fbe290ac2964ccb9f257b7f508fc
 DIST iwdevtools-0.7.0.tar.gz 56208 BLAKE2B 205bb9bc1e894b9cc6a9c3abb4f902c9c3f8337fff8618df162f4dc5d78416fe8e2852cb513d4153d8acf2a0d918e43352714502e1f40faffc777e19ad81ab55 SHA512 ec528901229066d333fcd8f53060601628b682a93c3e07a89826ff0fd2e406a4dffe76397883d4c50b459588cc6364873c43e5129bd172049c30aea039ae36d5
-EBUILD iwdevtools-0.5.3.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
-EBUILD iwdevtools-0.6.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
+DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
 EBUILD iwdevtools-0.7.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
-EBUILD iwdevtools-9999.ebuild 1278 BLAKE2B 40589f722bb69c40f200eba9837f5957df7e3cbd7fa3aa579fed928567d28bb250ee61889954a3bbc0576100ce3d81b0e68819a24ba536fd15112df3c5a8e730 SHA512 ad5356ff5a5b8816d05394a17b16cba2397817c03629853f649617ed48867bf32673e288ac5d8ee7c078d4cd362231d90f52d22762a10c29cd3614fa8c080098
+EBUILD iwdevtools-0.8.0.ebuild 1879 BLAKE2B b2c2bf0f0cc6d1421f4660a9ecb121d2028d247716d988bd00d3e778a771ed3c0669325798ad25eaef444c4e5663f328b151aea3586ef5fc824a36d46d088b27 SHA512 a69df9aac24292a13bdef36be7416ab529d6fbf5a933cfa7568d01bff3aa57a02ec97dc37e4fffee0b3d42935834f30c5afdc93186df3e0f7b4eb5ea3b7d6d99
+EBUILD iwdevtools-9999.ebuild 1826 BLAKE2B d52e86df1f1b6f82c0e9d1de02e007715cb6c39e2b076d22d5316623261637e57a7aef582b55e56472afdaf1bfe48aae57ac9630416285bca0987ac4bf809db6 SHA512 5b32c64fe82629d8dd1ac504f377328ededb5e0c661b3fa3f3fa61bfb356c5b51e64ee3229152d52b27a08cbce51741c7cc30b7b37fd999ed7bf52d465ef9d1a
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.5.3.ebuild b/app-portage/iwdevtools/iwdevtools-0.5.3.ebuild
deleted file mode 100644
index 25cb8346209b..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-BDEPEND="
-	sys-apps/help2man
-	test? ( ${RDEPEND} )"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		$(meson_use test)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild
deleted file mode 100644
index 25cb8346209b..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-BDEPEND="
-	sys-apps/help2man
-	test? ( ${RDEPEND} )"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		$(meson_use test)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
new file mode 100644
index 000000000000..c1c495dcafbf
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	sys-apps/util-linux"
+BDEPEND="
+	sys-apps/help2man
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+
+	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
+		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
+	fi
+}
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index d18fac000b34..282831c8b50a 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -41,12 +41,24 @@ pkg_postinst() {
 	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
 
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
 		elog
 		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+
+	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
+		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
 	fi
 }
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 5a5f874574d0..34ab8936eea7 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,5 +1,6 @@
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
 EBUILD metagen-0.7.2-r1.ebuild 708 BLAKE2B 096b3982cd7b27b127b44528b628ed5fd29717ec6f927ef2a84a61107a0177c9caf53c291729618487db0d60aaa9e1af43fe8083ba5dbe8cad360e2b42ced17b SHA512 e62a3ccaaaa439ec322774f7cb0b2c6912a0d1b0c8312fbe34447482f6012298976f9c180c7f8692317a46d074b7b009c46cef61588991796011758c9647c9a1
+EBUILD metagen-0.7.2-r2.ebuild 831 BLAKE2B 179ff715e22997f3e2bf3fd9869af567c1d3be0afc1eea2a3a8d98f4d86c7a440056651e9b334ba836e4f463e36b7b4dfc9e7087700b9c55f77659b8932e1b0f SHA512 8a3510c223346ada9fe5dc962d3c5dd1c408396a3b1ea26339ea8f0039db903bd456b9b9148d80853af3f1e0478c804a3e7f856fedad5c2fa7781a136cb7038a
 EBUILD metagen-0.7.2.ebuild 737 BLAKE2B b8abed80940833688f245cef82963833ddea9994479d11896016bf601677c36b03531a4bba48ac5a7ffd7cd0ca15cb30e1db7890496e8f8e78507b4205e501db SHA512 3e4eef66d79eab73b0c1e4b7c0dd0b6fafe7fed3d529a399729bb9378ce68bb8d75f8eddca165fb7f814470bcceedf828e5dd239948895cea9a2b04d73e847b9
 EBUILD metagen-9999.ebuild 930 BLAKE2B 2ed329c8bfdfff8c72d7ee00b448b70c900bf90f325a7ab0d72f8c85458860c36313eb0597dd01962f446d89d12ac52045318ed879ad7841299f7286c3b01a91 SHA512 4d842ecb22d61cd199138d0692dc3713af538f026354efeb6f6cedab3ebde0be7f6cdd9a500594043af2f4ba282f27b05924b4e1fb86e507b7001cb7971c1a2a
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/metagen/metagen-0.7.2-r2.ebuild b/app-portage/metagen/metagen-0.7.2-r2.ebuild
new file mode 100644
index 000000000000..c0b8ff11a9d2
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+
+	# Bug 814545
+	mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/ || die
+	rmdir "${D}"/usr/share/doc/${P}/ || die
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/recover-broken-vdb/Manifest b/app-portage/recover-broken-vdb/Manifest
index 155f994c6d04..6ad9a37e831e 100644
--- a/app-portage/recover-broken-vdb/Manifest
+++ b/app-portage/recover-broken-vdb/Manifest
@@ -1,8 +1,8 @@
-DIST recover-broken-vdb-0.0.2.tar.gz 12038 BLAKE2B ad1c780e6a9499d734839c099c123c525704b00f421d1470801aa791bc691b43b2119c4138bee85f579f3524cf4f8f4544651dab222b86116fb9f1a80c4f319d SHA512 c9c404fbbf8ffa8993a9596a62bb35b88e0f814b5e82c0771c514dcb662a438a1282f23268e4cffd22863246f3a63f3d116630378c0ab10a19966ec0d7b6e8a6
-DIST recover-broken-vdb-0.0.3.tar.gz 12492 BLAKE2B aa3fb529cac6d61ed7f41364c784c3879fe1993ace84ad48e648db4bb970c348a55714091a0c467c75234f8e0eecf448fbd20e198c0998240e5f89d0a285dca1 SHA512 e102406b1921527e2564f28d3fcc28e7507f7148b849f35ba0157fc299135ecfc304a3c60ed06900daea95382645414268eb008dcc405112fdf8d74fc1a64d41
-DIST recover-broken-vdb-0.0.4.tar.gz 12693 BLAKE2B f9690aa16dbe1121dc7ffcfe2caac51530fb0d55bb1da9069bff53c5c43ba350a9fc14f957999e9136d52fbc241ff3017fa564da7bdbf54fa47f998fa6358665 SHA512 b6e7c1fa7c1870719ce93ff679a470c0e880de84a236fe077cb54cae8cb4e921a1c649f1a676e9f10256ff13d8a373f03d18a8ef84c0979d9a02fceed769a07a
-EBUILD recover-broken-vdb-0.0.2.ebuild 893 BLAKE2B 2fa3db30faf83cb0496f9fa2df30e4ba613460cf1422f622e3a13e761ac2bcf41758e746df8dc6a585f5ca6693d1eca56b70af879daf9ceb01b13dc5590e36dd SHA512 ed0efc7e605bfbd9e0c2dda35d659e259f1f0a773d3bf8b05e2e4d6a9b5164429fc4c7f694ceb5b53cb5cfc407f62397f35f09e7643280e4f18aec1d11f3be87
-EBUILD recover-broken-vdb-0.0.3.ebuild 892 BLAKE2B d8de84d440ffd2e009f2adb822c34b42925c9717b19e13950cb666714edaf75cf4ff851535c737fbff16f06d007aff5dff7b35c32bdf4d142ffca85aea28df57 SHA512 9792a612cc2d8ef2beecabbb4cfed76ba54fadfce8dd54f5d9192465ed1a28f0f328cb449436d3b79674ea8c0302278206a25a6a31c16c82fb97330eac7b4dd0
-EBUILD recover-broken-vdb-0.0.4.ebuild 893 BLAKE2B 2fa3db30faf83cb0496f9fa2df30e4ba613460cf1422f622e3a13e761ac2bcf41758e746df8dc6a585f5ca6693d1eca56b70af879daf9ceb01b13dc5590e36dd SHA512 ed0efc7e605bfbd9e0c2dda35d659e259f1f0a773d3bf8b05e2e4d6a9b5164429fc4c7f694ceb5b53cb5cfc407f62397f35f09e7643280e4f18aec1d11f3be87
-EBUILD recover-broken-vdb-9999.ebuild 892 BLAKE2B d8de84d440ffd2e009f2adb822c34b42925c9717b19e13950cb666714edaf75cf4ff851535c737fbff16f06d007aff5dff7b35c32bdf4d142ffca85aea28df57 SHA512 9792a612cc2d8ef2beecabbb4cfed76ba54fadfce8dd54f5d9192465ed1a28f0f328cb449436d3b79674ea8c0302278206a25a6a31c16c82fb97330eac7b4dd0
+DIST recover-broken-vdb-0.0.5.tar.gz 12739 BLAKE2B c818e1d24f2f6b049c42da7819ccbaab021e734ea92bef17b9201a48a039bb5b4c77002f85efc2cf1b1dfae36eb07b39b8dc0d1ac0acfeb00224945c98dbe149 SHA512 5b55a0296fb4c30b5173efa383ab7ffc8219bacb0366c19fdf8a636404829bda5ce501d8c6c436cacae954aa1b7bbc4426b9c5bf3a9cee0ab6159f25c1f919fb
+DIST recover-broken-vdb-0.0.7.tar.gz 13336 BLAKE2B 0c7d2dc73ca6e525edf190caee56f76e918559a4c0da322bb93b5807554d214fd01b53b0cc5c983fa9009b98a5d71f5aac542b26fe6656b9f81989e159f20d8c SHA512 447effe9664781095e8fd9760ff7f63f8b10466299c002e20da3d226843fa9c24a50b2c8f9eebaaa07cecd75a17272757c0e2175dd81e8daf2a59fa7233bc4a3
+DIST recover-broken-vdb-0.0.8.tar.gz 13867 BLAKE2B f756a8bd4e6227395a18f24fc872c057b3d826cf9752516919a86a6a5b860e5e1e01271d12574ebbcbaf0316a8c6597584c96ce82443c2abbeb2e7047f9f1e8c SHA512 207c17efc03c4d4e71ecc2eb36b1ac2a3d2d5f988dade0c643133c9080254beff24ed0430661336384b9bf40f953878b8ab00b335dcbeacc3716ee13ea2b6633
+EBUILD recover-broken-vdb-0.0.5.ebuild 964 BLAKE2B 96b8034955645ba574f79d5c8bf63c791d97d60d34ebdd3e6b5e9ac3d445d4a763fcb558738f8ea2139e6b876eba769d276dd7ee5b6d7ff821743617c2500d5d SHA512 099352bee1d1fe36d3897ed7724dec5524e1626821376e227329e8416558f51683ea953a5a6c2cf4f809675dfcd2de42cd22ce93217448d2cf4aa6f25b4c84f2
+EBUILD recover-broken-vdb-0.0.7.ebuild 964 BLAKE2B 96b8034955645ba574f79d5c8bf63c791d97d60d34ebdd3e6b5e9ac3d445d4a763fcb558738f8ea2139e6b876eba769d276dd7ee5b6d7ff821743617c2500d5d SHA512 099352bee1d1fe36d3897ed7724dec5524e1626821376e227329e8416558f51683ea953a5a6c2cf4f809675dfcd2de42cd22ce93217448d2cf4aa6f25b4c84f2
+EBUILD recover-broken-vdb-0.0.8.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
+EBUILD recover-broken-vdb-9999.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
 MISC metadata.xml 542 BLAKE2B c65008fabc6fcf791a935f514a218eebff103d0ce07290b84c545d1551ad8f7834b2245299081bb97c659280670bd2b4b252dbe328a0df946ae29c9110f34fc3 SHA512 dda7cb383905a922852267329a6a848f3e1c19c0fa0a97952dff0995192d00bf227722415194514edc778bd68a1634efdee1ab89cc8b0ce2e9433b8420d478a4
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.2.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.2.ebuild
deleted file mode 100644
index b70e84d12709..000000000000
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
-HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
-else
-	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	#KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Require latest version of pax-utils to avoid users breaking their systems again
-# The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
-	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.3.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.3.ebuild
deleted file mode 100644
index 75b07e4fa596..000000000000
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
-HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
-else
-	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Require latest version of pax-utils to avoid users breaking their systems again
-# The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
-	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.4.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.4.ebuild
deleted file mode 100644
index b70e84d12709..000000000000
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
-HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
-else
-	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	#KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Require latest version of pax-utils to avoid users breaking their systems again
-# The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
-	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.5.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.5.ebuild
new file mode 100644
index 000000000000..ce233e99dd61
--- /dev/null
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
+HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
+else
+	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Require latest version of pax-utils to avoid users breaking their systems again
+# The tool itself works fine with older versions
+RDEPEND=">=app-misc/pax-utils-1.3.3
+	sys-apps/file
+	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.7.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.7.ebuild
new file mode 100644
index 000000000000..ce233e99dd61
--- /dev/null
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
+HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
+else
+	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Require latest version of pax-utils to avoid users breaking their systems again
+# The tool itself works fine with older versions
+RDEPEND=">=app-misc/pax-utils-1.3.3
+	sys-apps/file
+	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.8.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.8.ebuild
new file mode 100644
index 000000000000..6bf736875162
--- /dev/null
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
+HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
+else
+	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Require latest version of pax-utils to avoid users breaking their systems again
+# The tool itself works fine with older versions
+RDEPEND=">=app-misc/pax-utils-1.3.3
+	sys-apps/file
+	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
index 75b07e4fa596..6bf736875162 100644
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
 else
 	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0a78183409ba..683a28cfab65 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index aa83230f675b..de4815399dca 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,3 +1,5 @@
 DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
+DIST bibutils_7.1_src.tgz 620141 BLAKE2B f020ea7c8164a870ef4c72defae1adc11558661a7ae9f3b037115cfc4a9e71b4f37c64f3b74641182300c3e921b8a0c309257a468b6b32f4fc2915e4a36f04d1 SHA512 2a155ca60c97d37941c860635d8e6920bd78de84452e1fee93a2f7331392f6a43f2c10055e84349bcac89314025d1524fd5cc73c47ad1613baa7baf2667c3f33
 EBUILD bibutils-6.10.ebuild 987 BLAKE2B 121e71d7e351135fc1d70b3c56706d68d74e8b4f454806e1211f3e428b9d617e885f7d8fd909121b7d6a78e5d82f4a2ecd37e7056f8f4204a8b8dc7b6581efa8 SHA512 04c331b7c4e54dbab631e27ddf2281a6bd8dcb332cbdf212b7adc5ccce61186b920b00f5fbaf231eb5bbad8c613e4f2aeafc5e385a9473310bdcf590a5af624b
+EBUILD bibutils-7.1.ebuild 937 BLAKE2B a39e4fe782440da07b0d59ee6d79fd89bbdcadc92eda5dcff60a2bcd5e243bf8280ef05fcff7776f65e51b60fb8cdbb62ee0120cf57e75cdb9aba1467177254b SHA512 44cf38673e6f7409846122ddb3ed24db1546542c8765c2465a54e58e56f8783ff445fdada3d4441976f7b309c758c483758c46326f57855a2b9417330a1114e8
 MISC metadata.xml 332 BLAKE2B 543aa8ae8a86a9dce2bed1f5bb05f2f960725d137c638b33ff8a9a33407ae3d50cf96fffde54fb16af359cbe6bc301241c68e5fff46f100b3e0fb97143c81c80 SHA512 dbdbf756fc639e73aa5c0a92df6a873f4ef4feaa6bd0c636d178dd5ef21e59a86872774f06d5c48eb1f1e1dffef16ab9d2cc3973804eb33e111b451f87cab11b
diff --git a/app-text/bibutils/bibutils-7.1.ebuild b/app-text/bibutils/bibutils-7.1.ebuild
new file mode 100644
index 000000000000..a54bd087935e
--- /dev/null
+++ b/app-text/bibutils/bibutils-7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	default
+	sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+	sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
+src_configure() {
+	./configure \
+		--install-dir /usr/bin \
+		--install-lib /usr/$(get_libdir) \
+		--dynamic || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		DISTRO_CFLAGS="${CFLAGS}" \
+		LDFLAGSIN="${LDFLAGS}"
+}
+
+src_test() {
+	emake \
+		CC="$(tc-getCC)" \
+		DISTRO_CFLAGS="${CFLAGS}" \
+		LDFLAGSIN="${LDFLAGS}" test
+}
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index eff724ed72db..1597ddd017d0 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1,4 +1,4 @@
 AUX chasen-2.4.4-cve-2011-4000.patch 559 BLAKE2B ee5085a642c1b04ab5cefeaedd09690f988e5cb600953d0ffecd479fe8ddc207e67a27980ebb3df2fbf31dab1f9cc55d597ea09d25dd0c0b29b8fe1d0eddc6c6 SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623
 DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
-EBUILD chasen-2.4.4-r3.ebuild 1101 BLAKE2B a304519d9cd0e097d2d2af455846712c236822cb51c65d356da7d0dfd6c9d3b1e002f35f4274f2833badc79f349e313d60c090797cb9fddba14f6b40af2d551a SHA512 4c6f2241bd044b2ab9acb3f5a8a97f2f8349dd1ab60e14b43f7789e0ed87464ef5292bd01a92b97d3871f53e99374aa8f591b0414386db23046e3701890d57cc
+EBUILD chasen-2.4.4-r3.ebuild 1108 BLAKE2B 3a0a37c2eebba2f1459a58625ac7cf9db6f9fe689d74cbf890a091803bf3f2a9a2f4fd765d051bd2f20409f31a58b4e5f9845090ccfa5202095b92a0696efd63 SHA512 03f3d1380761cc8338587c89ebc404ae0939fb99357295e705b6a723c477b91c653e04f8080042dd911735d1e89eb5b5ca740903177e22e20962903094d9e82d
 MISC metadata.xml 321 BLAKE2B 427e444d7c653146a829db223342ada561683932af8c28d2152aff0f9313b44364719c7ea0d83c771a727f066ff0f58fc2c7acfab5d63ddb0d8845d724b4ac15 SHA512 8c3caf1d5200da6288340c2272e5848311be344afab663c1aaaaf909a425e49a60b810d6b21196fd119c13bb776a09b142c9516f64dfb0414c2fd4ce58fb16cf
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
index e8557113ca4b..179bcc124bed 100644
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris"
 IUSE="perl static-libs"
 
 DEPEND=">=dev-libs/darts-0.32"
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 7c65f446df77..73aca8e16a66 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,6 +1,6 @@
 AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-DIST cmark-0.30.1.tar.gz 245126 BLAKE2B 4b6b7bcd87f931a50849d70afdd8593131fec6d937a804432444045b90eb6813a56c50e08dbb94bd424e0d5d53f9323f596d1bd2d1ab363bef742fe8d24971a6 SHA512 883bf559874f05af501de9dbce7e08c7297c09ebb26b3e08f55a8a5c43109e47ac14d129a2db31d7f105803e7259e3e104fe4241fd5c1248820a96e5228008f4
+DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
 EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
-EBUILD cmark-0.30.1.ebuild 737 BLAKE2B e2d3e37ed26d7f63b540f63c41340ef2aa709c33ffed5ebbd50e3c3da6f77326b84cffb5d4b606d7e6f527f6f54b9553d0272ca74ac8cd1cd9c8af5356b06ca1 SHA512 a9fd3592777c9d6ff85733e27b0fb14062da5a235b0c9bb3a6097a77be8f1c7c1ca4f994df269a0d24f4a251c794ce5837188ddc8b9c12f17613da926d93379b
+EBUILD cmark-0.30.2.ebuild 737 BLAKE2B 131b21f5b64684a9b432644c6ab30de400c792fc92512fdcbe089f5591ae1fb07a5eace219afd1ea35b37512af75141d76838f9bb5ab545d47dbcf47d95e8171 SHA512 f6c82ae0804aa270f4803840d450d2782ff7dd158eb0cca4be324c4e49b9bfdde1f3a51698b5acbf3b155f482eb48ccd41352261d792756b3cf3b586fcfa27a4
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.30.1.ebuild b/app-text/cmark/cmark-0.30.1.ebuild
deleted file mode 100644
index 6dff7a3f62ca..000000000000
--- a/app-text/cmark/cmark-0.30.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMARK_LIB_FUZZER=OFF
-		-DCMARK_SHARED=ON
-		-DCMARK_STATIC=OFF
-		-DCMARK_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
new file mode 100644
index 000000000000..67faa19c8c54
--- /dev/null
+++ b/app-text/cmark/cmark-0.30.2.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} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index a95394e95b86..cfd6eb6fcca4 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4d
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.13.0-r3.ebuild 3171 BLAKE2B ce9094871130dce076ab5967279e702feb8b7c85fd19bb77fc86a4b72ce8ce2f1e7bd8b50232da73b0123527f5e0015c784163e817d642d9c9077792e453c299 SHA512 bf78e375e406bec8057977a8071de75e83868b7a014b4e488d6947a8027a70c0c98206eaad6105c5f425364ec76079083e3b1d48fd2b45a98836298eb9776dbc
+EBUILD dictd-1.13.0-r3.ebuild 3178 BLAKE2B 68a96bf2106fcb22f974480c172d88e960baacf71a24fb7b08c6eb43988394664c2a3ddcb6335b1e99f18143e5cd9e8fdbab15574f26cc67ce14af0a7473fe70 SHA512 970e137463c52938419c9147654da72ab91b604cd5548b449a61428b4c24b18c4f46aa70997c08397ceb3a682d8efd223e92f3f924e915ad1f6ccae47d417356
 MISC metadata.xml 485 BLAKE2B 93a8e21c6d8d2cd4660347b82669638689e4e0f15dcd8ee4323fcf7ec6faa65547449fd0c0f697e5793a566dc9413055998c92de568c6f00c9ee60973f28b6ff SHA512 9b028d0441c1753c77a9166e21cdd45bede983d877288092f5b52e6a610795360308889fc31e40a3b1c91a298d93bd3cfb957b34436a9a23ccc224f7207752a2
diff --git a/app-text/dictd/dictd-1.13.0-r3.ebuild b/app-text/dictd/dictd-1.13.0-r3.ebuild
index 81eadd890466..382b8c1052a4 100644
--- a/app-text/dictd/dictd-1.13.0-r3.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 
 LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ac2c47f21ca8..4248ab0007fc 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +1,8 @@
 AUX ghostscript-gpl-9.53.3-fix-ps2epsi.patch 537 BLAKE2B fe6bf851c52751e3653e8e7cfac4b5e5e85ec3b9c9a125e5c7e0ca3aeca5cbe0b1ffe068633dd091755bfba410476b1328abbd94af7c90637541215f484e2413 SHA512 901a8a3b2ef645cd1e61f7596aa0f71921d480ebd48249b3d4e0e07dcfc33bb92ba484a28e952575c33062b3f429d8d60b43aeba8ea59a0623b18405dc27515a
 AUX ghostscript-gpl-9.53.3-freetype-2.10.3.patch 508 BLAKE2B 8819f3be84b556adde4808509a1199d08b059a77abeafb6d95076194093a3223cc8c8b7032124eaeaa98dedb237dd94632cb374cb854f7d1594a80b82df79173 SHA512 43bb10cbf6b316d59a616f986fe8bea87af1313ca71138ecdeb531ea2a689c64718c44d0a81f69bdf30e3814fec3b36866c2249d26c6d45c58bd121accc7f8d4
 AUX ghostscript-gpl-9.54.0-CVE-2021-3781.patch 7824 BLAKE2B 3e02e0085175054bb11dd392489ccd52cfe2d9b8b63430db55f54f95e13c1965f685eed2ccea367335565a0cfe2b35884a6da6d7465eeaf32442ec7680839917 SHA512 d00fccab57efbf2256d1c87f18e915a4c4dfc9a2c2a7bbaf9206c0a1fa72479402ded34b6b669ab2979cc637ac18181cbc3fe81ad18c2a3a4e5611f7d34da554
-AUX ghostscript-gpl-9.54.0-makefile-deps.patch 4532 BLAKE2B 555602c6f2fa1ea04e90ee4c68cca1965f8d31e6e9931c676dbe34e772931cf531042707e7f735081e8a5c5f0452ce9bb098add7dce661c8191ed29fa7a4db8f SHA512 96dd46ddaa9253886dc01dc093ea404d1c74ca9ca355b5dad0f2ef452c50927c114c4d27c961b688813eee713ec6565ab4ea1d1fb3ff47aca9c0194a04e2c6d9
+AUX ghostscript-gpl-9.54.0-makefile-deps-2.patch 5003 BLAKE2B 623f78c43bc5563f9a1feb4e5249c2235e655d22a6731d1002fc0c62ad553c60590d1e6a00e9046d5441d780c7547f6305c572f45fc047bdf449ad7ec6023691 SHA512 ea9ab533e046c65fadc639e50677ce7879e7bb741dcc45fc5a7c9772ff272868916cee56288e2a6f808240e945c745c5037a38f591e6a58a63e347b64121e9a1
+AUX ghostscript-gpl-9.54.0-makefile-deps.patch 4723 BLAKE2B 75abee2ee6b803889cada79c41bf32d8f9914d63e0ca404e7b779599c0b196ae64d639738ae9938defb8e83f01fac0e69dbd49b418e1d46da93bca75737c30db SHA512 0e5c499fd01526aedf52d28d7026dd18aa18d7298334187c73363ced7431c6bb34e7d2dcdde1e1448a10adf79dfe86c6de2d68aa7061ee478f7b49d61d173a70
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
@@ -10,6 +11,6 @@ DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c08431883
 DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5312 BLAKE2B 4f9d51fb65e131057d763290d2fa17cb6705c2a53d5c4181c73527cd130666fae9f0af24c0578c5cb217e812a82da6b2a0b9036a4ffd37ce38e22d3c7d5d2910 SHA512 38829cd1457cc2bb6eca7e38c2b0e42477520c5c93abf0d3563117a2bd34d7ac2859045672cb65f14a40b64d02b2b46923c8c1821e204291feb46884a9700278
+EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5290 BLAKE2B 68bed51c9e011285e6c11ddc29ca85ac589dc900d41be3c6f61f34df9e097168e604c3e3b251eded5589e1bc4b69f84ac60bb483dc61a4cf0a858bde7a489483 SHA512 29cdd0de17180962172f6efb92e18483765899ec0815f4a43b5f27ec49824fe0b0c5a68e4172e761995a6418fabccc3bc9647dffb521cb57bf99614c3459f828
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
new file mode 100644
index 000000000000..38f0eaa1516f
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
@@ -0,0 +1,96 @@
+From: Sam James <sam@gentoo.org>
+Date: Tue, 28 Sep 2021 03:40:19 +0100
+Subject: [PATCH] Rebased versions of upstream Makefile patches
+
+https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
+https://bugs.gentoo.org/800125
+--- a/devices/devs.mak
++++ b/devices/devs.mak
+@@ -669,7 +669,7 @@ $(DD)txtwrite.dev : $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
+ $(DEVOBJ)gdevtxtw.$(OBJ) : $(DEVVECSRC)gdevtxtw.c $(GDEV) $(gdevkrnlsclass_h) \
+   $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+   $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+-  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
++  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
+ 	$(DEVCC) $(DEVO_)gdevtxtw.$(OBJ) $(C_) $(DEVVECSRC)gdevtxtw.c
+ 
+ $(DEVOBJ)gdevagl.$(OBJ) : $(DEVVECSRC)gdevagl.c $(GDEV)\
+@@ -684,14 +684,14 @@ gdevagl_h=$(DEVVECSRC)gdevagl.h
+ docxwrite_=$(DEVOBJ)gdevdocxw.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ) $(DEVOBJ)doc_common.$(OBJ)
+ 
+ $(DD)docxwrite.dev : $(ECHOGS_XE) $(docxwrite_) $(GDEV)\
+- $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(EXTRACT_OBJS)
++ $(gdevagl_h) $(DEVS_MAK) $(EXTRACT_OBJS) $(MAKEDIRS)
+ 	$(SETDEV2) $(DD)docxwrite $(docxwrite_) $(EXTRACT_OBJS)
+ 
+ $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h) \
+   $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+   $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+-  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) \
+-  $(DEVVECSRC)doc_common.h
++  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h \
++  $(MAKEDIRS)
+ 	$(DEVCC) $(DEVO_)gdevdocxw.$(OBJ) $(C_) $(DEVVECSRC)gdevdocxw.c
+ 
+ # Shared code used by txtwrite and docxwrite.
+@@ -699,7 +699,7 @@ $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h)
+ $(DEVOBJ)doc_common.$(OBJ) : $(DEVVECSRC)doc_common.c $(GDEV) $(gdevkrnlsclass_h) \
+   $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+   $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+-  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
++  $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
+ 	$(DEVCC) $(DEVO_)doc_common.$(OBJ) $(C_) $(DEVVECSRC)doc_common.c
+ 
+ 
+--- a/devices/extract.mak
++++ b/devices/extract.mak
+@@ -1,37 +1,37 @@
+ extract_cc = $(CC) $(CCFLAGS) $(I_)$(EXTRACT_DIR)/include$(_I) $(I_)$(ZSRCDIR)$(_I) $(O_)
+ extract_out_prefix = $(GLOBJDIR)$(D)extract_
+ 
+-$(extract_out_prefix)alloc.$(OBJ):          $(EXTRACT_DIR)/src/alloc.c
++$(extract_out_prefix)alloc.$(OBJ):          $(EXTRACT_DIR)/src/alloc.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/alloc.c
+ 
+-$(extract_out_prefix)astring.$(OBJ):        $(EXTRACT_DIR)/src/astring.c
++$(extract_out_prefix)astring.$(OBJ):        $(EXTRACT_DIR)/src/astring.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/astring.c
+ 
+-$(extract_out_prefix)buffer.$(OBJ):         $(EXTRACT_DIR)/src/buffer.c
++$(extract_out_prefix)buffer.$(OBJ):         $(EXTRACT_DIR)/src/buffer.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/buffer.c
+ 
+-$(extract_out_prefix)docx.$(OBJ):           $(EXTRACT_DIR)/src/docx.c
++$(extract_out_prefix)docx.$(OBJ):           $(EXTRACT_DIR)/src/docx.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx.c
+ 
+-$(extract_out_prefix)docx_template.$(OBJ):  $(EXTRACT_DIR)/src/docx_template.c
++$(extract_out_prefix)docx_template.$(OBJ):  $(EXTRACT_DIR)/src/docx_template.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx_template.c
+ 
+-$(extract_out_prefix)extract.$(OBJ):        $(EXTRACT_DIR)/src/extract.c
++$(extract_out_prefix)extract.$(OBJ):        $(EXTRACT_DIR)/src/extract.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/extract.c
+ 
+-$(extract_out_prefix)join.$(OBJ):           $(EXTRACT_DIR)/src/join.c
++$(extract_out_prefix)join.$(OBJ):           $(EXTRACT_DIR)/src/join.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/join.c
+ 
+-$(extract_out_prefix)mem.$(OBJ):            $(EXTRACT_DIR)/src/mem.c
++$(extract_out_prefix)mem.$(OBJ):            $(EXTRACT_DIR)/src/mem.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/mem.c
+ 
+-$(extract_out_prefix)outf.$(OBJ):           $(EXTRACT_DIR)/src/outf.c
++$(extract_out_prefix)outf.$(OBJ):           $(EXTRACT_DIR)/src/outf.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/outf.c
+ 
+-$(extract_out_prefix)xml.$(OBJ):            $(EXTRACT_DIR)/src/xml.c
++$(extract_out_prefix)xml.$(OBJ):            $(EXTRACT_DIR)/src/xml.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/xml.c
+ 
+-$(extract_out_prefix)zip.$(OBJ):            $(EXTRACT_DIR)/src/zip.c
++$(extract_out_prefix)zip.$(OBJ):            $(EXTRACT_DIR)/src/zip.c $(MAKEDIRS)
+ 	$(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/zip.c
+ 
+ EXTRACT_OBJS = \
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
index 33858f763db0..51ce95958ba1 100644
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
@@ -1,4 +1,6 @@
 https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1
+https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
+https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
 https://bugs.gentoo.org/800125
 
 From: Chris Liddell <chris.liddell@artifex.com>
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index fd72246a2b01..94be6c18b807 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -72,6 +72,7 @@ src_prepare() {
 	# Upstream patches
 	eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
 	eapply "${FILESDIR}"/${P}-makefile-deps.patch
+	eapply "${FILESDIR}"/${P}-makefile-deps-2.patch
 
 	default
 
@@ -164,12 +165,10 @@ src_configure() {
 }
 
 src_compile() {
-	# Forcing j1 for both emake calls for now
-	# See bug #800125
-	emake -j1 so all
+	emake so all
 
 	cd ijs || die
-	emake -j1
+	emake
 }
 
 src_install() {
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 151f7c639def..0b8c3d0d57e1 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -4,5 +4,5 @@ DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
 EBUILD highlight-3.57-r100.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
 EBUILD highlight-3.60.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
-EBUILD highlight-4.1.ebuild 2399 BLAKE2B d22a7f2b7fcf146645e5c92f55feac8a3187afaa81b97b6178431e2df8fae954fe545704eaf5fc43edd46c6b157dbfe18cc80e73b30909300657332c09f0c573 SHA512 0a3a58ef57735e2c847e8ff7ad4b8fe4f707d4a8b092f1360719be010f107a7b5a58da9ed780c67d792b9eca5f31437093dbd6340325b9d10b50eed9e4e6b393
+EBUILD highlight-4.1.ebuild 2405 BLAKE2B 3514f6ce607909e7446ce97f23c8b44ab04ad75ef328863e17f4719b9af2b0fdf6e01611774a00d38fc6721823fb58c517b246eb441de67e12a7cadea6be17ca SHA512 50c808d2081d2bb3b276890a1c1e0f7f067465650c2df376ceaa839273fe1e9085d1df9f6df1005c8f6dfe5eb53d62d651b6514389de75188b443a6fb0d74f4b
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index 0772a0b94e40..c9571abe99d0 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 375b633159f6..f6b4131a0afd 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -6,5 +6,5 @@ DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fc
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
-EBUILD htmltidy-5.8.0-r1.ebuild 1499 BLAKE2B c5a6e7966ee73207ca385294bc0434fda47e06efa43b0d407f3e77ff0eb18cd4c6dc9de98cbb07507b6fb0b03f4a29074cd4740c8772b7f87f142a130f2273f2 SHA512 d09fdddf4fdba258ae4ea9a27bd3d4a6288e68c921b36a159a5bf4750caa5846d3459a651ed919c85ae678eafaae619079dbe449bdde1336deab952161932d55
+EBUILD htmltidy-5.8.0-r1.ebuild 1498 BLAKE2B e63b5bb8587b4f61bac9d28df3fbf85727fa69474d35115dd6636fe0c10e53f1cd8aa3f888983a235a2e187d72c803cb376697003b593cf00ba20d1c72b5dc6c SHA512 80b109025beb7e87a30a81fe1f32a9a6ea53da24245c22ad4a9fbc4313d0f0ebd15a9bd2bf4fb7e9d26ed732c9b8353c88eb5243e6c5acaf25c5a86ce28cb281
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 0989f564ad9a..972050738a1b 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="deprecated test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 66fd64f2c545..226133d436fa 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,3 +1,5 @@
 DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
+DIST kramdown-rfc2629-1.5.6.gem 49152 BLAKE2B 8c358dafdd467d211a4402c33204a8bc95580ccc8d232fed04b3e950911a6b854b09f2c09e0f0a0d20893cd8189e7bb633e832eabd2f0b0006241063eadd3302 SHA512 4203c094ae61dc39ee64253352a842892a58f4b12df75ccd2534ee70e1dd00bf546ccb9c426c896836be7e0833db29ec725aa5a10a51fe587e3c83f627fd8a7d
 EBUILD kramdown-rfc2629-1.4.19.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
+EBUILD kramdown-rfc2629-1.5.6.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.6.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.6.ebuild
new file mode 100644
index 000000000000..057efaabbd87
--- /dev/null
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/certified-1.0.0
+	>=dev-ruby/json-2.0.0
+	>=dev-ruby/kramdown-2.3.0
+	>=dev-ruby/kramdown-parser-gfm-1.1.0
+"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' ../metadata || die
+}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index b88f48e22c45..5e54e86880ac 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -2,5 +2,7 @@ AUX mandoc-1.14.5-gcc10.patch 1304 BLAKE2B d7f5c74cc4fc0da250eff19dc54c541bc1fe9
 AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
+DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4
 EBUILD mandoc-1.14.5-r1.ebuild 2954 BLAKE2B eb4b9ffbe134ea11c1fac9fce45e8f84d7cad63a0ff803b4d1fdd0cb6287a732c2c29f1114be40eb4b031d90035858edb79fd83e170b6e9de1c34e6fe7a03d96 SHA512 5f1edd81227c09a9eab1f348f1e34bbd8b23e7e5c710af31667a9cbc94943965f5411aea9594ce611b08487b4137f5627452c45ad8668b33b73f2a1d56765b87
+EBUILD mandoc-1.14.6.ebuild 2914 BLAKE2B 20b234353c2c77e7054a22eb2ba97092f60850c3ce38385e1da797d778f21324c5980f60b70105aeef70dbb229e0cf4d743cc99174afb2050f8286df83e3749f SHA512 f1e3c69ffd70178c8b9bd3cdfe01db57411a5c7050444b2a64e491fd2f640a9d2a2aa34fe5f0d6fe5ff0d769afdedfd551d75b522065aae0ca0b1ca92262ecd3
 MISC metadata.xml 376 BLAKE2B c9e309738edb58e62de763b93af8b88fc0c939afa0a471a9c8e83c989bb515b1f6acdde23fb74d8d277d3e111219857f715c7107136fc82f8179907474653a75 SHA512 ce13542ac914c6dc4de722325319c7f49b93fab7b2baf0625d749c793068750800f1af55f15c199e38029a27b523b14b441fb964cf3850fb6c69607cc2a6b99d
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
new file mode 100644
index 000000000000..c533b6e8298f
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cgi system-man"
+
+RDEPEND="sys-libs/zlib
+	system-man? ( !sys-apps/man-db )
+"
+DEPEND="${RDEPEND}
+	cgi? ( sys-libs/zlib[static-libs] )
+"
+BDEPEND="
+	cgi? ( app-text/highlight )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
+)
+
+pkg_pretend() {
+	if use system-man ; then
+		# only support uncompressed and gzip
+		[[ -n ${PORTAGE_COMPRESS+unset} ]] && \
+		[[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
+		ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	# make-4.3 doesn't like the CC line (bug #706024)
+	# and "echo -n" is not portable
+	sed \
+		-e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
+		-e 's@echo -n@printf@g' \
+		-i configure || die
+
+	cat <<-EOF > "configure.local"
+		PREFIX="${EPREFIX}/usr"
+		BINDIR="${EPREFIX}/usr/bin"
+		SBINDIR="${EPREFIX}/usr/sbin"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+		CFLAGS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		# The STATIC variable is only used by man.cgi.
+		STATIC=
+
+		# conflicts with sys-apps/groff
+		BINM_SOELIM=msoelim
+		MANM_ROFF=mandoc_roff
+		# conflicts with sys-apps/man-pages
+		MANM_MAN=mandoc_man
+
+		# fix utf-8 locale on musl
+		$(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+	EOF
+	use system-man || cat <<-EOF >> "configure.local"
+		BINM_MAN=mman
+		BINM_APROPOS=mapropos
+		BINM_WHATIS=mwhatis
+		BINM_MAKEWHATIS=mmakewhatis
+		MANM_MDOC=mandoc_mdoc
+		MANM_EQN=mandoc_eqn
+		MANM_TBL=mandoc_tbl
+		MANM_MANCONF=mman.conf
+	EOF
+	if use cgi; then
+		cp cgi.h{.example,} || die
+	fi
+	if [[ -n "${MANDOC_CGI_H}" ]]; then
+		cp "${MANDOC_CGI_H}" cgi.h || die
+	fi
+
+	# ./configure does not propagate all configure.local
+	# settings to Makefile.local settings.
+	tc-export AR
+}
+
+src_compile() {
+	default
+	use cgi && emake man.cgi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use cgi && emake DESTDIR="${D}" cgi-install www-install
+
+	if use system-man ; then
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
+	fi
+}
+
+pkg_postinst() {
+	if use system-man ; then
+		elog "Generating mandoc database"
+		makewhatis || die
+	fi
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 7b2095aaec35..2b56a7f84552 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -4,6 +4,6 @@ DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d8
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
 EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
-EBUILD po4a-0.63-r1.ebuild 1382 BLAKE2B d5df31e83007c984cfab67dd3a0ae333a24eac3f91ac9d188d92da960362b0e5ab5212a239d4100489f8e3e4e083bd8a7169c8cd80d48391f47edc8e6a940c6c SHA512 701dbbd20360d3eec66f0ce4aa4c25c17b5e3fbf4e7a9ef0fc5ebd209e329a298ee384dcdcd06a9791701e9e960d0251d73e149dd6110e7ca6e6b47132564c17
+EBUILD po4a-0.63-r1.ebuild 1381 BLAKE2B 892af19ee33f8f87b7ba6d7c895a8845993584a609527fbea1ee2d17673366edf303b330ca99802f2a97fdde2435b06f12b809ab3ef7a0c731ab7d25fac741e3 SHA512 ec970f1a73305b7c51656e75e70bdc539f143554bf8365f26c726b9a8382f099c5f0a1775e37de44a0acaf5bc545ed963f0c0463087f928d0c5b2e197c08994d
 EBUILD po4a-0.64.ebuild 1397 BLAKE2B 4aeba42b51780c8eae9fe0d594a286aa2febe52cd07cfe2b905742fe3aa44b7200f03fc242eb318a59142897a7b8a2badcfefe6d60eabf7fea04c994b583f32c SHA512 b6f5a4b8581599f3f2eb1d9ec36eba749be90c2c58e373cbb4030a56667c940d8430b836af329d6daa222c269b6076864461d85794e13f39770aff8ad8fa2e75
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
index 327a425c5059..796236689b7a 100644
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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/app-text/rarian/Manifest b/app-text/rarian/Manifest
index c5dc239b4cf6..3147bbfa8a2b 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1816 BLAKE2B 6bf84f29a00fe5903bd04963234f82f5df0bbd2769b911ece412e30622ce8766bee6b27dcda33740eb897f7235b63266e79e2cd4c4ed384b49805c10db6e4715 SHA512 86be73237698525b3b5df4e46acc202a5993fbfa575e9957dd2c477800ada214016d194b93994c1ee60168113a8707c7d73bf6ec98fe5497d8ae473b05f24ac2
+EBUILD rarian-0.8.1-r3.ebuild 1823 BLAKE2B 696166c40657009428228fbe02fbb46d4e2513b5828ad25e09c1ead30b456f3a600501f7314edc5a53d7c8a87447cb78ddaccee6f9b7500aa9c7aac0b6d60709 SHA512 7d2f7255cb68d437e071053c6d411eed364f5250f901abb9f609ff6cfe16b54dac2c30813b24bbdea8ec53c1b8ee5320cfdca9536a8f084e4f34b3c12d9a8a9e
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 7e123ebc5c1b..3672b9dc6da1 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index de7e20e6f7f9..fc0dfd6f5a4f 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,3 +1,3 @@
 DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
-EBUILD recode-3.7.9.ebuild 1301 BLAKE2B 2303740e5d156d369dd91bd76c31c3e22095df1e18a4b96dd994e9fe9f5be532cf999848b4d3a75d33bf7e2fbc515748b331073a3fb1aa771f130499443d2fda SHA512 0aee8d73e372e6f81ed80800336ed7b253f0cd79448e531610f1a5edfbe6d1bd3d4088d6a5081329ce70b1aaa884a7753df6eeb1553f6042d23a0f6f0c2ea372
+EBUILD recode-3.7.9.ebuild 1308 BLAKE2B 1d563895a5a28120b51384b8003185967a255c3d5147909b32c07e1021c7f884c054eba5f05844ba16e818547f7d995199dcf3908da38cf87ad9215ae109509c SHA512 b297ec5032cb8d23b05117cbb50ea14f6675fec15076aeb0431c9efe8f6c177318c7d2f18d9cdcc552c95b121b5e135c4a6882963b0c77ad3a3967bd9af92238
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index 84f579555f3b..824721b61d61 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 52a7c9deca48..926fd91a0c31 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -4,5 +4,5 @@ DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db5
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
 EBUILD stardict-3.0.6-r4.ebuild 5389 BLAKE2B a4926bb81e81b31181ede64891197b2e05d43a69423bfa7cd6ca669627891798784b0a7bc52c597cec045ef3f2bf8e76282a0a193169906b406a81889376a3ab SHA512 d5643b2e9f262ef7c22ca3ba5694ca49cf298f6a48d91471e5c75223414051a75d3489334e1048484acd6aae8317416311ddac98493b2c40187958cf4e4dc92a
-EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5802 BLAKE2B 7f0401d5d338d0c1c08ec07dce73bfd8498a77c410f5f864ed2cc2af587b7624c56461c64220b02ce0ad42e42b5e135779bd8c3c3a99903c5c13ff677a451dff SHA512 92f2df7ece70b5df32285fe2b7976fa3fa75b1f01c5698d9c55188d53214fe78bcecde0caebd301caefbc8b6c99a0c9aa08f4a9b61d87df1936aeb99a853a7f0
+EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5809 BLAKE2B bbb48ef9d460ccf1ced07ec062bbf0f2ebe5d00f1126f932f6b94f8f65a125b300867c014e8815e2d0e6641447bc511b4b406fc3b430f304533b7843956fca94 SHA512 7125c4a7c8a8b9352b5ed20e305e5aae25fbb071fb17e0976af3199c3ca666fb4638a095ea5bc7f69b98d6b6ff8206c2ce297e078e4b127ee559369c44d7f7cf
 MISC metadata.xml 2669 BLAKE2B ec9679f3182809ae806b8d5f2735c2b29b20e2832905a4bc95b3af426ecc737b91869db0623d75ea46311a35cd3a1a6bd76dc67dec221fe821329fca1b380270 SHA512 a131d14f75441548ce82a628bfcb4b9ba2cf27480ea7207b31233e64a2260e64e0e8e8d209e4fb701d93ef45dad661d6f9f063b178484ad9f5ee5c1fe9e562ac
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index 41900b018b60..a0b09d5647aa 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-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
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz
 
 LICENSE="CPL-1.0 GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="advertisement cal debug dictdotcn espeak examples flite
 fortune gucharmap +htmlparse info man perl +powerwordparse
 pronounce qqwry spell tools updateinfo +wikiparse +wordnet
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 23d06eaf5094..3d8ad36446f4 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
-EBUILD yelp-tools-40.0.ebuild 937 BLAKE2B f75b502ec89e0df1374a672cfc8057c0c241184f3f37f6de997c2c0f0399d783a0ad359ce5329ab82f98c087beb05ff02b00658d27a52cfc8d5aaa6f7e8a26f0 SHA512 23f645c242c76969e463b91e9e4d462120aae5a3a78624e1e747c078d8f3ae4c0e9b593acd80fe5d29cd933fb929c6db272d9bc04915c0f5396ee6b9fc0b2238
+EBUILD yelp-tools-40.0.ebuild 938 BLAKE2B 72ba4da0112a0d1d13e720332060301b315576315977fc03038f41908fea2c4a515e2dd7e5d4d475c6d23a3154ead23c72dcdd844f1688acbe89fed419a4adbc SHA512 1032d3a2b1a705bac569c14561caaa60a92afa306453b9772871c45277234c4c983f33bce75e432be9ec884938da7c1d27a46c490d965087ab8ebd856cee25eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
index 6cef89d63181..df5d518f592c 100644
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit gnome2 meson python-single-r1
 
 DESCRIPTION="Collection of tools for building and converting documentation"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index d3e4738e8844..ef0b94a542d4 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
index 4a44589dd47b..8290b300807b 100644
--- a/app-xemacs/xemacs-eterm/Manifest
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -1,7 +1,3 @@
-DIST eterm-1.17-pkg.tar.gz 109229 BLAKE2B 45fdfe9dd109b960d1a86f8099f53f9c12924f9cae6eac53f8fdf10accf59b07bea5b2ce3c013d93b7dc343a7adfa070e28d3207a7a1ccedc0844f1ce529d798 SHA512 0ba75254551fc3e10647088a0050dd076c0fb92e1d9549ee02fbc855e19ec5ea41ca24d0f61e080adac17f1427289607d6320950dee486f92630bc2f4b3a3e2f
-DIST eterm-1.18-pkg.tar.gz 116169 BLAKE2B 2fdfd0575c9df55eee88ac14009518106af175aa94ba0c4243c5930c35827134d7186c1cbf7031615af3141f53cdad591b105488110584ac6b9b464fea2307a6 SHA512 110cc05d4f29f38c881eb5205c94ad841e16b67e6a4386c6d8f00945d4f1b20aa859c1295f987cee317a7b974121c59f2a5ebafac0057a261f9c7bf09eb7846a
 DIST eterm-1.20-pkg.tar.gz 116176 BLAKE2B 953a801d761560e0a81de726d4b83e1b00c686360ccd66b7f89af190f154d0f563060ade702b8a63dcf68f885827e54ba15121e90a204f5dd108156c4dc458e8 SHA512 67d81b39761948d548fcd4fce200376702ce1884deb817c16e2db59c7eb3b571c60663ada91082433e08b42fedf62d07e31abd0f377cc4e44352398e826c7268
-EBUILD xemacs-eterm-1.17.ebuild 374 BLAKE2B 03fb5397d74e602cb8d73db76d65b2be3a34f75d06fb5b26ec7bad1c80160c1dfc88ca39e83e255b9689c9c3dec90990348c6c6218d5b401aec8efbb11f4f01e SHA512 802ddae3de1b79153ee40207360f25b760661b20b8c554c4c5dfd4524f478df0174957ffcc4bc14b80c349bbc37e744d21bbc91d5e0695a78b93c8999625ec8d
-EBUILD xemacs-eterm-1.18-r1.ebuild 375 BLAKE2B 44e21816f2b4509e5cf4677d44b82f3de0270a7954962239ec978da32e20625c0f8c909abc4bf015bd024ddf4a1b5162dc3d2ec2fe888d753a6d6777bcfefd3a SHA512 b09c917a7e49a81ae8887bd5361c33d6cb557f338d5ea0e5ece1b4aa7f6d2a17ae9d30cc1ce6ad5b7d30d54ffe9cfeb1b9e45cbc6ce7b57f3c64d45d96be940b
 EBUILD xemacs-eterm-1.20.ebuild 387 BLAKE2B e9839bd03af793f42a5f65a07e9f050c514cbb93f6c2b0519e3861b10579f5735d40d78b8f289d26fb98809dd9facee4ded4779fd8750fd093bdbd4292b674a4 SHA512 082f9f277200246e6bf4026a0c3b9dd2376267e5247bfd7c510446e9cffb078920a1260fc5980ac6746c048104de54796a22a9a0680c5641e3bd7804f6307c71
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
deleted file mode 100644
index 2de2e6bd92db..000000000000
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Terminal emulation"
-XEMACS_PKG_CAT="standard"
-
-MY_PN=${PN/xemacs-/}
-SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
-
-RDEPEND="app-xemacs/xemacs-base"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
deleted file mode 100644
index 2aff2d7750ba..000000000000
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN/xemacs-/}
-XEMACS_PKG_CAT="standard"
-
-inherit xemacs-packages
-
-SLOT="0"
-DESCRIPTION="Terminal emulation"
-
-SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-RDEPEND="app-xemacs/xemacs-base"
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
index c4d6c005af76..e4530c317e76 100644
--- a/app-xemacs/xemacs-ispell/Manifest
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -1,5 +1,3 @@
-DIST ispell-1.32-pkg.tar.gz 83587 BLAKE2B 80c65a5bb22711c6690ddef1213d60b5f6cca8d5fe342267e931294a10a976c9f3a50e6ba2d539720e460a25779363c954aac37b4c413741784251849fce0785 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070
 DIST ispell-1.37-pkg.tar.gz 102787 BLAKE2B c77034361f9ac9e69b51e2a17db78e675acfa5f55a25dda453d2612558ca0b4a1c2fb9b57fde17e2550a7ee4f2a8187a8983766f2e0282ce2fb793e13ab619a4 SHA512 6896c5fe7b9a10d3e11103dde8dbe7a23446c969a2af8e99815d34f621227076aa57061ebca589a3cd5decf5bf47a8c34ecafc73fe13f5310874edfbbedb8c8c
-EBUILD xemacs-ispell-1.32.ebuild 370 BLAKE2B b6cc4b983cf76f40db0d017e9b464632c37642b5d56b63ec8f5b491a8a19122c941a281da0ca026e7e5d0e49699e14d94d56c5623efaa887d714604d79b77e26 SHA512 e480ee266568ccb7d502b39cf0c0183262572e916ae0e77204039d7f68b1f3ad03c5986261b3261696e2ccd1ad7f7ba0263a34f1f882ce817f33c3adeb0045f3
 EBUILD xemacs-ispell-1.37.ebuild 381 BLAKE2B 0f3a875dfa30353c21a45f3659fd76f334889dc2082b12a18e58b002316fce9a0d8a2f1e7743eea237890541f6d2f396012592f759e428bfb0362a764ba541c2 SHA512 d8c25eff845d5c3848ceb5ea2719f3d46d9875184700f985360add15667a8eb30da942e0e166f676ce39a75fdb1d36dfa372e89cd4e9e321670c746d026e0c45
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
deleted file mode 100644
index 08af92270605..000000000000
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Spell-checking with GNU ispell"
-XEMACS_PKG_CAT="standard"
-
-MY_PN=${PN/xemacs-/}
-
-SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xlib/Manifest b/app-xemacs/xlib/Manifest
index 016aa72712b7..3f74d6e4d681 100644
--- a/app-xemacs/xlib/Manifest
+++ b/app-xemacs/xlib/Manifest
@@ -1,5 +1,3 @@
-DIST xlib-1.14-pkg.tar.gz 205806 BLAKE2B 87c98668972496db0950181354633409a1416a5a20e4764913b5b0ef6c99e3fa487ec67f2b460b60eecb2358b1ba6e9bb532fbae53036ecb5d73b07eb2b483c7 SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0
 DIST xlib-1.16-pkg.tar.gz 205431 BLAKE2B 50f5e46555710d1425873bb3c1e3215b4cbd28b49cb3a6f63e0c3a3f1b7234c613567c46041f46a015e761191d9079b7f3a8658ff7b7adf7ea3837a6059e3dd1 SHA512 ce5ab77d6ceaed84f658544d3e9e158254db26165500834c6f01e2bf341ea306b0c94b46c7361e4b7f923685d390ec40bd16ad0ab18cd7a1ff219221d9fdf4d0
-EBUILD xlib-1.14.ebuild 294 BLAKE2B ad472acaa08e7c7da2261ac1cbb4ab91a0e825b475ae3fdf88c3de05065c706a786a1c90e8f09e137b5a05af2c3f7158a974e751e88b92eeba18e9589b5514b5 SHA512 4956ef6e227352ad0ca13df9700f0c2224961f7ee470b198b2531e854727f83e465df6aabedb02be8d8932f7db07c681970a77f071fb4857ea5801eb747b4729
 EBUILD xlib-1.16.ebuild 294 BLAKE2B ad472acaa08e7c7da2261ac1cbb4ab91a0e825b475ae3fdf88c3de05065c706a786a1c90e8f09e137b5a05af2c3f7158a974e751e88b92eeba18e9589b5514b5 SHA512 4956ef6e227352ad0ca13df9700f0c2224961f7ee470b198b2531e854727f83e465df6aabedb02be8d8932f7db07c681970a77f071fb4857ea5801eb747b4729
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/xlib/xlib-1.14.ebuild b/app-xemacs/xlib/xlib-1.14.ebuild
deleted file mode 100644
index 44912635970c..000000000000
--- a/app-xemacs/xlib/xlib-1.14.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs interface to X server"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
index d964e3f0d96f..e341b02b6fa8 100644
--- a/app-xemacs/xslide/Manifest
+++ b/app-xemacs/xslide/Manifest
@@ -1,5 +1,3 @@
-DIST xslide-1.09-pkg.tar.gz 39199 BLAKE2B bd8cdfec35c9f7e309e51639958c15ffdbe0ed99a720f0dc3c001d1bda5904de914d075b65eb25ec0151d8b90260c2b1baadab2939f3d1c90f319461f9c2e4bf SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553
 DIST xslide-1.11-pkg.tar.gz 39204 BLAKE2B d333a427aff3532c6c04eb18de7d171c0f3737ee6c73f1ee33ff6967cab5e8ebbe30d12a0e12c63ceedbcf0a883cb4fb67328ccb33ef9ff99d3c880f7d0a05a0 SHA512 fb47d139bf61c632ea14aa9458c307a02cd4f2c70d69732c7d27d2247f70d338719525931d83dd9527669bd451c1eca8f92ce8a2c77f332d56ff64b979e1d513
-EBUILD xslide-1.09.ebuild 331 BLAKE2B c66dfd32f9a77b26a4aa16c4a94295cba142840351fd1da783b6b7c2ac0beeb106fc856fbeac1c3a460d548e92e915c5ea845005752951db5a9a071814b3ff93 SHA512 73095ac214f0f5f14a8e476eab5099f6ca1bcf841a3e1d4bde6cd0f8d6f9e2014b3f456df0af01c92ae95dc3aeff64d8ac682675c519a8de00de3e417bc385fb
 EBUILD xslide-1.11.ebuild 331 BLAKE2B c66dfd32f9a77b26a4aa16c4a94295cba142840351fd1da783b6b7c2ac0beeb106fc856fbeac1c3a460d548e92e915c5ea845005752951db5a9a071814b3ff93 SHA512 73095ac214f0f5f14a8e476eab5099f6ca1bcf841a3e1d4bde6cd0f8d6f9e2014b3f456df0af01c92ae95dc3aeff64d8ac682675c519a8de00de3e417bc385fb
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/xslide/xslide-1.09.ebuild b/app-xemacs/xslide/xslide-1.09.ebuild
deleted file mode 100644
index 0b9284884270..000000000000
--- a/app-xemacs/xslide/xslide-1.09.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="XSL editing support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-ispell
-app-xemacs/mail-lib
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index eb48c239f05f..c0a0d796afb9 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -1,9 +1,5 @@
-DIST xwem-1.22-pkg.tar.gz 649363 BLAKE2B 732ea3fa3810a5a2aff923ed1e9e6d5aa8d95a6b27ba888f2a9ea6590c1e61e37a4c2df1e4af35e7bed1886bc85a3118deb56b2071eee8ffb78be56583f0b22a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5
-DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b8965380d23ebbb3d021cfa86b3fee7fc3c232d000c27b4c0eec2ea5e34a27c80af283f14decc0ea72acca4685dd305 SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063
 DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
 DIST xwem-1.27-pkg.tar.gz 648980 BLAKE2B e4170d56e52f5cf46b314ace4c53fde5b38c64e385411b0011b6168e6ebc26fbde1e616349eb499cc5ff816862f4cf30e9663f9dffbdb01910a0fcd4eb44cc9c SHA512 0b6029f659ae1150c74b93d654e1ab01823386336796fe18eb4f542e9de0ceb2a171a6ed32cf941b2a872a6422e9842f44ae2767550bcc3bbd19f08fa4bbdabe
-EBUILD xwem-1.22.ebuild 455 BLAKE2B b45884cb39d00ef7994e61caaa39ab74b4bb574b75f6ee63bf213ffece8961e92b9fa03353c8aa9c0bd7de8f33eda80af83cfa1fc37841ef5be8b99b0ac07e51 SHA512 e8338aeba68575a2ce2990d67e0a1d3db281c043c3f8ae95c5640560edf889e580480929fbcecba54d4c3a83c8a73871608f42dba82321e3284bcaf2c3e6afa4
-EBUILD xwem-1.23.ebuild 455 BLAKE2B b45884cb39d00ef7994e61caaa39ab74b4bb574b75f6ee63bf213ffece8961e92b9fa03353c8aa9c0bd7de8f33eda80af83cfa1fc37841ef5be8b99b0ac07e51 SHA512 e8338aeba68575a2ce2990d67e0a1d3db281c043c3f8ae95c5640560edf889e580480929fbcecba54d4c3a83c8a73871608f42dba82321e3284bcaf2c3e6afa4
 EBUILD xwem-1.26.ebuild 455 BLAKE2B b45884cb39d00ef7994e61caaa39ab74b4bb574b75f6ee63bf213ffece8961e92b9fa03353c8aa9c0bd7de8f33eda80af83cfa1fc37841ef5be8b99b0ac07e51 SHA512 e8338aeba68575a2ce2990d67e0a1d3db281c043c3f8ae95c5640560edf889e580480929fbcecba54d4c3a83c8a73871608f42dba82321e3284bcaf2c3e6afa4
 EBUILD xwem-1.27.ebuild 504 BLAKE2B c2df52346e8f73e80ed0130e44698b62ae855035bba91e18df83f9d1307f3633a3a34900ac6465f1f561c35a894e6e5a793eb06b2e8a0ac4005674f6481c7462 SHA512 71d09235a9d62d493c4a0eac1e03ed788c81f01657719f9f4496d31582992c821bcca051859a455db09f70e2a8387ca0c1409537976c9ea08d09ca5b87b2997c
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/xwem/xwem-1.22.ebuild b/app-xemacs/xwem/xwem-1.22.ebuild
deleted file mode 100644
index a1cac1881167..000000000000
--- a/app-xemacs/xwem/xwem-1.22.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="X Emacs Window Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xlib
-app-xemacs/strokes
-app-xemacs/edit-utils
-app-xemacs/text-modes
-app-xemacs/time
-app-xemacs/slider
-app-xemacs/elib
-app-xemacs/ilisp
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xwem/xwem-1.23.ebuild b/app-xemacs/xwem/xwem-1.23.ebuild
deleted file mode 100644
index a1cac1881167..000000000000
--- a/app-xemacs/xwem/xwem-1.23.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="X Emacs Window Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xlib
-app-xemacs/strokes
-app-xemacs/edit-utils
-app-xemacs/text-modes
-app-xemacs/time
-app-xemacs/slider
-app-xemacs/elib
-app-xemacs/ilisp
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
index f3fc8c576066..2d3f0c83b719 100644
--- a/app-xemacs/zenirc/Manifest
+++ b/app-xemacs/zenirc/Manifest
@@ -1,5 +1,3 @@
-DIST zenirc-1.16-pkg.tar.gz 277377 BLAKE2B 9d4bbe33bfa82ad1eb06ffdedb73e3eb52fe43a1eeb1b2da8692b877207a8e28a43d345472f67812b8531eb0222c17f9b99a40e3ad4bcaf14820dbbd377afd63 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c
 DIST zenirc-1.18-pkg.tar.gz 277811 BLAKE2B ab8e8ca711b04db52dc4139bd4f75cf661267d3fa629572960c07e1c0e5537e824f6179e8c3b252bd78315fdce043e97c2cd03dd7adfd014c017c18a6be47fad SHA512 f4440d02b65aff416dd8c6064e678c365cf2137e94ef2a701c4b5459612b295d35b14f93097cc896787d1d5b74e418e5326ee41eb0edfedd08e00c7e56d5546c
-EBUILD zenirc-1.16.ebuild 261 BLAKE2B e9c1347425bb89c15810e011527c7d08680189bfd5be9df69fdb70bcf3b746bfe1d4afb6dd4dcd4b33024ee332a189201984ee5de91ffb19b5b7bd880196d1de SHA512 5a6d764207e389a54bc527e4ceb33853f91c2a702a1fd59df668cbfd62495638389d88c54579490a7621e0c0fbb89960c912a62e980970948dc48cf1f76bf059
 EBUILD zenirc-1.18.ebuild 261 BLAKE2B e9c1347425bb89c15810e011527c7d08680189bfd5be9df69fdb70bcf3b746bfe1d4afb6dd4dcd4b33024ee332a189201984ee5de91ffb19b5b7bd880196d1de SHA512 5a6d764207e389a54bc527e4ceb33853f91c2a702a1fd59df668cbfd62495638389d88c54579490a7621e0c0fbb89960c912a62e980970948dc48cf1f76bf059
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/zenirc/zenirc-1.16.ebuild b/app-xemacs/zenirc/zenirc-1.16.ebuild
deleted file mode 100644
index 18133962fa3c..000000000000
--- a/app-xemacs/zenirc/zenirc-1.16.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="ZENIRC IRC Client"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 683632712217..a99e5b881536 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 0ed2db3f362a..29e1dc89930b 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,4 +1,6 @@
 AUX cpp-taskflow-3.0.0-gnuinstalldir.patch 3340 BLAKE2B 2e36ea275ff93b12189e14d9a9e4a7141fb0b183ab68ce8fd76336feee34150a8f36d07bfd0eee41df04654968ae4c8de2e45df0d5de73e7e5b49f36de61a1b8 SHA512 f42539ec5612920112f7e56b7300cdee2efd8c6e93167d410b66bdacd6c827c09220162e6217fb22163ed152a364f68f16c9f255157436cc9086efcfb67ad722
 DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
+DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B 03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224 SHA512 e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa
 EBUILD cpp-taskflow-3.0.0.ebuild 692 BLAKE2B 403c306382a21a930d1de638ae95fca69ea983a3a69eb530e35b0e89a4905b16cc2bd639df2bcfdbba6d04f855d2eb178faebbe2411ea443b66d2aa78ef7c68f SHA512 2ab540db996797b44c9fbf64a6a84f7cdf33b51243f822f4b4b0a42511ccb603fecaae63253b990701324e47824e572d1c448c22328653abf22afc59cc716d01
+EBUILD cpp-taskflow-3.2.0.ebuild 640 BLAKE2B d3b0cb72bb472fb33746ebaf30b754a8892ef1c0607009a5c0adc0a8700d1102a8597ad21950bb454d75c073c19f0e4906db89b2e82d3dde62096646c8a42ebd SHA512 12d15a698591a04705f905593e722030e61a932910e5f4833a653815894893eb239eb0ff46b15163138ea356396e035256fb448f8045ba53b6e7a4ae1d632a7e
 MISC metadata.xml 663 BLAKE2B d9364c3cb5391e8b95488f7016d1dcf51400970c8ea0737549c91ca3ec4ac1132c3c34d76bc2aaefe80dbef2887ae28e150d8d396d297c19fc2d45b7f827417e SHA512 054c5840f22ed9ecb67c85a7ca78898ab7897de5bb254ab61a602ec1031e92cde398525c9c97c59d0b66a57f3fab5f8acb0efa511c958a6754dcf7f2c0c77359
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild
new file mode 100644
index 000000000000..fc6e30fbb60c
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://cpp-taskflow.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/taskflow-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+HTML_DOCS=( docs/. )
+
+src_configure() {
+	# TODO: enable CUDA via USE flag
+	local mycmakeargs=(
+		-DTF_BUILD_CUDA=OFF
+		-DTF_BUILD_EXAMPLES=$(usex examples)
+		-DTF_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 8ce25a6af004..dade93b7e205 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-2.3.18.tar.gz 12146295 BLAKE2B e11960b1cf3591671751a02b716da0e1cc5caafa5a9bd12a7eb1f190aa3360270fb373ffe32fb854f26b9a8f25508e6e92436e1bc33d18480cf9c7e21582d336 SHA512 9b3d695e71014799330a5be77ee1e9e43d85e1bcbf9657c516f4c6ca6076651e3b40408fb3212cccfdfefc5643b6f504f7536eb674982049485effbb9e2233d4
-DIST notcurses-doc-2.3.18.tar.gz 130180 BLAKE2B c280db393df33d54868eee0aee1bb4fe04c7100223251ac5ebeb416b13b3248039da58f1883a8adfc0657d69f38aab17c32e1b5597a7d611b7f1594f45700f50 SHA512 27dba504bf873680a7f2ca36739002d39d4e5b0f913d64b10926dda66a54d58eb019c7199f93ab04a6b7fb83ba3d646369e3a96d95a5ad548b7bd25f784bf823
-EBUILD notcurses-2.3.18.ebuild 1216 BLAKE2B 073b07b96ee306a28af2461aba70d101af90a04fd3b451cd11517d9b0b9eb1f926d42d06bbcacf38fef9753b6a92f2f19574ba2b4422128208ae95e97454cd67 SHA512 29e54af4135dc2d2f9735c66e0334b63e7efdda28951f3e512760498deabff429767ed0503902446fbe4f92761d591001d25d12097da8a9cdef84765e94da745
+DIST notcurses-2.4.3.tar.gz 10070959 BLAKE2B 8be967d7f1d49936c12c46f4d9c54ac83e974e4f637fa224000a2459d4143590264dc75c4d36d55ec9cfaa0d737de3298e42156a25b3eef84109883b3e80e8ae SHA512 a16d4e8d8108f565fd6f073b9529b6d7d52569d5241ee0df7186b44800a82a5e488d275c01c6af045419a2ae960f14a99fffe0cf5d600b5901973d93d3c82f82
+DIST notcurses-doc-2.4.3.tar.gz 132158 BLAKE2B f96f41c659903e6fbac56318adf1de1b26dd7052e4c5958d60ff7f51c4c30ccf2a522f2581a69a7f54d1cd7774bb72fffc0bba760366294a261a7086611ff696 SHA512 7972d61cefcfa4cfdc3f6138202e1448c37dc2b3154307e4a7c0734e67b80919db75520f40f53c198c268f0f905720e75de4ef0ea7a6c0cd196a355b8dbf1e5c
+EBUILD notcurses-2.4.3.ebuild 1216 BLAKE2B 16d640dceeed8f18983d069f9cf3dd2e67b4de226e8f1ce9146abdeec78a7552e708c0294c6cdca63fe6759c26ed571dfad1b4e4949e478d3469386dd6b30ad7 SHA512 a7f10b981c2d06cd3e6298453087cdfc3fc523189c85fe22ce5e19eaf8646a31067769a7e69a448d1021007cf82f079c2bd1fdb5a0ab90862531c6801e258b80
 MISC metadata.xml 870 BLAKE2B 67904fea263b93b4fe7cf331087c1c04aed9d8010f73cc38bd9bebe0e695cd67af728bf962c4459c99bbf7218edf02720f3889d24b8184be85a9472faec56f13 SHA512 b418cbe7abf512f9d94637e624eb05831a35d08710431c9a3f53c01d038e273116d1d755308157608fe486aaee60feb99d73f365df1d5d4c7db51f5b75e33c2b
diff --git a/dev-cpp/notcurses/notcurses-2.3.18.ebuild b/dev-cpp/notcurses/notcurses-2.3.18.ebuild
deleted file mode 100644
index d63e802b8738..000000000000
--- a/dev-cpp/notcurses/notcurses-2.3.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="Blingful TUIs and character graphics"
-HOMEPAGE="https://notcurses.com"
-SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libunistring:=
-	media-video/ffmpeg:=
-	sys-libs/gpm
-	sys-libs/ncurses:=
-	>=sys-libs/readline-8.0:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DOCTEST=OFF
-		-DUSE_GPM=ON
-		-DUSE_MULTIMEDIA=ffmpeg
-		-DUSE_PANDOC=OFF
-		-DUSE_QRCODEGEN=OFF
-		-DUSE_STATIC=OFF
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-}
-
-src_test() {
-	multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# we use this tortured form lest we try, every time we release a
-	# x.y.1 or x.y.3, to install the source dir as a man page.
-	# exploit the fact that there's a bijection from html<>man.
-	for i in ../*.html ; do
-		doman ../$(basename ${i} .html || die)
-	done
-}
diff --git a/dev-cpp/notcurses/notcurses-2.4.3.ebuild b/dev-cpp/notcurses/notcurses-2.4.3.ebuild
new file mode 100644
index 000000000000..238a985a305e
--- /dev/null
+++ b/dev-cpp/notcurses/notcurses-2.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="Blingful TUIs and character graphics"
+HOMEPAGE="https://notcurses.com"
+SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libunistring:=
+	media-video/ffmpeg:=
+	sys-libs/gpm
+	sys-libs/ncurses:=
+	>=sys-libs/readline-8.0:=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DOCTEST=OFF
+		-DUSE_GPM=ON
+		-DUSE_MULTIMEDIA=ffmpeg
+		-DUSE_PANDOC=OFF
+		-DUSE_QRCODEGEN=OFF
+		-DUSE_STATIC=OFF
+	)
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+}
+
+src_test() {
+	multilib_src_test
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# we use this tortured form lest we try, every time we release a
+	# x.y.1 or x.y.3, to install the source dir as a man page.
+	# exploit the fact that there's a bijection from html<>man.
+	for i in ../*.html ; do
+		doman ../$(basename ${i} .html || die)
+	done
+}
diff --git a/dev-cpp/random123/Manifest b/dev-cpp/random123/Manifest
index 6baac1d6bf2f..19d108f7698e 100644
--- a/dev-cpp/random123/Manifest
+++ b/dev-cpp/random123/Manifest
@@ -1,3 +1,3 @@
-DIST Random123-1.13.2.tar.gz 694636 BLAKE2B e238d2f19eee56ac6388b5d63dbda4e5c4f41f3c9e18e4aa0f4cbadc5e6dc62aa10a1c37425ce1e51f95fea9927655bdb0cfed82d3bd468cb55ad6ec051bd247 SHA512 543ed679911177c2da00b920c376abc8c5f4496c9a6a4ed823c295f5222e370bc2b8c9c5b63e93ae507252999eecfc112ae3203a2a82f9deb8747a9f9d387b18
-EBUILD random123-1.13.2.ebuild 504 BLAKE2B f8b5d4a230feeaa220aeb6c48dde1b8f22b64cb8c730611d6cf209de823711b656058bd0d36c659138ee539a2c875103f81e56273f6032e08af823ec6a3e1dff SHA512 a22936ec5e129de1bdff0a3dbd7e31e7f28f8dca1d7c8085787c65ba5333d6c12d9fcf8f6d7a412d98c8979359e9834658a9a45d35173c59d1543bc543dc276a
+DIST random123-1.14.0.tar.gz 318306 BLAKE2B 23248741359f0158fbb775ff723693c37c085b8acc1e162968555a5109abf0ac4e028f7731488b1bca385659f8f50f5c91b381f3ee6d1630ac7c62c41fadf2b4 SHA512 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e
+EBUILD random123-1.14.0.ebuild 546 BLAKE2B 4a33ed0fe91d7513e865686eee86298e4183671b334a9c4193d96b54af275f47de29643ce061fb576282d8b9f51cdc9272731118dd776fdba6eb7cfb2e771348 SHA512 e64da0aac9268905a360b6002e563d15c2a2db6229fa594001b04cc8d5e4b0fd24cae3fd6fd5bec316d15dddcf68611ceddc67c53af34ce6bb31b594221e6198
 MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
diff --git a/dev-cpp/random123/random123-1.13.2.ebuild b/dev-cpp/random123/random123-1.13.2.ebuild
deleted file mode 100644
index 0b3726e97f65..000000000000
--- a/dev-cpp/random123/random123-1.13.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P^r}"
-DESCRIPTION="library of counter-based random number generators (CBRNGs)"
-HOMEPAGE="https://www.deshawresearch.com/resources_random123.html"
-SRC_URI="https://www.deshawresearch.com/downloads/download_${PN}.cgi/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/include/Random123
-	doins -r include/Random123
-}
diff --git a/dev-cpp/random123/random123-1.14.0.ebuild b/dev-cpp/random123/random123-1.14.0.ebuild
new file mode 100644
index 000000000000..038445dfd04e
--- /dev/null
+++ b/dev-cpp/random123/random123-1.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="library of counter-based random number generators (CBRNGs)"
+HOMEPAGE="https://www.deshawresearch.com/resources_random123.html"
+SRC_URI="https://github.com/DEShawResearch/random123/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_install() {
+	insinto /usr/include/Random123
+	doins -r include/Random123
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c9c35c18fe97..4afe9b1a750b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index ae8e341b6e19..1f4fc292d8b9 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,9 +1,11 @@
 DIST citus-10.0.5.tar.gz 5182513 BLAKE2B 84bd1d2d8a33ecb58371625bfe9936985b3e84237f5580b5d217ee7807a541b7d94c09ad1be75204582149a2be0f3b54fa69ba73c089a33c7d416c796259423e SHA512 38414bd53952b3fcda222a3edeb7c0d32c9fe360fd6cfdefbe2c597df0dc527cf32471b5a9eac68be670858f3c3ee0a5691b778e2821c129838d1f17bc7a539b
 DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff8d40e48d4751799d4268618afe9b7dcd72bfbd5b01dc073f6f4af55e8dc338071e3be224d15ded423885bbebd SHA512 2ad9665c5de3214a5ebc08d5df663caa634912dd9db433a43bea96d3932213786d1650a695531a4d00ab8dff7d53078848466d7a6e803bff3ab26f4df3990c91
 DIST citus-10.2.0.tar.gz 5496211 BLAKE2B 9b6f3aeb19e8f4391b6ca24615a6eab405a57bf673995d79c2ea563dec67c63ffb5d17d4f8a1f245497f15de2fb572d0ecccc4a5195e797bd2a799800dcc553a SHA512 fb816bc0f252f6a63c76923366c9a25b9004288c09c7a6de7911a2c0325e47b1772b7a59cdb39e034d406ce99db53ced8e68c658bf16e92c2c99eb7331537ea7
+DIST citus-10.2.1.tar.gz 5502245 BLAKE2B d83e951aed48bcdd67e0d6ffb7c1f036e46cf5da961a11df007e2f4d0bb6437dc9f61f4c2e32732beb23bdb3d03236f1b2c2bdfcdbd843d95c3788310475c4dd SHA512 782bef91d2d3a0eb12b291e43ce10fc43e24b37d330f0d861e5e5feaba8d9bd556270cfa01d210d29ee729364697e9fbce47f95ef892ea6ec92a9ef49c34f931
 DIST citus-9.5.8.tar.gz 4737096 BLAKE2B aa2e272f635699e16ebb5df2f981c1250009c721198456228a90837a8a37c6e5325dfea8f51f39bd3aafe8be0b6335cbac36443bc3193b796c9be6fe34a91a41 SHA512 5fbde79f995a1e66adb9339fecae03c62763b725e7aeafe4d57e10355cfe6bfca0724e38f2e6c34ce4eb762d94566f23ea1e78692eff602623ededc8a91b7949
 EBUILD citus-10.0.5.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.1.3.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
-EBUILD citus-10.2.0.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
+EBUILD citus-10.2.0.ebuild 576 BLAKE2B 5d57530eabd731473a5a913768c24bdb965a06077d5c8ee74f362b0716b1d405fff53b9334d4318e4c08255490d5a2d927a94e9b6ac4718a152d95360794bcdb SHA512 6a7802b7e0bc7df9835bfe1d44f1df79b6d9a4520deaaa0acea27b54c8121275c87ef2e570db18f94d261f64580fc04bcfda485d8c345f696d5fb35a833c03fd
+EBUILD citus-10.2.1.ebuild 576 BLAKE2B 5d57530eabd731473a5a913768c24bdb965a06077d5c8ee74f362b0716b1d405fff53b9334d4318e4c08255490d5a2d927a94e9b6ac4718a152d95360794bcdb SHA512 6a7802b7e0bc7df9835bfe1d44f1df79b6d9a4520deaaa0acea27b54c8121275c87ef2e570db18f94d261f64580fc04bcfda485d8c345f696d5fb35a833c03fd
 EBUILD citus-9.5.8.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/dev-db/citus/citus-10.2.0.ebuild b/dev-db/citus/citus-10.2.0.ebuild
index 7c1f0e8ac75c..2ff6ad1ae5d3 100644
--- a/dev-db/citus/citus-10.2.0.ebuild
+++ b/dev-db/citus/citus-10.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 12 13 )
+POSTGRES_COMPAT=( 12 13 14 )
 
 inherit postgres-multi
 
diff --git a/dev-db/citus/citus-10.2.1.ebuild b/dev-db/citus/citus-10.2.1.ebuild
new file mode 100644
index 000000000000..2ff6ad1ae5d3
--- /dev/null
+++ b/dev-db/citus/citus-10.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 14 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 6052e3445656..8bda7d03c4b6 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -8,9 +8,8 @@ AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST etcd-3.3.23.tar.gz 6526967 BLAKE2B b29cc691a45021ffb2bbf9528d66e2a4384bdf21bf8865a1062d38535e8823a7726790e4d1d5f7b1a9362a730668d2ea579422619c9e29837c290f8fd7edaea7 SHA512 28b689092b342f5d7b211b122f6fc22dcd62c54eec70d4108b5f933851cd145bdf26097927e70b6596af918c583ad3a4bd28acc4c0e93d7f67011789d66dc94b
 DIST etcd-3.3.24.tar.gz 6518759 BLAKE2B bff713b5f754e6ed86f4265be7691f5cf6ad0bc1576ef15a4364b34dda827bef4390024d7a9bb032907dc8a95d8d3884e9f2ddf5a37b3b7e4ab476a13e61b8ac SHA512 a3825a1d6ec886a5f30317929bafc1f5b2657f374a4cb7a0348786a7c4f6b073197b2bdeb4d725e78cf5c99cead3e38dbf468ea023b3e7689bdce857466a72d3
-DIST etcd-3.4.10.tar.gz 8954911 BLAKE2B ce800d9db0afdbeab5177b8138e494997a1df024acfa137a7138c6e205c26881c06544e8feeee7a6fd372382fce2eca5f73cb5139a3878339f1182703619cfae SHA512 104bfce77778df4704caafc45b731bb440060be1d802a42642f33cc6c2ad11b7f94c237c1b8a47c38d1e109b71b31cc6cd8a666796fe2dbc925722fee1c2c4da
-DIST etcd-3.4.11.tar.gz 8957210 BLAKE2B d8cc647bb4441222d6331bcb89f7a007e830d2d95d38fdff978f44f21b0266184fb6ba328d36a6d5996e9a4c2de4c86088714283ff24df4a8d66d75d0b35cb62 SHA512 c12bf650028755ff38f5624b507f95523279573a4aa1097438a7182afa949a63f2dc06d4223e52607bdff14a8653b570c05d814310ccfd3bacc5a57b286a8c7e
 DIST etcd-3.4.14.tar.gz 9182134 BLAKE2B 9723b275816423be92cf24ff39f84a69362e30aaccd879edbde75e1cf8e9d6f35e503118bb9a6182f46b566c6fcd56546bbf00c2532837de2d64e9ebabfda8b6 SHA512 61262b921104f4626131f9722a127debe7b1daac09a90fcb55fb044312b771024e913eb657ea0c59a64b493f66a07f828bcc109afadbd4cc5981034a778f3958
+DIST etcd-3.4.16.tar.gz 8853228 BLAKE2B 576d3f038f6e9e3eadaa9ba3935f8372271e9fd2cfb8ab193ce16ee57a55419daad4d8496f6ad27dcb833566e6eb077052422e1c86053d176a86b4305c8cc525 SHA512 3f413debe8bd723a00a3e39db05f6dbf414b7dc02f40f07d3037445c63b31c7bd8adaf77152ae01aa6aae3966f65393c5c8e352bbc2b86d01e5e2dd979c1c2e1
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
@@ -30,6 +29,8 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip 104092 BLAKE2B 34bd76adab656f40017de5168f2fa1e0f3eb524c3ad9996b7354de8212c54acdc7b0ac7b99c69b71824d9ac9cc263aefe8220daee7b86d96d8b7f323fa6cc9c9 SHA512 4ffb6845abd0ea7cb6ca96a3c306b76b59a049f63dc61e38d5cca6e16e7e82c38ca04b5213230aed92d85b89da76864039fb1706ed15af83e8301c4245498322
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip 56040 BLAKE2B 371b6a37ef8bc88baf94d2a0b95d59454b399c862107cb8b1b30af5cdccc9fff1ee5e400e19d362d0c89203f2c8044316bf853322e05312b5c7a2ce961cd90bf SHA512 2c709a194dcab81cae05040cdef59a21e9f02014cea998dd5957180ff3a28f79607d15c61ce03b54be4a8163c4d5e60f86a5d07012df0f206af735a8d317a6a7
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip 19702 BLAKE2B ee009befd8861b2556869434d14c1d4ce130d432ba5f43821b0cc2f6fa493bc8a4f93a011f05f5789f7c388b2a74f272623d6dc2689a5c29dde0b3c307598173 SHA512 d7c39c78c074d060973433f5f4c1405260fa9f49ba9ff020630bb17404412337b536275aac71ae30c0e3783b95585c46cc492f722572b941fa1476898a6f7e8c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip 19233 BLAKE2B 72d5eb2b25cc20e8f22d29948913981975ad9b19669e4bc898b380e946e73b2ae7791c9bb14ac69a6949a28fa4b64f0cf8e2d8c08c5b647119b33856f8b00d51 SHA512 e2c2738bf03022c96e739fbfb9a43c19988d49a54e45eade73ab9b8deaa9f94bbcbbeed910051eb370699de1519da9d5d2ce7c42e22b9d15784b599daf393d4a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
@@ -71,6 +72,8 @@ DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip 20693 BLAKE2B f0dcdb63fb70631203b429ead117c7f4db44738c2c6b58013c591449c57e90b7441bd5d298255b229f211882dd73a78967d14e6be7b59bcf96f60b3ffb557a65 SHA512 e46912eed65d3853f80e1b2c990a7c72f1c613d373ea1f4f0c5782b513362a0b4294847e536262039929c65c152f137f90a03d6bab276541b801427e4322bd10
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip 67349 BLAKE2B 65b87b962f3b826681183536713048c4719354c7e90c54b555d946edd8f37af86e40cb9230bfc1bd191b38c11fbc32e46e585758600b1f870e7ab948358194f5 SHA512 f6f902c1e097a4cedbeebc96785184270015009d8669dd6ed118a61a3d12e8a5c40a773a9ba9aafcaebd7442914aa8d8edc96b4988619509972fc74b211a13cc
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip 138925 BLAKE2B 34895513786f190d7379e74e7256b9fc18fb82bcc985866dc94ab2110fe04c120fda46b2f2629b87d9d0380e21420a625f8206782c67ca5c0e71c6cc8309b9ea SHA512 39bb926ff817750578322805bcf412db6c09ca5b7dcd237fed9f64df51222de62b62eee275e6d37c7dafde7dd8fada499c344c62c3ef0a3bd8d27053057f4079
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
@@ -149,6 +152,8 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd3
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip 13357 BLAKE2B 679a623ef429ee69279da815f3467805fd339a082b10272011db5e2edee034efa23f03a0015fac0fbc33ffe2818a7011a5298e44b1013d0015a31f874201588b SHA512 d4f3b3537e862809c33ab7b0d372806ddac9ace9da1831cbea77649f43773d59b1e2d221b152f73eb148e7a6350c476ccb8ccca41108c0a4e4436e878c234d36
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.zip 14185 BLAKE2B cadb2f5385b4d6463242d7d86f7bfca610be66a6f98efaa612850f85716ac463eaf708dd72f99d279f86d069b5c809858933fc70644c2efdc81499a2c428d5c7 SHA512 3902b701054a7e360ed023e31d82e02cc18ce4f27ee9e319729c6c841420f50f62614df714e77ac60a84ad42d3196a78b9a290d0e2442d9dc20d2aa169616c7e
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
@@ -165,6 +170,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip 1758421 BLAKE2B 0c0c663e20a8d703a5e0a971638b81158c90b5d44961e683b3108c6f6d81fc21cb2577aef125db2ea0dc2dc53a00bc162c970c6e339379875d8a1d18957a549c SHA512 cf2f1e8428e764782e64d65629ec18fe8aa67926fef1097284cf15550c4c8de050e6d362ca944548e0009bf1cf449678f1749f7c30370b11029dfad308f4b5ce
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@@ -177,8 +184,11 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip 1273340 BLAKE2B 7d42472afb905448b6ae6f66258dc805fa7c4b9c8dffb230ad6458b250fe5d564a3f6e2bf97b241ac9293c9f5885f28cc996ab7953a0ba9e97b8731911b982d5 SHA512 57852d3cd066a9eb279f909b464824041e138db1eb98c66ffbbc81259cb3f94da8ecd4d2b961646fbbe0c05156785ab2f44408b19d9f467001627d7b12fed4af
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip 1422376 BLAKE2B 5995b3bf9ad143a950acb3ea20e416518d8f90fa1486416b23895f7e8f8decda87cea64757616d8df1390c714ea5a50f4b2a1d1e4338157867da72f72b4c3f65 SHA512 fe2575eb7f3ca98d19db88886f0812f46e93151037b1286a89e9da22ea8adf1d27ad9243848885e3d309830a3fbbbd40f343a9333ef4cc57e66311d61d8ab638
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip 1503642 BLAKE2B 459cd4c9e103f489e029f1d7a4073b9af288c7feb34a7290a4b2c430d7cef6d8d8f85904d13e2549dc64ce47b9b3741c3082c46827988f085d3b32fa44eb81a3 SHA512 3f81ba470596bf5801cb9c80cb3ad84b61ae8d9b7a43d43b6c81bad14a2f7c9f08609a3205811ef7b4bf67d06f3474a7cacf6b42c06b5c9c88082f68082db67d
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -191,9 +201,13 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip 1438775 BLAKE2B e8b4b6a5ed32eb337abc8df4ba122356c664b4b23fd7f4bf7e08772a031795a293e26aefee819865ef381593807f0af82d9333822f31979d217414edc8b8288a SHA512 3a3f9adfced28713c60cb0047a0fd8a9b4de774fbd96afa7494d7fcb062f172e33024be15abfdeb7565987ee44e71390366fe43b78e8709d21cdc11be491a927
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.zip 1546031 BLAKE2B b8b07e0d05b0bd1b77ef90145d6684a30225e5c38ebc21039e94524792937ef49d60ef2705fe226f62a03712553c685c5eff6c4ddaa6a1fad0327151769125b2 SHA512 f4a3d3f6af5020f70eb69f539c4ee8452028aad40bda05bcd5de74e725db1ffc487a3ff2bf31e4c26ef530b74fa090332f608bec5a2ee233ddfd82c1209e77b4
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
@@ -206,6 +220,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.zip 2661495 BLAKE2B 19aa174d089edd2bf17eda19b54178cbf9c9856a5bcd1860c5a8bc92954e9678a471d45de835e9d1dbcce7f3ea07e7678076c2e8a5592f84b3a56d4198d802d7 SHA512 6890637b40a71ebbc1c218b9d3fb142a473896c1eb939388644dc377c783c487caae3df6fe69d8912708da5345c56477a1fc74038056011f57b12981ffeb5303
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
@@ -234,7 +249,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 EBUILD etcd-3.3.23.ebuild 2381 BLAKE2B ce52af82475f51fc98340a411851ca452172b394d8882488d9d1ff244b2ec8a6af333e63666a31dac2332e7c529e28d19bc8461c1c050232cde5eb6ed73e09e1 SHA512 ff533214ef12ebbd5b3aa8b8e7cc40298dff1fc0bffa9074e5063c5450d37247ec0915499171e8d6649f089e60a65f9bcb23f24e9eafbd0fc80d58d187de6044
 EBUILD etcd-3.3.24.ebuild 2096 BLAKE2B 3a3cd4275452e640e5444b041cd0b129327fcfdd649234ecb5e56c5ae491dab020a19b5cf6e9457d7a37e40b49aef0922539f2e858e36e86575055ab8caadd38 SHA512 6dffe2d033ebf443fd8039419764f27b9150b6f7256e8161367786aebe814fec1742d8215755e078b8158622c73345d5d0edb7213c145f0001ce2954b256d64e
-EBUILD etcd-3.4.10.ebuild 2096 BLAKE2B f7a807e38e50bc32746f4e161090b4a2c6fd4bd16eb80af7f4f52d4b481895eb706a18a4c91c15014ac7321e842b140f36fe14b84ec59f746cc07fba2bfaa767 SHA512 e221c476c263c0d7c0e1faf5912996f5927c5c2a39c18639ff27e57748233427a58c18b0c41e7f2b3ccca8c250e5e8db338e67e180ca04085401d02cf61bb8af
-EBUILD etcd-3.4.11.ebuild 2096 BLAKE2B 64db87167be9207ef373a3ecf812e9d378e6ebb30185d87b05eb3a69233b169d30185540437ea5610c58f8a380e539a52541a99caa3f1910c26345d746bad3cd SHA512 48eaade159c4a96fd91f0830b6a2e586ef2ef6b174de9910ba6750b06602fa3c35087ebd2ed8611f83d0b4e5c69946becb990a1f3bb3170590e23d413f8d08dc
-EBUILD etcd-3.4.14.ebuild 13661 BLAKE2B 267155a457e30b5bb389fb0ac5cf8cf75bd344408c7fcb4f8818be764fcf1d3df1db89f34780d13a732ce056d86e8697c93e24343a49606d52c489dd4f7f148a SHA512 30c7e62fa4fd19d0d72b9b6e02277a614f0c246bba9fa8fa163e70140e95b32c013b1c6447ac107561a7ee80afc36da9dd5bb59d2582cc5692b495bf7eb26aed
+EBUILD etcd-3.4.14.ebuild 13659 BLAKE2B 123fdc24d1b1d49ecc078e12e0f4ea459b30d13e15e3bee417739e8b7337d950f6f1df12da67e558063de3dcae45aae73e514bf4192d446b326d86660123e081 SHA512 90a16542dfc2a1505836d71bad521166976734b5480087a052a68cce5fcb31d45b251a3a93ac96267e65dad976996f03f4121444e7e41533c5a8f4994aa132b6
+EBUILD etcd-3.4.16.ebuild 12927 BLAKE2B 8c1a25791a2f40b8b59724b3a6306d417d02cafd80d5754cf56223802cb147269172f9a31f8f283e6e257841a5825bdb70b7fc874a2b546d3f20374a1bd158bc SHA512 39bff7a5270d27a41718ca86d992fab6d720f5825a64fbe783a4e37c364593d40cfa60a05af18c9a6dfacc8a06e862d76d5040181ef2db872c5ac483446fecb9
 MISC metadata.xml 574 BLAKE2B 17444a268dbcc374ea8ee5457f3e81faa7ca9f7d99cacd3b0fba69ae0122dd8eabc09e6916318b90ee3dddb513010921dc546d33eb1d11ba4a73c6d973344c20 SHA512 8a506ba2858659e00abfb6107028e521db02605b2a985c4aaa3dd580d89a8929a084b93b02f784ee7e5c5935c361112b94b4e9076e92d9bb7b901c761ccaa375
diff --git a/dev-db/etcd/etcd-3.4.10.ebuild b/dev-db/etcd/etcd-3.4.10.ebuild
deleted file mode 100644
index 052158ea52e9..000000000000
--- a/dev-db/etcd/etcd-3.4.10.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-GIT_COMMIT=18dfb9cca
-MY_PV="${PV/_rc/-rc.}"
-
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc +server"
-
-COMMON_DEPEND="server? (
-	acct-group/etcd
-	acct-user/etcd
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/etcdctl"
-
-# Tests fail with this error:
-# fatal error: checkptr: unsafe pointer conversion
-RESTRICT="test"
-
-src_prepare() {
-	export GO_BUILD_FLAGS="-mod=vendor -v -x"
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-e 's:^			govet_shadow \\$:\\:' \
-		-i "${S}"/test || die
-
-	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
-		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
-		-i ./test || die
-
-	mkdir -p vendor/github.com/coreos || die
-	ln -s ../../.. vendor/github.com/coreos/etcd || die
-
-	echo 'module go.etcd.io/etcd' > go.mod || die
-}
-
-src_compile() {
-	 ./build || die
-}
-
-src_test() {
-	./test || die
-}
-
-src_install() {
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use server; then
-		tmpfiles_process ${PN}.conf
-	fi
-}
diff --git a/dev-db/etcd/etcd-3.4.11.ebuild b/dev-db/etcd/etcd-3.4.11.ebuild
deleted file mode 100644
index 572b8ec43e15..000000000000
--- a/dev-db/etcd/etcd-3.4.11.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-GIT_COMMIT=e71e0c5c8
-MY_PV="${PV/_rc/-rc.}"
-
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc +server"
-
-COMMON_DEPEND="server? (
-	acct-group/etcd
-	acct-user/etcd
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/etcdctl"
-
-# Tests fail with this error:
-# fatal error: checkptr: unsafe pointer conversion
-RESTRICT="test"
-
-src_prepare() {
-	export GO_BUILD_FLAGS="-mod=vendor -v -x"
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-e 's:^			govet_shadow \\$:\\:' \
-		-i "${S}"/test || die
-
-	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
-		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
-		-i ./test || die
-
-	mkdir -p vendor/github.com/coreos || die
-	ln -s ../../.. vendor/github.com/coreos/etcd || die
-
-	echo 'module go.etcd.io/etcd' > go.mod || die
-}
-
-src_compile() {
-	 ./build || die
-}
-
-src_test() {
-	./test || die
-}
-
-src_install() {
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use server; then
-		tmpfiles_process ${PN}.conf
-	fi
-}
diff --git a/dev-db/etcd/etcd-3.4.14.ebuild b/dev-db/etcd/etcd-3.4.14.ebuild
index b21d65258252..0f1ab44ae004 100644
--- a/dev-db/etcd/etcd-3.4.14.ebuild
+++ b/dev-db/etcd/etcd-3.4.14.ebuild
@@ -263,7 +263,7 @@ src_prepare() {
 	default
 	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
 		-i "${S}"/build || die
-	 sed -e 's:\(for p in \)shellcheck :\1 :' \
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
 		-e 's:^			gofmt \\$:\\:' \
 		-e 's:^			govet \\$:\\:' \
 		-e 's:^			govet_shadow \\$:\\:' \
@@ -278,7 +278,7 @@ src_prepare() {
 }
 
 src_compile() {
-	 ./build || die
+	./build || die
 }
 
 src_test() {
diff --git a/dev-db/etcd/etcd-3.4.16.ebuild b/dev-db/etcd/etcd-3.4.16.ebuild
new file mode 100644
index 000000000000..9901ce26b6f9
--- /dev/null
+++ b/dev-db/etcd/etcd-3.4.16.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd tmpfiles
+GIT_COMMIT=cf54fab42
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/coreos/go-semver v0.2.0"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/creack/pty v1.1.11"
+"github.com/creack/pty v1.1.11/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/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"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/uuid v1.0.0"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/gorilla/websocket v1.4.2"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"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"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/mattn/go-colorable v0.0.9"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.4"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-runewidth v0.0.2"
+"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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/pkg/errors v0.8.0"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v1.0.0"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/common v0.4.1"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.2"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spf13/cobra v0.0.3"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/pflag v1.0.1"
+"github.com/spf13/pflag v1.0.1/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"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod"
+"github.com/urfave/cli v1.20.0"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"go.etcd.io/bbolt v1.3.3"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.uber.org/atomic v1.3.2"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/multierr v1.1.0"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.26.0"
+"google.golang.org/grpc 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"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+	acct-group/etcd
+	acct-user/etcd
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/etcdctl"
+
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT+=" test "
+
+src_prepare() {
+	export GO_BUILD_FLAGS="-v -x"
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-e 's:^			govet_shadow \\$:\\:' \
+		-i "${S}"/test || die
+
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+
+#	mkdir -p vendor/github.com/coreos || die
+#	ln -s ../../.. vendor/github.com/coreos/etcd || die
+}
+
+src_compile() {
+	./build || die
+}
+
+src_test() {
+	./test || die
+}
+
+src_install() {
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
+}
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index a7db6d8e90e6..f64f9bf0829f 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -5,7 +5,7 @@ DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B b770d79d1724480589b
 DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f SHA512 b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d
 EBUILD mariadb-connector-odbc-3.1.11-r2.ebuild 1996 BLAKE2B 5e75c6e35be1f662ed0ca39dfa16ae1bc52b8969aac2497e78e7548bbeb773c451bef0838f82ed2d351faae830ccfb4e0f4c52a5fb27f97eda937735976eff7a SHA512 5e7123178569fa3097845ec93b97d0fd53ae8846b1fb0d987979c0c42cda09abf925eb4308f60f3809a32ce7404dbd4f1bae537923f1942eb69f67abd5530e34
-EBUILD mariadb-connector-odbc-3.1.12.ebuild 1992 BLAKE2B dda492ef03ed45e2ce32b5af2e41411c2b5286f78f542191340f109b3cbb2fee01fdf5b32a01df02bb65525fe46116294e8a854e518f7a2a18372f98030d730d SHA512 e54bd65b29fe2cd8b89b41e34d5996f6000bfe2a29d5c8751d623562aee64ecc2e78595f8e36442bf0390949ffb096fd508c815aa1a39f44a5f234304543a588
+EBUILD mariadb-connector-odbc-3.1.12.ebuild 1990 BLAKE2B d0c1ee92e710b00ee5eb26dbddd171e01e7b5215b54d3e26f932be8795fef3002999eaa1dc687c910b0a1b09514a686acf60eeb139200dcf4bcda7850277927e SHA512 d880942edf6d0cf1729be62f9aeb127b8d4f141d507e1f6249f41d26870a28e3272d7b072ddf89602b46a3d635df1e4a9cf52217d58befd251aab77b99a0eaa5
 EBUILD mariadb-connector-odbc-3.1.13.ebuild 1994 BLAKE2B 23a1536f236c35ace2b7e43fb8df28166732cd0c39f53ea11ce64a39b6b27e23b1d7e8053df0d123119909b0d7c5e9b9aaa323c5cfec3fefcf47d7baef58d4ec SHA512 88d2cf122b8ef9cb16f2a3416467f369e2d89e895ec7174f898aea523e2ad9279280e88102c8f7ee763aa91f98db6d0cf0b147467726e48306c3023faaf873b8
 EBUILD mariadb-connector-odbc-3.1.6.ebuild 1700 BLAKE2B ff213bb689fb6d20754b313eb296da1bbd93d87cb3af978eb87b021321d459f2bfe0354340a370ea88054e509af34ca311924ebad0fac3843491b9bf84fd6ab5 SHA512 0ad3a6f1e594fcdb6248f6eb39cb54a85f4a0c59f05b82b1c2ad4037939a227ef73983a34a01e0c9c40d9b5a2bd038dfcc85d3d91ea6f6121dee5e397ea523b6
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
index 9e99b65066b0..4f55b84be25f 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-sr
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index df4af2d5401e..1843e8b37848 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -5,5 +5,5 @@ DIST mydumper-0.10.5.tar.gz 66399 BLAKE2B 77bba97580bcdb267d77be455f56831209a29b
 DIST mydumper-0.10.7-2.tar.gz 71660 BLAKE2B 44410294505beb9752bbd78b9235e2e75606b3423cf4966110732896c1f1934e94dc95554b7f17240e76fafbd0074415159ab89dca4e3f506c9da7bed2eba28d SHA512 6af4cc80a6faee410ed91367147e7cd32eec8a90d798d5cc10bc24090c945192f9d2e151bf8c24d8d593996d72eb93329557580419591bba980eba5efdeefcff
 EBUILD mydumper-0.10.3.ebuild 1022 BLAKE2B 27782ee1ecf8053c36c6495ea66bf7761d0a29f452529a02fd041abbee08accaf6ca68ebb3ea8f848ab0b1256bb907d00386fec61b5150548e1492d766589ebf SHA512 530a786b9c5263aa8396849885612d4f0a432ccbe2c7f1fe59d78bfd8902586e5664e6d8dcdc8d8ff03dfcf1c38c23d39f84036015687b461b12e061af4a81d1
 EBUILD mydumper-0.10.5.ebuild 1022 BLAKE2B d398aaa8aed706e8d3f3599ba2912c263b4be2610e81970b0293ac61c6379ddbc9a961e37bdb6b2dd540d38cb4ecd7d51da52bcdeee093683cb2a7c3ca90744e SHA512 dadfaa10053cefc4e4e6a5bb6ee397aab7ee6668b1f812ee5e813c09a6c2bc687d8618b3700447ad7efcee3e42c463e1b4be382469b50f2a1c3c723b273b9b99
-EBUILD mydumper-0.10.7.2.ebuild 1105 BLAKE2B 824faaa946ea0ec4c750d62375ade6a540b726fc13fc749c3aa3a697fdf8c053764e657852c9763183339e7227eeecad9a9230ebc7f29182ebf3ddee1c1b1960 SHA512 88a73ee66cd12263e67be3545b944de68ccf5d81fb3f6b7898c4026b472b5f9910ce601dd556ee647924a25d9835f0c338b4b36a2a7197b035a4fd34e128f6b3
+EBUILD mydumper-0.10.7.2.ebuild 1104 BLAKE2B 2cf84ba759487109d58b7a0cc36cc757d1ca74475e639254195083e33b6dfa8f0ec3244ec0c3894a3ebdb12b13c4fbaf8b4009836d8996c94e7e1e6619406c8e SHA512 275251e976ad151a46b1bfb67c4da19a685269fe3ea8a1e00414c016eb8d886011798fe17ae3bddd7c048098ba2a75ae45998a1b34f52eae2c7412b20fb51266
 MISC metadata.xml 479 BLAKE2B a45a9746e2f5be11c4cd992e81135c8b39fa494c105f1f3c01586482b635596f1384690d0d1bfa3f08b8e33d1bd64b625fba07f410b8a8220a9a19f7f048f2dd SHA512 b0f20f8fb1b5eb3771d9a59869a3a28b0011642721dd12b5545b4f80456556f2f7a9da3b4b69c85cfae666534bad6143ae437b43b45179544626455a03b9218a
diff --git a/dev-db/mydumper/mydumper-0.10.7.2.ebuild b/dev-db/mydumper/mydumper-0.10.7.2.ebuild
index 6dcf0e83ab77..34570e699ea1 100644
--- a/dev-db/mydumper/mydumper-0.10.7.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.10.7.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="app-arch/zstd:=
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 4f7c4b8c9bba..2a04c54b15d0 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,83 +1,98 @@
 AUX 18.3.0.0-makefile.patch 986 BLAKE2B 3cad2bb7e508f7ca4f25d67ba12b5f9221f739ba450ae45cb4988a700cd0c87b7a1e0fd90ff66c379b85b159f05e715f0450681a6b070f45d807ae6072208537 SHA512 7f9523738f51ade5fefa5e3d2b014fcfaee01fbf9653e12f2ca6eca20a8e7e04df07065209f6dbf7795ff452ce7926e1289f9bd715220a64e85c1a80aebc00eb
 AUX 18.3.0.0-proc-makefile.patch 564 BLAKE2B fe06fa4e6df8bd2f563ffec9b0e2d1f22179a879b5e068b0480409eb6a531bf50b092a0abefd77804e5f0bb571c6a9a59b14afee6b157551b4bae833cb10f159 SHA512 8bbcd7a110f41842f1e40b037720f283a7ae763a77f4cceda19061ab114eb4d428bf0dfa2c45782bc6ea8c9daf3a185faa42e8cdc9c765f93107f23a32344f69
+AUX 21.3.0.0.0-makefile.patch 592 BLAKE2B d2ffdef9d2afe3e72a84f365a1e9ccbe2c885b053284d99b7d3ef77bdd69ddf1ab7737fd3a19b39ff5002aef510f6f29454968a023c4cfcaf1c96d7cea6dea0e SHA512 44ae83fb3b85c7759e3c948f4a007a781cabb851126bcb7abd941d605303f830820a9f1190fa02defd8d5cee76f1def72d4c94bc8c8e1e4b16cceaafaed238ca
 AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
 DIST instantclient-basic-linux-18.3.0.0.0dbru.zip 67930600 BLAKE2B 70d9c54a8df66859d40e4374cd3073613fbf3656850373ada6c9707a7076e0d0749e3b1a84e2d46d18643f80020ecf8c525224433c946946787388dc3f57c79c SHA512 3e1bda593c14d14942c7bf8393111792df01bc9d5a15ae0b4010bd29d71bda4ab044dca6741d00185976c70790fc24b5221afc436d33abe6277e7513cb8bd859
 DIST instantclient-basic-linux-19.11.0.0.0dbru.zip 70336706 BLAKE2B 061f6abc83bab7f2e6712e33274783f96caee3d97629d39cacd925af658f737a072207449468e05f89672bcfc7ff98f81d7d9c92a8f844664ce97b4c6afabf27 SHA512 da4db9c64c0f92c2b78cc6b26ff710e3330e937395d62942625921401042af27fdf80d25eb3748c97f4281442ddb72f3ddc5f68171a89ae289f3d2f492c56ef7
 DIST instantclient-basic-linux-19.3.0.0.0dbru.zip 69597591 BLAKE2B 4ac954c027a83c1a05b502203f1465bb29bb4e58486a98bec7848d9ae0bed6835fdc6bb5f889cc9dadc815d47e5e06258c11a6ab1fd045bd7a878858f3d1164b SHA512 d9a7c664cae598344ec7b9e9c43def9626dcc0d54d478843a5145dfb3dad5df51121c5b2e9f4bb48a240611981f7721441344649d1f267b667356271ac778beb
 DIST instantclient-basic-linux-19.5.0.0.0dbru.zip 69646008 BLAKE2B ad598da8040473e54b5134373c9a091c8fba3e13c7a1b4fe0d6b07cad36003236494432c246e79e9b09ab1cd7e38f0c5582b7db14d1d9860c8026aab26fcd5ea SHA512 1b6e7983469cc8873b17f1753ab147d6c23d7c664f2971a603910130526aeb60b0de9180fbccc01f7c952888c80afdfd7a090058e934b269c4a0a1aa9096388c
 DIST instantclient-basic-linux-19.6.0.0.0dbru.zip 69922395 BLAKE2B b8eb7f1f56ab8eff9a08098e65fe38f52f72951602917e2eaa30cdef4f6968f831deeeda16c89cdde5d2a0d443f5dc4aca773abaf614e66fa581da1a4757d717 SHA512 4782cf41ff9da3d52ffe021e7c20bf2d1fce6075edb74e765899268b60005468e8353bf3147cbbc07ae03a7a0f06828e9ef37b00a8492aacc349c3b57ce32f3f
+DIST instantclient-basic-linux-21.3.0.0.0.zip 74751697 BLAKE2B f9b29d1c98a55946670ce6a5c674f2c9e6a8d6152b0f4d335f41ad9479b0a2bcf9ba791aeba894161c64c5e088b458506c068d4ece386956158cb09f27f91b07 SHA512 b8599ebe0cf867336b1dfb4edb974b934ed29e96aa7b7a866b93c8d8271c8dfacc693b884a9e422272098e09b4c5a2d6badb11fffb57b43ca4eb15907878bb99
 DIST instantclient-basic-linux.x64-18.3.0.0.0dbru.zip 72794506 BLAKE2B 22db5d69d48c33061db72bdc050e081ec24152c5e4655505c7f75407646f5ffa140aa51f4638ad8e7c5628476bb44358cb061b2d228ab1e36cd9464e49fcf1f6 SHA512 92e607e1711b24ddf10f11ecd3b389795acc544a567a95cb62b624e5913ad11a1707699b5df659f5fb33dae5cd56700036644e643c7edbe51e7a67e57a152ecc
 DIST instantclient-basic-linux.x64-18.5.0.0.0dbru.zip 72902980 BLAKE2B 23fd9885309507183758cf817b0d68342633ad08eb627f4136b967cf38e1910cefa905f17ffea7c929fafe2232eca71ee66a15153f202eb0d03236a1b21cdc30 SHA512 10e6f91dfe07ee4788a5f70ce65affe141061e7b1d6ea0eab6583bd2aed47d7281824e91da2103c53f15e49f02b94add8c3d524494cd4eacded90b2d1cc8743b
 DIST instantclient-basic-linux.x64-19.11.0.0.0dbru.zip 75943090 BLAKE2B 6e081d22af1161d1505847c6918cc618f92810d7803f2bb13b3c58f2e8c5bb3aa70d2006fbd1fcc193d3719ecf224c3541f3dc5c5ccfc6105a10c54c51ddd2c9 SHA512 0f7242a1becb062b6c55202587360895529e7ec277b0e41e27466dc01caf4b97cf0a256d0ccb9b71fb86b4802d9c427e0428f0419260b609d94472f89f7f33e6
 DIST instantclient-basic-linux.x64-19.3.0.0.0dbru.zip 75106438 BLAKE2B d3738c6a92251c75bf39afa996eecfeb9052c6cb6a8cd2080755c8108559257c4aaf660b6a12a1127228122836c85d15d84bb322d49921184ec67ee32ffbfddc SHA512 13ddda55c88fe72e761d9b9ce5bc5ccda4df0bd5ca6237efed34e6dfebf10866b116f3aa7eaf023a73458406584a4e57ecde825bf996fc0e844c030e4d8a3bba
 DIST instantclient-basic-linux.x64-19.5.0.0.0dbru.zip 75169949 BLAKE2B a2f63542408a26b52389734282268cc471b4e995242ce53a52bcbfdb7eb7174bca06f26c1d2291dfd797dab860c18c56f38e4a930486436de36f171ab30093a3 SHA512 7860d27392c4601969a480199f263fbda0f0952a2dcab36efcbdf501568b624c6219d4966a8ff4936b6657b865fd9130f5fdab6bdceec2a45f54fe448f94db4e
 DIST instantclient-basic-linux.x64-19.6.0.0.0dbru.zip 75462547 BLAKE2B c75747d3e03e1dbd8031dad41486261a74ae16b414f0e888b1596dfac752e7ed3bf04379b1b48a6107648fbd8de0207ebbfe306bbced2b5b9f5f6502c11ac4f0 SHA512 41dd2b7645f231a9c8a3e69e75bd679e8c9ad4e772777849b4a44f80c18a70ece92d400c3369de917c897bd2e4b9c59fa73fe36b5559831e508ab65965f9e278
+DIST instantclient-basic-linux.x64-21.3.0.0.0.zip 79375865 BLAKE2B 2215829c6f7df463d0cd1108755976eb5cc6d4fdf41201687236131151d2068a9e3c8762bfdac65ce2890c57cdb2fea6684e6012d836f232a8ff3cb93223deec SHA512 812dd6bb3a3c24b87e40a3df0c2a0dcfe1b5e27524b8e1622c533d8561cd4d674e9d90b8e66f571ee21bf3d1e152092ee986b6ff226d51674f1253f1ffb97ae4
 DIST instantclient-jdbc-linux-18.3.0.0.0dbru.zip 1574763 BLAKE2B 2ddbb6a6d61c3b6bc3e37b40f786dd86f5efadcf8cbe5b58dec2631b92ebae25065cb29f87ceed9a1f426ada094a9c0ef1887f8ea7b70e66527e9b75e11f213e SHA512 96298e579b6b5a81ae2ef679d6bf9a18f8bd08c33981d0a5b836c20710dc07d15d7964895a3d66c01075a20720d333f766ac439dc4f3867edac473e020eaf065
 DIST instantclient-jdbc-linux-19.11.0.0.0dbru.zip 1577534 BLAKE2B 954049186c80028567f5ec0bb30aa28f6d9092d8c8be7cfef67f94e397dc26b935cfbbf75bee3b32e56c3697fb5a7e3181f9948ef91177af68c648e102a7db77 SHA512 5717137a6ebf28669347dd6f03f61b7242a332b927b55502b9019d108714c77e3dd31894f6d5260df6553604b0255b657aed46b63262db9f2e7153c067387e0e
 DIST instantclient-jdbc-linux-19.3.0.0.0dbru.zip 1577507 BLAKE2B 2347eb36b1dbe7552753be35b2656edbb43140768379abb8e5c94be7fb3f66fa139becb332d328d8e7f0b7f0b4e32d86703d1760dba36f53471a5b6b3c9b2341 SHA512 66c60f97994a1f45b0ef9e1600da6de319476a6ec4f6a0c9a04516d86e9d89fde1cdfd3bbd8279df125f96326f52875a1daef2ecbb6525fa26482eb637133205
 DIST instantclient-jdbc-linux-19.5.0.0.0dbru.zip 1577511 BLAKE2B 59ecabee9e38d98aa9627a01fc5f3fab9c6c3afc44d8f44c7f231b8e2582852be06761fc03ccad0c7041d1910bd4d914aa6a7e494697844efbc1e62cf95bdd00 SHA512 d1198ece5e6bfc9ca8becfad4990246bc31c53d24f7fec886da979eaece60d53211ab3a6e792f9c8adbe866e3c4b990bfcce1e9ccd4271bf2e036b701a32d7c6
 DIST instantclient-jdbc-linux-19.6.0.0.0dbru.zip 1577514 BLAKE2B 8c8e9e762fdd1a3369aa668d4afeaf23c05100f4e74732b02d47b1056163aaf7d7f96fe51685f02ffe94aa730b4bc3c24f930af9739dfb8ca192b3e64003e73f SHA512 f57d7d3597f3c89396f2b185746ecd72e291c2db6e733adbd51bac32879390395bd3dfa3ac648a8f78aa472b767a8685d090ac49f85c2f68686b6a85fb138b27
+DIST instantclient-jdbc-linux-21.3.0.0.0.zip 1578398 BLAKE2B 42fbcd9946ff87f438297751febcaef4d361d36ac9d6538bc52f988f98c51531efb3a2721ba5c3859bf7f8e9092667704c206cc373d6ad099c1e6048077b3662 SHA512 3bb62dbe0738f6800945858acf56780d8049af0d6c6466e926c7173deaecf3dcd277f9a7e57f3b89aef08e73a585b57eded7175809ddf8a53402523ba392c1d5
 DIST instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip 1575572 BLAKE2B bb9d5ad0064b547a7152d4f9b170c646105b4a0731596fe381f7a2c63b720e36cc5a93eea59ea71aa3405999d972cf962a74063350c468a8d114ad28f5a0be0c SHA512 70ebece929cb11f34fdcb6aea75af3679f22d0b838c3d256d4c7c0249977423625b1244a54ca504b51d24e2f178b1784571e185574cd3db34c2cda8128298b60
 DIST instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip 1578269 BLAKE2B 88047325934da02e81e907c9c4caee540cb06da7d7c08562e90781c2f6004940ba20131d971018fe237cc09cfef010fdf6f912b2309006396315ad67c17b10b6 SHA512 e46a4326f61863a63be333bd588571bc037edd2de1f2462b799e17c65ca8556aeaf42e2eed3a7226bf8c89479b4a723fc6cf6582a65b5ee8a827ffdad1c06bc8
 DIST instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip 1578059 BLAKE2B f5db4ab8b4424d21bb685b43012f71a228fdf1444e055b44dcf029b3beeefcca96aaddc496ac5912d4b337ec5d2bbd959df6083c18f7921811e996a2d73e5af6 SHA512 b2f906ae887f0421ff2edb80a70d0ede1fa624792e45ebfd205ade3f24dcd3cbc596c3ee64c39d7143810a2a11fafc649ad46cb5549d519dd3a1ffb7476fb537
 DIST instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip 1578033 BLAKE2B 18c9fcca1282c316c67bf86258154d94a26d81779c1d36e782dd55d91fbaf40f03f1e403db9beefe114a27f09fd3d2bcfc643cf3e9a02ae68a5bc3d2eee51c16 SHA512 58813681a74286a7f080f729e3a237584a091487401af08619e2b4349323bf3def8cce22eb550d8ee5675e9a4c7ddddab8fa493bdd8c89981aff3ef0f65d1eb3
 DIST instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip 1578023 BLAKE2B 2919f4d5a304d16b284151c620134dfcb934251a35837aba2286bb9e1b1e79179642c4331a19994d0fde55ec2859dfd5a7a56167f2b07cd0939f5c85e9448721 SHA512 c62793038b154a10dbff738e31d9e0af4e7dd0435aa51b1839e49be528d8a7b567447b735d400c3327a28cace5b9e22b92d4d9eec0eec0ce77e9f6d7831007d0
 DIST instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip 1578022 BLAKE2B d7fc065f6cdd7d1856651f295762565f8c826e5e74c350287f8fb325b622dcbcab04f1bdb9b68e67a458b1ae1c26275f2926c9f98b61da00040a6c31c854329b SHA512 68824d2e4f4881da7653ddf6e09e7d32aeb53dc5e59b90647c33706f09081debc27b517714ee5af2af3ce25ee53ca664a17c5ca7e4695038a3bea1db82236071
+DIST instantclient-jdbc-linux.x64-21.3.0.0.0.zip 1578995 BLAKE2B 9913c62abe55d5c5ebe7e9feeb9051b7833d33e3a7bc8b96667336d2ecb8bd8766d268f2eef2f2de247b0edf1d3abb65c56316a3d11b14ebcf782a3c75ed332e SHA512 8d2b7344c99ec0744e147c899e252f34fd29b7dff49b2bbe5497836130fd8e9d01f874b33ddaf7a8cca442d62eb7da56ed547120ffd409bb4731a9b56166bb42
 DIST instantclient-odbc-linux-18.3.0.0.0dbru.zip 605026 BLAKE2B 2f7808ef2706c65d1c876e44e7b831ea0629a218347f34dd4b81cce192b45b78b26c9e164b179232b1fceeeeb5f84d807ac6bef1f36fd7d077e620bbb6c093eb SHA512 370d3f34c57e33909642f18104de8b48c2ab0fd1cf679087f8601720ebc1097f64caceb118010b9e8d2f7207cef04210b22a36824de747683c3a1162ccb4f09e
 DIST instantclient-odbc-linux-19.11.0.0.0dbru.zip 600428 BLAKE2B b4bcb4131bab1fac2650bee8cf1db4f389e89bbf0e310f9df2a9f1ce29ebf35f8056e350175ceb406e82bd077825cb4e6ad405c5ec00929f2db2630e99630006 SHA512 9a21c2dc06b6e1c4ae7305ce248cbfe45e4ad830a48f3e088be11065471beda002fd5a6bcca71f5095ad70186d742bddffc82bdb79a4368e89c59bfd3f04af4b
 DIST instantclient-odbc-linux-19.3.0.0.0dbru.zip 600586 BLAKE2B ec76518290f306f41305b12da317ad6de8a73f5049ca6e06fb0e4197ecc9dc8f9855c469fa36e309615a749150580d3ff89a35bfe5878c6441fe4f6218ce3410 SHA512 77aa6c1c5f5a93b86e4e529656ab1b2eaa1e008e343d17193a074e758fc270a5b12d641a959c51b00d5cbc7a2b562c590e662701e66e295d218995ff266f005b
 DIST instantclient-odbc-linux-19.5.0.0.0dbru.zip 600590 BLAKE2B 6bfa2fa4e8e7ff5f2ea25c21ecacef97e9a1e403504d101a7c516b51eff814b5ee5dad36dcbb68be07324f560f3126ebd932e54b4834766cd8cc6f5705939da2 SHA512 bcb832d1d2011139cbc6afa68c34a5d747478db0b719c12211068396367c240d93f594f7533009b4a876484bf1894deec44a16cd5ca65ced353573d1068bb567
 DIST instantclient-odbc-linux-19.6.0.0.0dbru.zip 600498 BLAKE2B 0560d7038f0171428bca92ea78bcde6ae9169dde994d2cc4220f733ba9b7c198fbfa61db22f30f62a68ace44314c280976b0572ccf190d60bcc9c23a0ede3b60 SHA512 e6c1fd3f1545cf83da5ab9fc0781ee711434134d88836b045ec7ccf510a842a773b76365177aecd7ccc711a3aa6ec753dad94fa637c9df5bff22089babe7d824
+DIST instantclient-odbc-linux-21.3.0.0.0.zip 760101 BLAKE2B 68a96fa5e24f5d44f64eabfd142280d620423f15fff62b10094b4425b520a2a31ba54fe6bce2d723700d38ce5a579d31a1c49ef6928eb6f4e342c7c8d98a49aa SHA512 e2e4cf126652580bf2d8f8ace7694881382b745a7adfabbba0c3e6fddcbb9ca7e300b0d18b19c8da029ca8f33c5f8f95baa141da20659ba49c9a8e6f4848b2db
 DIST instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip 648825 BLAKE2B 1e96b87802c9ccc7d5f6ae2fdab501004e6fe8d4e155503bb983c82cdbfff729263e541689f4c2dbeeabfdd1037f0a97191e3a50842a8488a3267f24fec6b43d SHA512 23ad10a834fd92007147f8a7ad95dd9df4fbd5b786f7e2bb9afd6a12101fb934a40daa81ade914d8d0f59872591a1ae29438f23229b3767ed4ea3ff7cc730f66
 DIST instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip 651470 BLAKE2B c5e7d794137fafb97ecb5fb647a640e59490270787c16f972882c03b34c4f404717f6f87e8501252f415a85b8d92031bba9910eb034c92c4f7fac37f66a3fe43 SHA512 b9e066af00b263b348f1e7a26dbf5672f01be79115bd75a47e2cff95f32fb412a8d03736e1c5ac663847a2d75ea5606cdb1fc27434f7690120c462f8eb15a6cf
 DIST instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip 638686 BLAKE2B c9fa1b8988d85870bb4c2d9cb5c34c1572079c36a51da0ef726250f03ca0b53dbc19990582358011f099ca183d6148f8110cf80c1a17917549f6e38be503f706 SHA512 7d92ff08ea48de0e981cadad15a3c392749b3e20331b25f00f2f96ef7cc11a9802408f18dbfbf36366b0122d6c8fd256d43297c3bd87b4304b0479b1593e35fc
 DIST instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip 638697 BLAKE2B 2a9077243a4718c7af4abc2c36b7ca3e2993acb904dd9873c91bf8c0010ebaf18d6864a6b488eaa3a66d6fa42f83d099367533dad65d228db6e21e2b4e23a6df SHA512 dc148301d7e0ce7d74d90619f4f6aa03a26d61033d36803de7623ad64ddd5da1b34e24704ec1cf948ec341ba91e96c1bc08a5b62da79555d248f245ae75e776d
 DIST instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip 638692 BLAKE2B 6ab7357ee95d806ab60de2da2a82414aa2f5f0e7527cc4f44a4028a52a01abb334ac8c4076e5f26a6d0444943e46f6c1da7843d31ff7b1c1a9d31cf13a017c9b SHA512 ac145a24ed2a2287d28c45e16f87509786f044588443b470e4155351576bc5a7d94c845f6af38a58f1a5bd82a57a4b69a8719f46cc85b1f0c4173ab3ee927fbb
 DIST instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip 638654 BLAKE2B ae618640b281852e48bb5c3bb6776c7445e824d98fa96c1308f71bfbf7ac81b65119af31a92c1909e2243956ad0457c21060618265bbb78aa1be8c008ce2fc32 SHA512 f0f02c067ec1250402dde3959de527fa7b85709c225a974c6867be5d24471e8da744a1707f52183987ea91e55c69fdc92459ce7b9979ee1ad1f4604963a7dac9
+DIST instantclient-odbc-linux.x64-21.3.0.0.0.zip 798599 BLAKE2B d020c68895dbb59e53e2e7ebc599e9016dee123dc03d3ce5f9263e721fa7664ecc6fc8b49b0b498a87b0d24bf74e79854edd66c2b2e7a9367be8e1e9c2cbe159 SHA512 0bf756458f3a856bbe6942d1f4bc30a7261ce3da7524ab8b71f77d9f367767ad75e8ed83e4de18bed1eb8d597f2aa0efe0c713a2e407e801e7ce3f83e152361b
 DIST instantclient-precomp-linux-18.3.0.0.0dbru.zip 5200252 BLAKE2B 1d3613de34ccd61fd7c3795170d6d012491bc2c045c39f39db716ac7ce2e68e7e8da84c5b95afa8e50afb97d2fcad8e469f25627b9ec570f58f0b167a2f2348e SHA512 f783b6f346cc4848567a1b7284a93d1bf20a9555fa9cbfd57597b3856444969653cc6d6c3c3e710da6775d39d2efa6399b9e91f4f7458de43b0a404f4f693dd0
 DIST instantclient-precomp-linux-19.11.0.0.0dbru.zip 5194893 BLAKE2B cbfda89f2f97728234aa3aa58d13289be66db0127f1e73675ea2fae348d8dff28e86b85b0a5a8f372dc155a07d6aa71f2096ef5b3cdc3082ca80c107fac06f4b SHA512 196ea51fc11d59212e274669e623d86cd91c6a8d7425cab5a08044d216b118ef2e4597e0c2a904579f35de87b5fb87f9d6a6eeab927af5878c3a7e1e504730b5
 DIST instantclient-precomp-linux-19.3.0.0.0dbru.zip 5183647 BLAKE2B 79a37d25e5731978911d643bdd19c0b0f1f66b153ed7164358fe2038a987594a73a8aacbc2fd8c542557a099e52931666cc9df5d5fb1af30e3fd365378fd505b SHA512 a6f7d7f82d657bb32431aa81c4dfa1fb3ea31aaa6df9781e19fc78c2ef25bf168420c95e3d9fa8f4aa3912afd3fc98eaa45f63a28ddaa091c4e50360802735b3
 DIST instantclient-precomp-linux-19.5.0.0.0dbru.zip 5184902 BLAKE2B d9dd690b9aef42bb1c358540dd57357ab78b7f2c13014e017d70116a41a20f4d9a520436a8eaa46e007802ca49f8383853c832fadbc50ddc8e6119a491b0c880 SHA512 5cd41a92485fed47ca9297ae27078cb0eb6d3b4c4f7f348908e6d199ce8255617948637a362f1984bd75346e12d28f25ccdf7df1c376b669f9e7b57a9ee97cc9
 DIST instantclient-precomp-linux-19.6.0.0.0dbru.zip 5187123 BLAKE2B 29d0b54cf0575c242a3a8e742dca9771bacfb43870fa8a7c9ea6a15f51d951634b2c464c5e5b87cb0dbd63f95098812c0ed11edfb6999bd50155199aa3a6106a SHA512 2443ec5940f0bdcc151c913c42de58b0f30c052c8cfc13edd82771420d8393b6332d92a0cfa52afb8937e555624e871e3a2c0494c23770724c44081ea29fe353
+DIST instantclient-precomp-linux-21.3.0.0.0.zip 5290951 BLAKE2B 3df4c41019315119d63ec780b9ae23d48823ecb2b9aa61a923c87c3e1f30fd97266030bbbc898d59b402931e02e8b3dcedfb6b96bd41381b583da2b380526f5d SHA512 b1fb267c373410c3c24fbdc4102b3395beaf0609ec3439f730a31ba43c5f2e1b276ce6e7df04de0d542c211dfef3ecadfccfe33f1472653feb42fb25a9dc700a
 DIST instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip 6403554 BLAKE2B bd8e1b3de4b8c12214ea066be22f7ca18133e62e1d9a70b2710578e967204561cdcc9f719f8c1310e19e94baca367e0aa8c482e637b2f13a51781328b229be92 SHA512 292322eb07e3707cf469cea8390636fb2fae99a50b3b900a9c43b5808ce741cb708541820de5e9aa9c341290ad5015be32d968c43e1a14aebf97dd5fd04fc925
 DIST instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip 6401804 BLAKE2B 9098fa6966023e4cc48e9c4fe60aef5e7c4d15a5200fcf92716fc224fa741cb6bd41bbe58a1820ab4c4c95b5be2faee8f0d85dcf6d5c0f14c51943fd67b32856 SHA512 e44ddacecbcc7311f59490116fe44f0d9b303c0a669d9ecf43926bb5627b0a767400bd51e8ec1162d088ff52022d2fa0d2f4e9d83e7efc0e40b0c02679c1b109
 DIST instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip 6254880 BLAKE2B 0035623721a12c096a38ee64bc41465682214763f123ce9c529c61b6081c6de54bd7835f8b4ef07dca5eafda5354a77fa589c7c54cde412e1bdd4f313e58b3bb SHA512 d322b7896992cef8e48cc48acc68a5730d2a04ba0af5130eafa6ada79b64b16a4bd8cfaa02a28587d0871713579a5215ff46162499cd1f422252ef8dab61b7ab
 DIST instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip 6225945 BLAKE2B 1a17f20b7147496047f31cfeee56efb74c7daface1c7e6bab2a67258d410723b9e70b771fa9df9e16c2c27c831e97d538a69854e565ebd313f528a7f57a2f358 SHA512 6db99e0df10d439e93813ecdb27e5961232ab64a480b6aa0ee5e00a43e08bae2ade64b2abb60cad58e3139609f81835bde53d91ab35dedf427d3122d65c184b6
 DIST instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip 6226878 BLAKE2B 5f1606d5e9bb8900b4181e781b270d6dc28b72def6f77edfb8ba241ca4b955c9f9fd2b61b8f4c97eb20845ae3397af7be8a574f175095b68478f299220f2332e SHA512 a4b200444efa597ee66b858f3eefd135fc36f038502301f9a1636ffdb6955c1bfca1fad278b57a0dad2fc90979eed4750d9ef631b64ed65495d5c600ea36cbb6
 DIST instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip 6229434 BLAKE2B 9d0f5ee6f18fe7d9caf80765e8367d72c2336c7022e9fe35ddd284e13229280652c1daf816d14556f614c256a594e92dad35736a56e4d8ba535b68a47d63dda7 SHA512 ea98cf319c1c5937e2e95acfb474c83897a595e804dd3e2a3698a4584e37aa54f2b59e6990f4f9b1c947d8a39ef24e502037d85178ff02e84ee76c4f794952d8
+DIST instantclient-precomp-linux.x64-21.3.0.0.0.zip 6386663 BLAKE2B fea4e0465330d4309791f9ca58ae169b1ff2cd1f17b003210aab1fe4faa92d6e48ee20bbf7d84f44f437bf5297c69c9c2b5a2e3cfb687c8010f8ba75bb928c9f SHA512 8235236175f35d4634005249ccbe0ea5dec4078fd795545184578cefbb8d45663731c507baac4a952fb9603272aa3ff58197eb23801894bbd240cf5736460d57
 DIST instantclient-sdk-linux-18.3.0.0.0dbru.zip 927121 BLAKE2B 5b53d759cb82c854d67b9bebaffb07e442b62d13367e5acf19af2dec4dbca2ba3ee50c83f89cf6e865121ad039227d898e74fecf43439610254eb43a429422a0 SHA512 6e4ccafb69d047b96dbda2f493c175f005b593472ea3c9a75fed758d2f12d970509d58b32d94f7a59b3d0402a87efaa754e6487af9cde01f7211f0145434c6c9
 DIST instantclient-sdk-linux-19.11.0.0.0dbru.zip 933913 BLAKE2B 08cb6c94cd152f58fe9e52874b40dec56a6f7d3c9913122303b46f75ae2df0e13fff1a375136b6fffabe9ee7a7d844a2b95b1be380b6d957338b09a15c9fe83a SHA512 8d7aff3d066f423021a5babda86b1b378333966fd892146bf46a967495180fc099e9766deab27d81735fee845ab43ee48d8815fd96a73e3a235c4fde74952e40
 DIST instantclient-sdk-linux-19.3.0.0.0dbru.zip 932301 BLAKE2B 6c5cfe55a651b9364da3f24d5739813e1b8165fad6434b7a09da2acdeddda408ab4fb37aa34851a537a000a4a7718fbe41ccf8b5fd51aa1bb4fd2e8ec0db33f9 SHA512 8dda8500ffa9eac966f54818d1c19b7d8b878f09c0664e03cfcc8ee8e5b061de566e6b411d15c5db58ef0e97374c2311d16fffd6b4c124dc06bdfd8fa8916b7b
 DIST instantclient-sdk-linux-19.5.0.0.0dbru.zip 932492 BLAKE2B 35a8cf7186c754c957738a6a1f815f11a523fe7100ade7ceb646976f5ddea90aa0ca9ff435600f36cad774d7d72a96d9305c7344d8cf8639d84f41611bfd05f7 SHA512 9f9cf54d09b807ba9d3c96bf242aac293b95a9d4b19100cd64a5e84769db0b9541fea09de57a98b76d0500c68fbf2ef660a415c780812ae7b693064484e43ada
 DIST instantclient-sdk-linux-19.6.0.0.0dbru.zip 932525 BLAKE2B c27b3f474372fd2a08b811c519cf0bbad6197c26407e6a90006ac21ad153a2af68ef6a33b7e7ed28439e2a6481df36e37663faeb314ccc4d08e3ff76ea1e23bc SHA512 ecad27fb94d22aaa6ef797dadbeac4eb4275b7ce904c3e5759342fec73d2d2131d41abf17fbef0a6bdc55a5f78e78d6dba70507db819a3ffa9c4213a8e494614
+DIST instantclient-sdk-linux-21.3.0.0.0.zip 1000869 BLAKE2B 3e3f01da8218dad9de699b587ecd37dc465bd5779c7d6919149bcd947e9e9575d35727fe7d1251db8df12214a399b665c62be9e790dbaeaa895b2442ffcdd8fd SHA512 dd88433810e5b72d96747e57b34f7880607fdd0250d04972afed9a9f20c27ce1b74d7030b4de60e03621f98117b7ee93062c6c750b5c2dd104668a0afd45cd47
 DIST instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip 927118 BLAKE2B 9c6cd889843552cee3e84566d9c1b29369b1e7b20a01fac65676a33d6196b042a4c34cd2df8cf1ec5c8664a403e44e6a283f42912b7e056e093c744bd24ec24f SHA512 c9e1493601ec70541e437ded748f3be24deaa3f1037884fd003907bbab38b3099aef12dda1b9845c3eb3ce3827f743696f5ebe6d8dffe7974088c1329528b729
 DIST instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip 929988 BLAKE2B 942f99fbea74e253a0be1677cfe40d79a26cb7a6442631d626648a65aa4f20b730e4f1ff13effcce5c4befd2ce50ab038f88b61c6f05ccad262568b209b3048f SHA512 7adc9e315c7c8784e4648a97fa54e03eb26a05b7b35a1f5cf1105898701b31fdc22f0011b1ae192752adcf3ec9798ba635bb9a9a5d4bc768a9a519c3564a9375
 DIST instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip 933906 BLAKE2B 7d15f4c5a53708fd311ca75c35db5cf1241070217c21acf05f181ad07259135fd64eeb8f84582ce1faa6bbdd9c3fc29c07e44d82ff60fe1bbb9acaf7f70612c3 SHA512 d964612f0bb571c5c1fe78d14f861b2189d917d23e9be936faa637d5a2f8b530dc93a1ae0130346b70897bd1382f23953ff3e7f3163a580b7c6058675ac5fcf2
 DIST instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip 932294 BLAKE2B 26ea1ce34209c1dc92101e211f009ecd20cfdad4d88e946844cbd1f2b1f4365c7dd273e7079be1dc807c38393035847e47800d65b0ecebb3a705cc6cac092a0d SHA512 ec3527a8371bb9644f4912b8190cfde53bf2afd8bf2ec7376bad97dc4d4b37f010a5e0d30567e2398f51c07affeeb15515347df095587a9cff84ef657b7e8c6e
 DIST instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip 932481 BLAKE2B 6a62e3c2a2889b5534133882c47aefc957c3e261c0ba7c161baed32657de0d15317356719ed9b354919fec8936dfb99044b707e83ae5ecd9d3359955e6de0005 SHA512 0f6521cc2c0430d15efe80fcece7b802146418591ae52b062f3571a85a60a8d8912b8d484e36360bc7428c0fe1e18043fac5bc7b3d484cdca9737931c1e72ffc
 DIST instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip 932514 BLAKE2B 8388f312a3790cd9bd7307fae8226867eae159a93099d418f430101b6b87ab9d081c74f1d31f2fa8f33e50bf3e643bcc21aae57dbc6e913fc4178ab6688e3f44 SHA512 a47d1a2d99419c383e1cb4ab236beb35d067552e6f88eba65fe38e26ce8afc2d45c0ca482b1f9f1c38337678880d60f8b73a72a5137b06c984bc930bc05c48d9
+DIST instantclient-sdk-linux.x64-21.3.0.0.0.zip 1000777 BLAKE2B b593e3ef880a22d712a4e2b0c51f2f68e5d9ab6c3e4124b32de643eab7d3b41b6d5eb46f4ac98af743d90343d29975760048af5b7be0919c40a9b84217b31939 SHA512 5372c151a5b45bb2cdf80c47ea65b4d8ad849cc5a50818917484b952e03c344f2d7f1896a13d51ad9daf7fa9c43226aa011dca03161d6976375f239f782bdd23
 DIST instantclient-sqlplus-linux-18.3.0.0.0dbru.zip 881315 BLAKE2B 787dd43ffaadd493d8cb3a9a8bbd160f75c51ad07e16d8eb7631e8368b4a8bfe9e574326837724b3573705e1c309cbe0bf364c1b98660534b05f5d72d28b1b11 SHA512 9087e5654143c9da3499fb7f1b8a15b04433cacc0d96257519788b3cd12a0aa480b37fa37fbe55a2f40940ea8da1eeae9881712a87d5942e142c0f29b580e54d
 DIST instantclient-sqlplus-linux-19.11.0.0.0dbru.zip 884155 BLAKE2B f681321cc43646af74eda4d6da102587123e0f3fb423d978066f014c4729ed046806f9c49cae6928704b4993459089e8d8c1ab4fb1aab912cd6fa7ee27382fe3 SHA512 1f4bc70b070c9a0597f1433913018021e87a7b059784a56e47842afd8a501039def6591f4e7a009f3f4598f23c45aa807578a74082174862ecb444b1855f7b22
 DIST instantclient-sqlplus-linux-19.3.0.0.0dbru.zip 883462 BLAKE2B c3891a6ea525add3030372bb96b57e31b3a2743dd5bddbf12d4e2d43b7732b244c265a15423ae48d93db609f37a449233c8c16f5fd7c1d345b6ef42c217bb8d2 SHA512 521b80d47320b4ea51a68bee8f05fa51fa5e74690e62817d1fdb5471eaed577cad6bd5364e18fa5c18dc0cf56b99e33b62488a93c176d860e471ce2a7e9facca
 DIST instantclient-sqlplus-linux-19.5.0.0.0dbru.zip 883548 BLAKE2B 43f6896f392b5d765506e7220ca74372603760dadd89a430a9e840afe85575c911ce326a5ced1b634d240a279491fb54a3df39f2289c30f736f3a70541dafb06 SHA512 eababf946085a114a91065b03a0d36a03b5d8442f0029b13dc95f698c086e8aaea64184d9a899b36ecec0f24943d0340aba400cb3fdd52f93367ecca76ccfcbe
 DIST instantclient-sqlplus-linux-19.6.0.0.0dbru.zip 883975 BLAKE2B f4b5949159bd9df48b3749c6119f3188e011598795fcdf3f0164b7a04e19c0899acfe11411678577e67aa79cd209d7da5aac1cfcb4ced9b1e96b709415bc9821 SHA512 72e4ea40c02be6b1c41729e4fad404a8dc53dacb31ca027e44a4152b83972e2ffe41c68c3682e7da8bf35bf9eafff0fc964da0f24097dc9b5cf4c247a952c025
+DIST instantclient-sqlplus-linux-21.3.0.0.0.zip 909623 BLAKE2B 181da5e352dfea2ee1d87e138601f8b84ae2df278deb1c205bf25e5958a32da13252c8455a8aeb9941de2fc3752fd0510c53f196e8755bedae24e704cb4197a3 SHA512 e4417bccf0abbbfe16fce06b1a18c6e4f58ede1b87a1ab6407f74e3b926aa9d9b4d390c881bd578f95ed4fec6980e8b28cb9f624b8480e1ffac6dc599dcf49a7
 DIST instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip 915778 BLAKE2B 8d93e462568a5bf5a294a5abcf0a0e30c08e9eef18c01a79b8f716261efbeb14a286d1058ddfa278108daeb49b74a3e296efa83291d7bc03f4ad35428c946701 SHA512 878ac2cf58aaa8cb237779fcd04378c95d738fd444eddd5745838fa86e8cd60f1c2be49f0f4fc3d4b16dca652fe66681ac0907a4aeddec1d9433e63d2f4e5db6
 DIST instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip 918469 BLAKE2B 14efa748e7a892334610fa7a615c56b07e25873d5761408b9cac642af11ae2d97062b8014e4c7dee06dc37676d7c9d1a409d80f50b9d162210e073c1c4ef67d5 SHA512 8c2866ad092893647086adc554c7fab3c9bdc5429c9e0715d68717065fe12f106d228a2f241fe76bdc677a4adfa6eb01b0d866fab2bebbb1491a087a4b9d4a50
 DIST instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip 911265 BLAKE2B 78215f683458147792be3182eaf9edfde5943e8e470a7bcbe09c82c298df709bc7cdf919e349a9130b8d6313f2f8a1d04ad9b5b3c5ad91d49802ad14c3f15515 SHA512 dd1343ae49917a031cbd8d757d11da46354f157f46dd651afcde09b4b74a9e02008c6370eabf6bd313190629944cc075d6fbd893b491ad3505b7a05dbeecd963
 DIST instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip 910409 BLAKE2B e05c8dd3c545842989a2650013ff7ac8b06b41bef07efcd312ff66c51929942e3336bc9bd9a53a197088433b2cdbcb5bfbf4b2f4e1a40d68cfe559207737446e SHA512 34320712009ea724edd71f04bb72dd58fb99d34b1a357e238c04c9a55c7120eafc8c675558755a85587c7e75801dde2a7f8fc54795dd7e3e61568f8cf27d791d
 DIST instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip 910437 BLAKE2B dc204e6dfc4ab8d22720067b6238ffff773a5db6522b2066306bbbfa8645cc62f952126b2f4bc548dc0096695914d7ca44c7b299f59a609c363739fca1be76e6 SHA512 83a8b7004585ea3a31f7abd55615c983963b3df2ed030e54057ab897442b38ce41fe66c2754ad034b37c588090fe478549db371b809e457846ca537b25b2fdb8
 DIST instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip 910905 BLAKE2B c1bed01f662ba15b80b6fb4bfb461bbdb7033183d7bf60823b1a6d6aeb7ecab4cd68c1cc889c61f11f5173c13d617494e7922fd84fb5757bf08396175c3ff68e SHA512 6140a8b9fbd78e2d199063dd70e441737079c54d4ed115a404a77ca2cd7503babf059b7c9ade5605dc2c5ffd9e058ac26a9e159f47f252e1399afb51608f8ce0
+DIST instantclient-sqlplus-linux.x64-21.3.0.0.0.zip 936305 BLAKE2B b6021f3ab3badb282f1a13a93beee6caa093b905efe6a647cc8ec9ea84eb3f7de4d9885692fd8d965608ba89964d13b5427af0f8710711f673ec97c528a6063c SHA512 9c6e87b4d319fc2bc35b2bd492b9608023d0f90b6230a66c75d9cd4d9fdea9b5dab178751cd188f9d1368f639d40f342ef1c71773dc4f9e9d8a199f4b46deaee
 DIST instantclient-tools-linux-18.3.0.0.0dbru.zip 1042756 BLAKE2B 1b1af7abb50b6977e0dd4bc0f2b5e89534cf5bffe216dbe553063761470c45f330f4a72ece428a3e0dc8162cebad3cf0ffa628f4b3879bc434ecda7b7b07570f SHA512 b809b83e2e7dbe19c13611c1eb819fa4648a127ddc8a97abaa794213c7f4b6d28b70956aac4f331389d088c6fccc998d0eda8dc39f2dedc338f3baf03bc3ceac
 DIST instantclient-tools-linux-19.11.0.0.0dbru.zip 1020021 BLAKE2B e2a615e0ffb4608af05931a8b49406c85db5d549761319c7116395fae206fe6cc0cf56b49e6c3968419e63616f2d07ad6ec3ed70c862fb2394b8dc0ce9f6dbb0 SHA512 255593c1e62a11f41793619c856d316815d77fa83cc9efee1d5366dc86b32e9909b042f7ac81ad693aafb8c34cdcc8faa7eebf816a90d037d36ce461df33f469
 DIST instantclient-tools-linux-19.3.0.0.0dbru.zip 1018792 BLAKE2B e24a264d59a4e29b8dcf56dfd09c80571612f465c8e2e91514c076553f27a0b07e66bb2ac0f3fcd6150c8a04ba861de04576e45ca1c03d173149296c029b8fcb SHA512 33103d934dec1bb6e34fb3f15cbbfba2ceec724334ca89bc55df3953779b3f4d45d70e7c9d1734481f366bb2e7e8ab58bef063415571acdf07022f193558ed54
 DIST instantclient-tools-linux-19.5.0.0.0dbru.zip 1018855 BLAKE2B 273d2abbee9d1a54d4ee4c1aa69c66fb7e8df97892ae66406ecbd941a4bcd2e5cc592d39b9d92856b4d211d8aa7361d39c0d5e875505fa5aabc39fa724df0347 SHA512 39e143a03ea428e84d5b124ed00edebb1d5de2b5a69f7614b171ae4e67d6fc7d2638a943fca78a52d0b548b6d300b30143b532604bcfc00f362100a0ac01795d
 DIST instantclient-tools-linux-19.6.0.0.0dbru.zip 1018444 BLAKE2B a29a10a7a98c8c8939263122dfba8fab3fe1101d48693c78cd75a5cecaecbc9a9f57319a13b09a8f87559c2e00e7205f17b6e01711213bd11c5db4914c853ed3 SHA512 ae7402555f61c2badeffb0cb5f2979142ea2e6b54c26d9b3a803b4babc14d176d3c787902b0323bc84dd5d9b273a4653d30e32d1578ac8e152e7280839e9dea6
+DIST instantclient-tools-linux-21.3.0.0.0.zip 1083935 BLAKE2B e0caed4063d3322322beea599053fc40f1e08470d03c4bbe7cb5b46e5f4ba4759d313ea714806facd35d24924cb83e6d9d7d3a44bcf1da62c6c80d0321f33ce9 SHA512 301c126a3d2fefe36400c2287515ff6716a68a3273ae1450393d04509447d68e3bd2cc0412c5c078923421ff80534c3fa56123df61fbf92ea42965e3eed80bce
 DIST instantclient-tools-linux.x64-18.3.0.0.0dbru.zip 1142609 BLAKE2B 5c915bd940b7bfaa42429710685cfafc5f0189607da2d789f4aaada2bc9d3365ad8e9ee31cc209830fa54b406ffe4b9b2fc2b5e0b6819ff176f7dbb566117a79 SHA512 2c198d9e723b39f7b512217eb08557dfa3c9ae32858acd882df8b9b24beecffe6b44eb089b50341edf01d7e4c0514d4b3de4aa06fa9185aa0538855963c174a4
 DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1add6ca2042a213b5038a805ea3d6074703d5a677798684f60f681d6f7b642154d87a02fe973b5b12295ea9ef6f64c45836ceee66ce67d4e4498417b6 SHA512 7bbacdb1fa062c40b2389599ab522b02d63e68731d461fe45446685642b932ee741b8c9e0fde189d8f741db4131f6ac72c8124612e8668a00f90ed7c594fff50
 DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd7704f6a5ad33a9ca0eed35feb4d8e4a3ac2b5a5d11f992569f0024ae8ef5b8fb42b02d627ee4a81d2ae9170367ba7107e0f975f89d189c576eef45edd SHA512 d355b0a457ede28b20004b4709ada5bb2c2c8a72a20a19df07bc4fb8607f78ed4d24bbf07a9f2157873b544de7a43406faa27374a0f2d6a47d63f36478e97d3e
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b
 DIST instantclient-tools-linux.x64-19.5.0.0.0dbru.zip 1085242 BLAKE2B 8d540be2f491d5c5a5e36808332e2a0d28092cb450dff6293851644ea11b8de0f376c87d2cfeea383d0f636e33ed196a89740e3d1ec060b75dc96bd291e18319 SHA512 fde38a0c935be334c96de339f84bbdc15ec956c753395a7a29c2b0d16c301e1fd0accb3d5fdc44082adf36934a7f6a1a2bae7a035d47c949337339bdec615d76
 DIST instantclient-tools-linux.x64-19.6.0.0.0dbru.zip 1083396 BLAKE2B ee38d11929aa76788777b7f5315c56e3ae1df32af210fbbc91c9d45c9b608598b865d9a1c60534c00c54daa8f638cc89fcd22f16212f99d624b9a39e2325c289 SHA512 0ff7dbaa402a417bc389eb15aa1c199fa39bdbc43bce5757213edc2f2b0f9b1fd40f90e2dfd929312e8cf82fb128dc5adc1dc78cd9767cf2028724f9239d3bc8
+DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d
 EBUILD oracle-instantclient-18.3.0.0-r2.ebuild 12157 BLAKE2B f9e3ae626d0813dbe272d1e04e7f2181791cb0a109bce905e2be64aca2b80620e930c2d3e957e34ad217ee40d49baf51eb188ff99c9816c0c50a8b8b8c9454f6 SHA512 13b8d15365082825df1e09591eeb3d9fc3bcbcfb9e102e5968a77596aaaa8ef1860355c620131f7d437e96c714516075f30cd77d9f512decdb833519d21e49e6
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11884 BLAKE2B b62511809a62094c960829e869e6f425bd50b0ba1336a7193f4fdb385b16ea8a29300b0b5e12f995f15a9dc89997f8ee0ee9c6ab6d3354c42b6113b94399f6ea SHA512 3a05a9744c42df61c78c9eb9169e51a5a2ad91826693da15e01920dbd4ca7653003d9816e5bae3cdf8373a9de385010335f46b9523b65ae4901590c7d645f228
 EBUILD oracle-instantclient-19.11.0.0.0.ebuild 10920 BLAKE2B 0e7721ee91bc0d78c4a45dba5ed009f5e736f0b562cc9bcace50e4ac31d739c298860f4f9e6aedf19948052dc29004cf3f404fdbed78e711be6ac154b5f72c87 SHA512 2cf83004905c65b71239c48178e5a5a5daf0ec5dcf0c591ca5a8166e7e9b26f8fa31709df244bce25e86c92df37d35e3462f4525565531358c0c9d2fbe1c01e5
@@ -85,4 +100,5 @@ EBUILD oracle-instantclient-19.3.0.0-r1.ebuild 12157 BLAKE2B 1f1689f3905297aa6f2
 EBUILD oracle-instantclient-19.5.0.0.ebuild 12157 BLAKE2B 9c752cfdf50be01359d2126d1ef63ec34882316eb26a928bf54827ceef99c027a467a2d8982c92523c5b502fe0991c18addf26b1fa6eed74065df72883df5f66 SHA512 6ae1b128259f9194a297ddb9691e003a853a7a610caca2dbbe29aea84a2952d89aba91ac0fbebddf5abffbecd4b369e19363f92b98c88d840eed7aa8efbf7bee
 EBUILD oracle-instantclient-19.6.0.0-r1.ebuild 10891 BLAKE2B bd41652cd5412f7254d2eebea46815449591b6c7de8b7f1c36a8b257f8dc44504a44c003d936e864094f290131258b0d0f2510f7ee3cc0cc3d232faa8ab9c5ec SHA512 49709ce9e0d856edfe44203e87c28d78110d33549fe435d427040f21a39853f0efce33d93bd826c4c1fe7371c5c786f08de5c10ca49b83cc7c68d472918375bd
 EBUILD oracle-instantclient-19.6.0.0.ebuild 12157 BLAKE2B 9c752cfdf50be01359d2126d1ef63ec34882316eb26a928bf54827ceef99c027a467a2d8982c92523c5b502fe0991c18addf26b1fa6eed74065df72883df5f66 SHA512 6ae1b128259f9194a297ddb9691e003a853a7a610caca2dbbe29aea84a2952d89aba91ac0fbebddf5abffbecd4b369e19363f92b98c88d840eed7aa8efbf7bee
+EBUILD oracle-instantclient-21.3.0.0.0.ebuild 10825 BLAKE2B 6283e9aaecdb2b3a689a224a6ace9d74189df7e1d0e7a15352ce3da46b5d149201d16120713701edb724af7cb122c555bfde90eb508bee6f32e3a58eb4a9665f SHA512 6cedc5e484ced883aa50d76e78d226e74783e0f0f71f3c85a601183b491ad602f3326ecb4915922f0c1c52c77d75cc46b7728b8b13d7f69ce48671336624dddd
 MISC metadata.xml 909 BLAKE2B adaa309170d33386196df2dd8e986fc40ce1ac48de76d8e017c5d98d5fe8341c5e4b41c2200f8d02be2bd8d4e9f395917571dd3bafb2491fe2f0651de43a044e SHA512 ff478c324fb82ccaf512f678af5eac61a4a0a7fed58679e12244aa9badd6e839e7a55fc3f0959efb9d8a41d85823b7adce472bd64554132dcd7f1719b16cc09b
diff --git a/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch b/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch
new file mode 100644
index 000000000000..44799548e51a
--- /dev/null
+++ b/dev-db/oracle-instantclient/files/21.3.0.0.0-makefile.patch
@@ -0,0 +1,22 @@
+diff --color -Naru a/sdk/demo/demo.mk b/sdk/demo/demo.mk
+--- a/sdk/demo/demo.mk	2021-08-22 17:20:17.232777697 +0200
++++ b/sdk/demo/demo.mk	2021-08-22 17:24:49.800783794 +0200
+@@ -43,10 +43,15 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++ifeq ($(BUILD32),T)
++LIBDIR=lib32
++else
++LIBDIR=lib
++endif
++ICINCHOME=$(ORACLE_HOME)/include
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+-CCINCLUDES=-I$(ICINCHOME)include
++CCINCLUDES=-I$(ICINCHOME)
+ 
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
new file mode 100644
index 000000000000..232fbe4a0f7f
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/database/technologies/instant-client.html"
+
+MY_SOVER=21.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PVP=$(ver_cut 5) # p2
+
+MY_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-5 '' $(ver_cut 1-5))"
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${MY_URI}/${PN/oracle-/}-basic-linux-${PV}.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${MY_URI}/${PN/oracle-}-basic-linux.x64-${PV}.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_URI}/${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror splitdebug test"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+	odbc? ( dev-db/unixODBC )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A##*/}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc##*/}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc##*/}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp##*/} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk##*/}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus##*/} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools##*/}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/21.3.0.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the shared libraries,
+		# and does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		# Some build systems simply expect ORACLE_HOME/include.
+		dosym sdk/include "${oracle_home}"/include
+		# Some build systems do not know the instant client,
+		# expecting headers in rdbms/public, see bug#669316.
+		# Additionally, some (probably older ruby-oci8) do
+		# require rdbms/public to be a real directory.
+		insinto "${oracle_home}"/rdbms/public
+		doins -r sdk/include/*
+		# Others (like the DBD::Oracle perl module) know the Oracle
+		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+		# And some do expect /usr/include/oracle/<ver>/client/include,
+		# querying 'sqlplus' for the version number, also see bug#652096.
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index b9741daedd29..10e38d56157f 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -6,23 +6,15 @@ AUX percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch 1094 BLAKE2B 25b
 AUX percona-xtrabackup-8.0.22-remove-rpm.patch 1086 BLAKE2B fdac1fa3f83cd7b3b82ca7dd443ba9d170051d1b2e92fbb267524b46c8272c28586cce58de6b71eae1372f08fd5e89b0faee567885bc3de7650cb42c4749ec8a SHA512 2362805b7937b9b1922f4d8be86031b58df9c1475c849052727f190ec08b32cbf07bee98ac38fe7a362e8e10fa1dcb4ee16f9bbeb6f36ddfc2931b9f14c05553
 AUX percona-xtrabackup-8.0.23-gcc11.patch 931 BLAKE2B df3465d46495f329015452aa17981323f9981cf43a460c206ccc9730d747881559a058ebafb0960c70689df5ef35d7fc2d2a920199f3e13f52c0ac34b29fffda SHA512 6e5981c5868d5d025cfad0a718804f2006535f3cf55965cd7fbd5ca7a62bc871e2c0bf3638be2b9549121948b0a6fa750c0842970088dc1c489f7ce811e047c1
 AUX percona-xtrabackup-8.0.25-remove-rpm.patch 1272 BLAKE2B 228b1eb3be43686cd09f7c07401010b6174f0770c2d6975b0e89fc69f493012cfad262536f3366e44bb3e0d94af7b072d593b820209700fe5795d6c01e9fa8e5 SHA512 bd4295934c9855b2c4274407660e6952a29807964286d286643a547b4397c13ebaff2bec0a42de352a06cebb5fbf449dc28bade849be4857d34d7ab68abf1ec2
+AUX percona-xtrabackup-8.0.26-remove-rpm.patch 568 BLAKE2B 67c25aaa4abbc2ebc51bc9a2e68e7ea25aec1b82f27fc19bd983bdb59edb5c21e8ea4a1dd954cc41143e126413818987bebfc41d2ee4be3fe79e255ecdcfdd68 SHA512 cd2333cc08dcded5060ab961b4458fe9d04d2d5040efc49552361cad5ff12459e7c72a2abea67fedd46ee7f018f8622b0be528017fe2b98256718dae21f682c7
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
-DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
-DIST percona-xtrabackup-2.4.21.tar.gz 61901220 BLAKE2B 77245818015d4e9c22d05cfeb254ff570ab490c43f9d2fd0e1c499e1e3fefb143b4659fb929740a563e2344b3cd7dfb408931c6d24b277f6df06886dfa83126e SHA512 8b14ef4620fdf836a090d07e5aeb78141eacf081a2cf1069d91af1ba5206e36e3e195f8acb06609f334661d6ad27937b31e997b0f1aabb9cef612d35fabd0284
-DIST percona-xtrabackup-2.4.22.tar.gz 61911038 BLAKE2B 4e0eb211b253ac3bbe82af7b4303ae13ca557926fdad100e9101522f0b1af2fab5258f4a2c98dd9e71cbf3f28586bd527f552a40f1a7a9cb93f5649260a8325b SHA512 2ad0533e5f4750dbb2713b8538d62c23613ac94066fcaee154ab90b1a9ac19ed3c5c7a024e2dbbdf298192665ad6f3c0d42a1435400b003425a8d7630503eb2d
-DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
-DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
-DIST percona-xtrabackup-8.0.23-16.tar.gz 288261551 BLAKE2B ca82bfcac881cd1d9d3a1d0ea4647d809030b617cc8605f26f1378fba74f106b522447fc67be3968fe72bd8c6bd9fa64ba1943d8379c11f241178aa232680f06 SHA512 11927649ab2a25dbfc5268ab2196dbdd2b102229728a41dc61995aec92a133718c0bf79d3fe15ea91e0917cd4201bba806647d259a6aa0fc7b59ff8bd533e810
+DIST percona-xtrabackup-2.4.24.tar.gz 61985764 BLAKE2B 99531853b7e125bfe1d133d3dd902f3f68d50a6c127c09ac87652d70aee5c4d764ba7b102879bea0eb67c0a2f1a94633889786c0a7a1f6bc3f9ed54fe51a217d SHA512 de25639a6e204d2e4018c922ccbd5119c5696d03e0b445f81968b15c2179a46ae8844014e78aa89f6a0a3cd5aef20adc744c979926366673f78c347d6a4e0201
 DIST percona-xtrabackup-8.0.25-17.tar.gz 291581323 BLAKE2B 3860994ce969abc72378d29b32768c70ab4210f55400ad47d446b6e50b97fd6e90f124388663b02ba0e41fbb1c0ac4106c337861da46006442072591cfff2ba5 SHA512 f7186881c8422f6802efb813644c5721bb274db54afb591b58fe9ee1a084fba6546c7673f461b4d581c01ff0cbda588cb96b7fe21d669b3d9cbe3b5898288e08
+DIST percona-xtrabackup-8.0.26-18.tar.gz 294169182 BLAKE2B 250437badd9bcaea92b0f254fad27a775014f17215e764114bba3d1cf0882135127738a4db78349cb9d519e6a9b5bc015f04747ad8ebfc09245ebad3aa890400 SHA512 0cceb6758364c31167ef0b47176e1950273e80e5266b91e12353287dfae6e3a87382b29a466920e5e58add1f461295199a70bb070a225458ed8a7de844e012ea
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
-EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
-EBUILD percona-xtrabackup-2.4.21.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
-EBUILD percona-xtrabackup-2.4.22.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
-EBUILD percona-xtrabackup-8.0.13.ebuild 1545 BLAKE2B 42ea67173b4c4f462e0acbe4a5ebdf2cae8ea7764df7d5353c73f65dd5d9023a2833e8e8c7baf9b4f8316d5179ea5aa3a7ca1b55eebd88d43fb89cbea333928d SHA512 5967bb6a3e95187d13c4b6995cfd8b151aa1d1fa9c4dadfa1bf0791ff8748a73705a750214115c62c92c41c483d48872e38c7915e82fbc4ef90d79f594a135c2
-EBUILD percona-xtrabackup-8.0.22.15.ebuild 1867 BLAKE2B 626bc0a244a6335f0b8f65ea586e1d26bd2215b239338160f6dcf5a0cb832a810d1a128de7c0599c74fa6c61a8389b002ab9a800d4fd9dfd7ef924d3f32ff0c5 SHA512 d5387d3a5ddf1232786b4d477b404f856484f4d2c9ef4a1b3edc7b4d9f0fb001e18137f0ac597da9ea7c6feed96fe74503126e17d0ff2f890bf12f33ff9c06d9
-EBUILD percona-xtrabackup-8.0.23.16.ebuild 2203 BLAKE2B 05977a233a1282cafe6a0b96ec09db50a46e555755115c3c779f4a1ef739b6f45fb9f0d94d4111d3e05416449bdf5adcddee193ac5738eb17d43b84d3d7c6339 SHA512 810fab9b4f41014c9f4c58b8def0c417d2cbd5f87f6812002cb82aadbfae5b7392f8fb03b59b1d1173f2640bee0e1a4821edad7bd8aadc6bac13798f5346d645
+EBUILD percona-xtrabackup-2.4.24.ebuild 1499 BLAKE2B f83871d1c9e600f7271f8f3166f2e7f17fabc36cf74f42088bd21cf2ffa8088b1b9d60097e966831d050e70ac9a5c8f4274bc96e6005d1076edfc4336b199680 SHA512 3823f3363fbeae66c1d1cc0b656d852c89c4a8b15bd3e77ba087509686775b6a2d1ee3ca73d297401a9a3778cb7261287b1d6af8c3d7288bcf7b55e34406c3da
 EBUILD percona-xtrabackup-8.0.25.17.ebuild 2101 BLAKE2B b32d90241bc866445fc0b36f09385ffb6bbcfe2252f9079a1446d3aabaa9d9c39e473d6f7bb894285601eb28a24fa100cfac1f7cd1e892ab429ac926887b518c SHA512 f104bfe5e9173ca05acddc9fe86e6a7f4793dde31a3752bd918bab88e2c4547ca560a9526d0e6c610b79bbb923144121f7ed50553d1f706e2aed53938cacb0bb
+EBUILD percona-xtrabackup-8.0.26.18.ebuild 2101 BLAKE2B 27de4920bdd73ab2bc24a338cce22d2aa02098fc5f61c19751d579577de35d3763b8e29c38fa2281a13fd0c8be0db63e51bf66844fc00f511316a4b4d0df756f SHA512 cd9d63b1a8afab66c1e107330cc9c192816e0fc91e8900fbc11a6463db8f2992af7202dc71e9dc0224950ddc0fb9b893d62f418538b00b20c602110e8879350d
 MISC metadata.xml 335 BLAKE2B a386be8de6b73711ec13028e9853bd5a7a75415e5eedf1c90a5a04766a26a7a8c7d1c356701633a9ab8ffc3c7a2337ff96642e54362e82c991b32a04890861e2 SHA512 e326d9546114704346381eedcad049a75d2ba787291c04815e175d9042869b2e0486750027c9d365ed62c043c5347ccbd254da24264693769ad6c122d9f62d0e
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26-remove-rpm.patch
new file mode 100644
index 000000000000..797ef15b1942
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26-remove-rpm.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,15 +210,6 @@ IF(UNIX)
+       )
+     EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+   ENDIF()
+-  FIND_PROGRAM(MY_DPKG_BUILDFLAGS dpkg-buildflags /bin /usr/bin)
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+ ENDIF()
+ 
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ 
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
deleted file mode 100644
index f15f04741bfc..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.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"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
-	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
-		-DWITH_EDITLINE=system
-		-DWITH_LIBEVENT=system
-		-DWITH_LZ4=system
-		-DWITH_SSL=bundled # uses yassl, which isn't packaged
-		-DWITH_ZLIB=system
-		-DWITH_PIC=ON
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
-	dosym xtrabackup /usr/bin/innobackupex
-
-	einstalldocs
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild
deleted file mode 100644
index 967e9fa2e0e1..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
-	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
-		-DWITH_EDITLINE=system
-		-DWITH_LIBEVENT=system
-		-DWITH_LZ4=system
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_PIC=ON
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
-	dosym xtrabackup /usr/bin/innobackupex
-
-	einstalldocs
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.22.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.22.ebuild
deleted file mode 100644
index 967e9fa2e0e1..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.22.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
-	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
-		-DWITH_EDITLINE=system
-		-DWITH_LIBEVENT=system
-		-DWITH_LZ4=system
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_PIC=ON
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
-	dosym xtrabackup /usr/bin/innobackupex
-
-	einstalldocs
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
new file mode 100644
index 000000000000..0a907e2e0f33
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-DWITH_EDITLINE=system
+		-DWITH_LIBEVENT=system
+		-DWITH_LZ4=system
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITH_PIC=ON
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+	dosym xtrabackup /usr/bin/innobackupex
+
+	einstalldocs
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
deleted file mode 100644
index 1ee00910f4ed..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-BOOST_VER="1_70_0"
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
-	mirror://sourceforge/boost/boost_${BOOST_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/icu:=
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-libs/openssl:0=
-	dev-libs/protobuf:=
-	dev-libs/rapidjson
-	dev-libs/re2:=
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.0.13-remove-rpm.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_${BOOST_VER}"
-		-DWITH_SYSTEM_LIBS=ON
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/xbcloud_osenv
-	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
-	dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
deleted file mode 100644
index 1f27bfcbcf14..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-MY_BOOST_VERSION="1.73.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-XtraBackup"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-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
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/icu:=
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-libs/openssl:0=
-	dev-libs/protobuf:=
-	dev-libs/rapidjson
-	dev-libs/re2:=
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
-	"${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
-)
-
-S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CONFIG=xtrabackup_release
-		-DBUILD_SHARED_LIBS=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
-		-DWITH_SYSTEM_LIBS=ON
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/xbcloud_osenv
-	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
-	dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
deleted file mode 100644
index 7e7eab27d0e9..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-MY_BOOST_VERSION="1.73.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-XtraBackup"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-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
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/lz4:0=
-	app-editors/vim-core
-	dev-libs/icu:=
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/libev
-	dev-libs/libevent:0=
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-libs/openssl:0=
-	dev-libs/protobuf:=
-	dev-libs/rapidjson
-	dev-libs/re2:=
-	dev-python/sphinx
-	net-misc/curl
-	sys-libs/zlib:="
-
-RDEPEND="
-	${DEPEND}
-	!dev-db/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
-	"${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
-	"${FILESDIR}"/${PN}-8.0.23-gcc11.patch
-)
-
-S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
-
-src_configure() {
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DBUILD_SHARED_LIBS=OFF
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
-		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
-		-DWITH_MAN_PAGES=ON
-		-DWITH_SYSTEM_LIBS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
-	dobin "${p}"/xbcloud_osenv
-	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
-	# cannot use dolib.so because helper would append libdir to target dir
-	insinto /usr/$(get_libdir)/${PN}/plugin
-	insopts -m 0755
-	doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
-	doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
new file mode 100644
index 000000000000..896af1ba69aa
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+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
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/icu:=
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	dev-libs/rapidjson
+	dev-libs/re2:=
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.26-remove-rpm.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DBUILD_SHARED_LIBS=OFF
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_MAN_PAGES=ON
+		-DWITH_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/xbcloud_osenv
+	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+	# cannot use dolib.so because helper would append libdir to target dir
+	insinto /usr/$(get_libdir)/${PN}/plugin
+	insopts -m 0755
+	doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+	doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/pgFormatter/Manifest b/dev-db/pgFormatter/Manifest
index a85061c5880d..32bf5581fe57 100644
--- a/dev-db/pgFormatter/Manifest
+++ b/dev-db/pgFormatter/Manifest
@@ -1,3 +1,5 @@
 DIST pgFormatter-5.0.tar.gz 1311094 BLAKE2B af9a730e50d09920026dd50794c65e11456c8ea38a6f4793d6bf85d7d3afec37c114f098551c72da25fe1f91bd72845c80f5f0bd96472003d5cba182a0ec5a6b SHA512 0b192c176431eb8c59a30783bc83d5ce2451ee240d08c95ac1cddb899e6c201f01601858db8019a2b967c9d31dcb710da781d06fff694295dba1a623c1c9eb19
+DIST pgFormatter-5.1.tar.gz 1314702 BLAKE2B e6615cc2b2d98bbbff18f6a13694061639566ef96f991fa6cb6c3c43df5fa502d814a965b5cb287675152ddc2990d8170a325bc7cd75d0f5d8b6fb903fc21c71 SHA512 86afb0e77a000145bdcfbd3d5f91c59dc8de3676b4e764a4b86147a52fd7787681b33f4e23a4e0eb9b15e9a24d5b60eb01c90574f59ff5cab2f33489c5f2e91b
 EBUILD pgFormatter-5.0.ebuild 351 BLAKE2B d2f706cd19065bedfe6617990123dad601f4ddcbba57bb73f23d05b741d99927244d46b1e6e5926dfbe4dc58b68841cd92f99640c7da316a984d3aa5b1280166 SHA512 04c860991ddea29ce49fb12d22ca14d13a010b25659909d794b0e359690d4b5b3fe1ff8acb629bcc2abd5b3e9973b2b04b05cec14ef1c4b81abf2f8babe7e3f1
+EBUILD pgFormatter-5.1.ebuild 351 BLAKE2B d2f706cd19065bedfe6617990123dad601f4ddcbba57bb73f23d05b741d99927244d46b1e6e5926dfbe4dc58b68841cd92f99640c7da316a984d3aa5b1280166 SHA512 04c860991ddea29ce49fb12d22ca14d13a010b25659909d794b0e359690d4b5b3fe1ff8acb629bcc2abd5b3e9973b2b04b05cec14ef1c4b81abf2f8babe7e3f1
 MISC metadata.xml 374 BLAKE2B 432a54cc344007b00e8237dcac827f5e03ff702465a493eaf9309b0e192323de3185115e6f94580a11ce2c559ba69296058b1e6661f4dc829a60cca558ed52f6 SHA512 8b028d4713031f3bd90fc241691e902e008442c649272e15e0491927f3f8aed5fce35bc74bc36bd699ee8a3484663598a28d2e56772f1a72cbd2cf2a9a662069
diff --git a/dev-db/pgFormatter/pgFormatter-5.1.ebuild b/dev-db/pgFormatter/pgFormatter-5.1.ebuild
new file mode 100644
index 000000000000..893441f4d1a3
--- /dev/null
+++ b/dev-db/pgFormatter/pgFormatter-5.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="PostgreSQL SQL syntax beautifier"
+HOMEPAGE="https://github.com/darold/pgFormatter"
+SRC_URI="https://github.com/darold/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index 3f0f79c44ded..87df654d811f 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -2,8 +2,10 @@ DIST pgbadger-11.0.tar.gz 1661028 BLAKE2B d83be01017d69b83cf288b23fe5066d5c691b6
 DIST pgbadger-11.3.tar.gz 2297407 BLAKE2B 7e0814c570a3e5fbf79132c99e3134ee944c8239b956d4638a144c551a45b1903a27ee730f93e0dd040c3b8b8c3ec7d1b22228bf2390fa1585f8e4907cb9ae90 SHA512 0af40e68391d6cc783c5895eea01d266bdb22672bd9142e6029ec428f68ee13e0d0deaced4cb80ccd5b608bf04a72a9964c95d2cc9ad933c7412dbf888fc788a
 DIST pgbadger-11.4.tar.gz 2299574 BLAKE2B bb18cd73117ac58330cca2a5f3b525f962d7c0d30a0c28881ff977424dc1ee84f7754a1d4bae200739e60b51015ccad0552573b98d06a3e5932af0056c01ed9f SHA512 c945d6b6fd564640ef9f13fc0927acbed12c4329d05a44e12858a944b3df97677af8c92e62c4572b5e02279ee5d0ce84cf9e66d294f909b4cfcf311e86ba7557
 DIST pgbadger-11.5.tar.gz 2305597 BLAKE2B 1e88e52ac5861343e7122784f3ec1ecc38e67a2737db49a05661de473c990992f924c887eb86e34d3ca80d329c01af4a60893af5436d8a291bbeae0d7fdc0e81 SHA512 ed02066250539d339d5aaaab784522eac37580873e8a5adde5b565cf6d11447fad469cc23b4ab88425b0322521b4ededd1f5a24670b0b9fdbd65aaa31e4e4088
+DIST pgbadger-11.6.tar.gz 2974369 BLAKE2B 2b9e6e03bf785f92864adbfd3d1e6edc4ac899db1172ddc5bcf5c58b072a33b58de68042a3be111fa0f993cbda353742de3e795a7e104e656373b638de6bced9 SHA512 f13c48e3503f17f8d2c37f39409953baf32e87e05ec77e44097648fb5d57f6e6d3e2af45fb703e44d184ea150db80132c868860b5f2cd023911d5fdf8fc6550d
 EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4edbc4e7ed251421c8962223e8357955da642b525b5dea3fa6ae498c46232502a628df04373b28b52b7da6f8f SHA512 f1140736e8be887d864e7579e0da07b5f4f774ad4ed8bb7993c29173ff87735f02e168be4a1d955cfed9dad795b051f5d65eb773b856c35e613096ce26cc2fce
 EBUILD pgbadger-11.3.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.4.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.5.ebuild 454 BLAKE2B e758852aa256bdd32045183aa86c7343d86dcbf31d7485187fc44787baaddb4938e65afba74bf4c8baec01c0beee888253ec7c6b8c283549bba03706f4105dac SHA512 26be2dccf3a75ae34647f5fdb331e244729a6255fca52f0a151f93b1cc4171f0d7399334988910caa2c7acf11c012c4fae38eea4ea30007d2fef3a0e027913c8
+EBUILD pgbadger-11.6.ebuild 452 BLAKE2B 5a99070ded3045c728f2c3b685563088bb475b837f61f1833fd7cf406370d6460a0f0f4c0033c50f5cff5b5a32392caff50fd327fc90270638b5e24cac36672b SHA512 a75bd8e0e601c285e8c44aa975f5bc1df327fea4835d61c054f86236645d9956f040263a2e987f38ae65cc2f3dbf73921cc9621c87302b635d94987e074068b9
 MISC metadata.xml 414 BLAKE2B 42f020ca08e7604b1c1b3e1d19ca62b4a19dc306c733fcd25e4536faf83dc1d6f0f61c2060ebaf8fea33b1818a4d98822e702f4b8b341b2d622e380af39ce535 SHA512 f9ccf0f1896c38e5fef1f51c73abad9b2169166d62ed8ff356d6a2ea7ce8fd253248e99a43286d5fd82a78128c579eea9601e2bb18b51d28fa613c2274de8bde
diff --git a/dev-db/pgbadger/pgbadger-11.6.ebuild b/dev-db/pgbadger/pgbadger-11.6.ebuild
new file mode 100644
index 000000000000..2f2eca6a2b9e
--- /dev/null
+++ b/dev-db/pgbadger/pgbadger-11.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
+HOMEPAGE="https://pgbadger.darold.net/"
+SRC_URI="https://github.com/darold/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+		dev-perl/JSON-XS
+		dev-perl/Text-CSV_XS
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	prove || die
+}
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index dfeb623fedd2..642aad079b05 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,7 +1,9 @@
 DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
 DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
 DIST pgrouting-3.1.3.tar.gz 6057504 BLAKE2B 73bc5d810a2f7bb383ba4fef4ffa52ccb3f21dbc00c68f02665dc459c0e0a2810e0ed10ab73bb3099be5ea6dde86bad884d82039a50c9c4eb423b614845e94b6 SHA512 1051f0a91813ccb3c396c78a059b99839b3352e562372bcc459dfaf289e35ea08bdba8a159032a3df46913548fc717968c187b8c480187497a5b5f7327ca470e
+DIST pgrouting-3.2.1.tar.gz 5940439 BLAKE2B 01f4ec19d4cee9165a5aca946935cf4786a42f943602eca99414b536dec11ffe298f960e11aaa8b747c1b9c1839625ac9d3e7f67f1f606e941c9c738b4970479 SHA512 ead51de138950707008a7ea6b1a18cfe4d8b1885bfe92849464c2714e39f8e43ef3dbebd1c68279987a1321705fe33a598efb463078491d52cb90a8d1a0414c7
 EBUILD pgrouting-3.1.1.ebuild 1085 BLAKE2B ade4fe3dd3bab1eeed0895f5eda363d5b545982f1bd10699851e9c90a800c1dcc5bacf83daa3f34c0a8bb1a5add81bf53bd19757ba69c4e7230e4f0087f6f46b SHA512 8a842e74bed495989a66fef076e1b82998b09b7f5dba2830f09e3e725e1bb2aa84bf09f04fe72f7a28e747685a1f42a505d113ed1e386a6e314c9d15928c73e0
 EBUILD pgrouting-3.1.2.ebuild 1051 BLAKE2B 5132e027be076c8cf6d0c67d3cef0498deb10301ff62bf80b21c15450766ffebc902ac9cd379c475792ca4ae029ec26e1b666323d5bde1d29a05986636de17a5 SHA512 cbc8d0993c880442ceaba79281f545fc8112c083f9f9757642b44d892b2eb5cf4989f36e9ff090ad8ed962c47f11fd4e557cc7f41352eda9779b089ca4ffb0a2
 EBUILD pgrouting-3.1.3.ebuild 1051 BLAKE2B ea909d03b8804308c15803d03c1a73741be77232d14ece6071b25253e253a06baf67940e9403020244ff928f0df36c2b64df922e18efccb2be1641086e072ceb SHA512 6904f83a664765fda6b1f18cebf3a3ba31845a316aba8849c7de3769dfcf69649a4687b58b42db6f24538dd94709494b4c511da102532889f6dff2305d4c43c2
+EBUILD pgrouting-3.2.1.ebuild 1051 BLAKE2B d2e54cedd21d595a30e8e1c751bc6c0b4b0c69a4974007fafd635b481b7de1dac7e47b9b7ee9e301b73f90d6c9da196752197e167ee4e33b9bc09d1338b8897f SHA512 09799270750a6264717477d2aa555de8eadbc13944f1a15b76089a357906f4fa8180ad0cd825bea5b7d0f135cd3431d938d36fb1aee3f116cabce5bc353b75ef
 MISC metadata.xml 375 BLAKE2B e6c25b3d8331162daad5c8cf73b35340bb5092e219d0300be1aa2b36f6d73044b7ddb883cf15e633f8837ef12716a779bfc968112cba418dfed9d106a86ce076 SHA512 b01c3c837b862519087f831bf7ab7de2add4a6fee5b8c7e78b551fe6c4bed59d3f30e7871defe16c25271fdafa5e1d8bc6da250ed22bd1f2476e05fcd3a3d7d0
diff --git a/dev-db/pgrouting/pgrouting-3.2.1.ebuild b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
new file mode 100644
index 000000000000..b7b14cb31517
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+
+inherit cmake postgres-multi
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="https://pgrouting.org/"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+RDEPEND="${POSTGRES_DEP}
+	>=dev-db/postgis-2.0
+	dev-libs/boost
+	sci-mathematics/cgal
+"
+
+DEPEND="${RDEPEND}"
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+	postgres-multi_src_prepare
+}
+
+my_src_configure() {
+	local mycmakeargs=( -DPOSTGRESQL_BIN="$($PG_CONFIG --bindir)" )
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach my_src_configure
+}
+
+src_compile() {
+	postgres-multi_foreach cmake_build
+}
+
+src_install() {
+	postgres-multi_foreach cmake_src_install
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 97dc1c41ff44..1bd155457518 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -15,6 +15,6 @@ EBUILD postgis-3.1.0.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e9485
 EBUILD postgis-3.1.1.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.2.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.3.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
-EBUILD postgis-3.1.4.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
+EBUILD postgis-3.1.4.ebuild 3320 BLAKE2B 7a9497215d6a60d732d73fe2926bfcf0d193365d9deb286d0fa873260830bd3aa84fa2d9d2a9cbaaa386a8701c61eb18d6c18e8baccb78c538ea3dfa38b55302 SHA512 21e5f5cf8733619bd8ac97cb6508eafdb9e21131e4d51c6197a7f9067c74de847614a9dba87c7e7e8498a205575978c1a24137c8774ae1f8399336a72c01d7c9
 EBUILD postgis-9999.ebuild 3243 BLAKE2B b12d44e623a1d57bc6081b6395b85781dc2751ecaa66b854766329b11122157ceaca8ecb0d95a5924f25daf1b2bc2e28cce3487d98373b3d0e9a508ada0a3c52 SHA512 3faf7598a5f029cffe543371c44d82c0943b6672a04722b47bb4be6c6d6c320138e5a11fef38278e1a12947c9a00aeab68bde1c7e080e5e497540baa5717547e
 MISC metadata.xml 683 BLAKE2B c8f073c0062a603f415def147e6beaa4490bd816a5a1896bd1765495d4458af7fb18a324d22af3a7a0a0769f70b8ee1a3b2c3b9ed24d372b1b40fabccd94bd46 SHA512 1d4048815dfd9283745bda6df457906b1a9a14188de595b5ac13785e2e97158a435ad6996a1248946da9eab12057dbc22b4285c832343cb1a2b6f2a206174920
diff --git a/dev-db/postgis/postgis-3.1.4.ebuild b/dev-db/postgis/postgis-3.1.4.ebuild
index a81f3e9072c3..098fa4c328c8 100644
--- a/dev-db/postgis/postgis-3.1.4.ebuild
+++ b/dev-db/postgis/postgis-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..14} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi toolchain-funcs
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index b1eb09017ac7..9747cba8c318 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -20,8 +20,7 @@ DIST postgresql-12.7.tar.bz2 20819005 BLAKE2B 4939cb314253bb9ca2b14639f730967ce7
 DIST postgresql-12.8.tar.bz2 20849478 BLAKE2B 20ad970f03665b9c1f24c646096476398c1791c49eb4f34bb6c3b1c7cf3955bb79ef81e178e5d72ffb91625a9ec1cff409fa95d390caa02862fec2599e6d8a9b SHA512 970fe1041e427ac1c8a786c93e2079b0a9c8b3fcaf9d38877894eb02e8a9afc7cd73d7ac28078c455845a922a1b7d9c1e22cb7990d8d523dd6496af9442fba01
 DIST postgresql-13.3.tar.bz2 21119109 BLAKE2B 395a3dc5cde8f579a3c35ea70346bdc630a8e8f2f86f310a5e4f4a1f6177dab7e78ba6e41c384ba650eb86813fcd428fea8aa22481f9a494cd80aa94bd7b52dd SHA512 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60
 DIST postgresql-13.4.tar.bz2 21157443 BLAKE2B e16684ef59f213d23366e8d18c4bf6f81d6e2eac8e940449fee1ef6b150e7ff7d3dce8831b318d1fd3f72d642110576ebc7bd981185a39f19fea6357c58be170 SHA512 f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a
-DIST postgresql-14beta3.tar.bz2 22584314 BLAKE2B f89e5395a2a1f704baea1e864ee1576b6646dabf30d90e5da2c082f6a1d977c9dd7ac2683690e1071f84e062be19b4906895a165b0a4a6c57f57367a21821adb SHA512 a84c81095945d71f9720a2d4e3f0a93887ef06b6d6b2b5bf5c90a4cee9df7990ed081cd90de22ea660bab2e79eb05dfe5da849d175b75037874f069dc28a9cfd
-DIST postgresql-14rc1.tar.bz2 21844937 BLAKE2B a819d1cd9abb698120d86a4a1e5c74fe3180ee453561ad2f8bd23602294f4ab040c63ca9716f53d82e7c7424aec4716b39abc44f67877c68ac684375dc504d95 SHA512 9a68fef03efdb0152adf9a0daf58a49f69b8373d0f3378a8ce2632743e4078da9816c039ed18cd102f2ac759bae381049d37aa70dbba7ab5790fbe5a9076a82f
+DIST postgresql-14.0.tar.bz2 21836842 BLAKE2B a1b4676f861246125428cc943a8e6d4eebd230a8a6d3bf202819e58233c5ee790339d6bc319f3d7af6f95f177236bf5fabc0e48350aaca024c61c88ddae2600c SHA512 d0b5ea1bb63847a137216074f2ac2d1410723c61c279624b3034af4a130fe0e1b6d89a549c61065f025c3505af89bcd9728b04575fde2c932fa718813d2e9635
 DIST postgresql-9.6.22.tar.bz2 19003741 BLAKE2B adff6e81ec4b289bd5c51fa44adb38d7cc3936e2e5545ff23fccb0f3f1fe1c881ed70f9a0a5d366319f876eb01a9f675b66c9374b8b41615220f45a70450ad6d SHA512 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b
 DIST postgresql-9.6.23.tar.bz2 19013235 BLAKE2B a7bd7a0678c2c58efd71f320f838ee66fa3d75fb37d95e1c070e59ece69d4b66850e676054807848dbccedca7e9a4cc0b244c3cf0f0ff039b88c4f9b221e8819 SHA512 205b47cf1c22519092f840a9b3bf6bdf95f455e5ba02a7e1bc1495f85bb25f8ccfe9f60c83dc2801f1366b88fc35e64c23eb9bdc89a4bb5d233243af4606d59c
 EBUILD postgresql-10.17-r2.ebuild 13662 BLAKE2B b4b813cfae66157cc760f7e117ce2bbd9c9f9c42030771ace9693355e1ba3d284871fb948ed0e7ee32c3e563e6085629f4192ba8d9593c42a3838590de6452a0 SHA512 46c5f06bded85409d65fc3eda42d677f6b052f0bbc6795722371504d4e192bb5b87282703d924e8c34e7a1ac19df2fe33af2818b16fd0037609b424ea4f41374
@@ -32,8 +31,7 @@ EBUILD postgresql-12.7.ebuild 13565 BLAKE2B b4a8005b07b3cf5844bb46635216539d6740
 EBUILD postgresql-12.8.ebuild 13573 BLAKE2B 89bb2fc7bdc44292f5b6e8e96af7de709c3d4eb2c112d6500d77f9fdf0f18870235adea2000f1e0e07fe5426a106e74613c19652e1b51a9bb38df02e0a8b3917 SHA512 fb73604bdab1d682b73a1f9ba29fed365bb50336a8ddb88e13bb5f9e13d7c49b791638ec553101413b8a5383b51ea045b3a9b04952e8315ac617bf58d54d467a
 EBUILD postgresql-13.3.ebuild 14003 BLAKE2B 817538787d5eba96afd490e70a5e6873b117e676485241a71d031dd12675b0473f352bd0a2de059e2ab1d265656089f82081e65d87d18c44888717b8e2061e30 SHA512 24c9210237529014350517937e7c11dbe37e41cc9998bbc8a04c85c2e16d9f54742d801c5adac7a3dc4d1d3c4b6b992e0e61b79bded03e5e78c1fae244ec7367
 EBUILD postgresql-13.4.ebuild 14011 BLAKE2B 08da204eb66c48cc2b3596b636302bc044c7d8cfac5c73c003055a4373ae0612841ae2b546ba01c2d257cbb5944fd58b0e211d9a8e78288104a9bede1da8edcb SHA512 9530bdaa11c74ff2d96f8c3c737ad226896b39f10ca9ed182166dac2f38158436f4cc9e4ac3d4aaa82e63d06731dfc9c104acc1f2dc897b5d089c1be053b8ff8
-EBUILD postgresql-14_beta3.ebuild 13873 BLAKE2B c32979bda123d588d78f6c0efa6d48d0901b7427b8af98d4601bde742f782af2ae29cd4270026894dbb237408dbe68a3f22ef00d3049bb3b54df3f4dc7033111 SHA512 20c6039ed3cd568d0de898a152985caa0d91394df30b1e7768ca6d39818b48845069404a8f5ca8d536a140382c64090c0fdf9adf3a2b5cc1df1829d6bbdf78ea
-EBUILD postgresql-14_rc1.ebuild 13815 BLAKE2B 9d9f77ecb33410ec9b7a33acff52ad865c0048b479befe6b5f6a1a311426357b963519f0766ac28fca69263ecca82003c3d92153e45cf6bceb0e454cc025d851 SHA512 947f4f907a4e08542d96e4167e05aab4a2188898e7df1383a62374709e1608d11e9ba8e519a40fc0c25623544ffa6b823efacfeb6e06b48d766250ad13c46fe9
+EBUILD postgresql-14.0.ebuild 13999 BLAKE2B 82543108a4cedf363b6218f9aa028295840e6817d39aead26739d009b9b37acc354005e3962e923952f50b8237272554e9409adfe77f1f1eafcf80364070104e SHA512 829f5cfac6482b6ee39bc2c640f84d7b9beaf9c49034290a35a7d297ff045ccb16c369fd17d1551b62a1b2236735a59138727c076a894295c76322335b72bf9b
 EBUILD postgresql-9.6.22-r2.ebuild 14531 BLAKE2B 6e4bebfaabd74d9e4b07a98797bb79faadb36f067a48966c0f2e6fd933422e14199e579078503aa940225309d5c2846ec724788d76b4483fd87c3fe2aa81407f SHA512 c6b49704e3e971ca772e6365501a0567c7bcba3fd6182800ff57f319481726acadf45334fa6e80fe3ad2db9bc80afb86630cbccb5449a0741ef52524eb70b5d0
 EBUILD postgresql-9.6.23.ebuild 14539 BLAKE2B 7680f6ee9db7cf9bae2dc1e12ae69ceee557dbf8e44fece0777c9ee57936eb7df68866b1064c1e1bb4dd7966c527c8a93e6e0b311c29d7b3f70a212b1e163181 SHA512 613d9ca39bd38b858256a9f475ad3b5d235bbc502b8f8126b9b5c4fe7cf12e1f3b0b0af36bd3ea222037fbf73335550cf82a8c8c4589fdf99f068acd651a3b0e
 EBUILD postgresql-9999.ebuild 14253 BLAKE2B 0555ea0a5b1734e58797184590e0102a1e000879879965a3e7933681c7b8e665567a14a1d5d35eb070b5eb56c2416ccc7590f9270260884b77af57ce6b09e831 SHA512 1f643d1456c3ac6570539a04a4839221c360f389567f618e193dc647d5cd5b50403ab74afda3d48811717edf52d548a03c27e65e47ae7514a715432a906d487f
diff --git a/dev-db/postgresql/postgresql-14.0.ebuild b/dev-db/postgresql/postgresql-14.0.ebuild
new file mode 100644
index 000000000000..37c02e4857a7
--- /dev/null
+++ b/dev-db/postgresql/postgresql-14.0.ebuild
@@ -0,0 +1,467 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+lz4? ( app-arch/lz4 )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	local myconf="\
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with lz4) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)"
+	if use alpha; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-14_beta3.ebuild b/dev-db/postgresql/postgresql-14_beta3.ebuild
deleted file mode 100644
index 7cf4067cc08d..000000000000
--- a/dev-db/postgresql/postgresql-14_beta3.ebuild
+++ /dev/null
@@ -1,469 +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,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS=""
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-14_rc1.ebuild b/dev-db/postgresql/postgresql-14_rc1.ebuild
deleted file mode 100644
index 2d16338b8439..000000000000
--- a/dev-db/postgresql/postgresql-14_rc1.ebuild
+++ /dev/null
@@ -1,467 +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,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS=""
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 4fb2fab29600..7f69b9b9fe5a 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -5,6 +5,7 @@ DIST timescaledb-2.1.1.tar.gz 2534361 BLAKE2B d0aa5b231cbc9a75bb65eae395ffc0063a
 DIST timescaledb-2.2.1.tar.gz 2637225 BLAKE2B 4ab37bb5c45a3f7550c2694c8757fff3e8dafe122aa9aea1e31d33931367b6b6bf8aa190444cd9472c3ba0aed087fa68d007ce52de24c78add3a53038a1d24ef SHA512 5dae0ed0b71309598bfc9605e838f2d8b4179ccf7098396315153c4044c7bdaaa411fd11ee70ca7807afde4b609faab281dcb1aa2f8d65330ca95e13fbe24582
 DIST timescaledb-2.3.1.tar.gz 2699256 BLAKE2B 5949245d4a2bf52558b3f646d3723b0571745226fcc0de236c21ad7f32316eaeb0780aa94f8ccacd420cd0b0e47c8e048172b9f9355cf01797398b7f2fc85a6a SHA512 431f716ecd98504ce8e5b85e6fd10bf87ed39aac0244b7e968383537caae965ece09f016fed8ea010f5d42b392aed2d75b012deafd807d107f3dc75cbde287ec
 DIST timescaledb-2.4.1.tar.gz 2401410 BLAKE2B 752d484b03a59cde22f295d47a90d05bfc0674428dd2d03152dbf6604e10c0fb6780815666f65f4d2df58075f7911636c13a671504eed78642e211ceda8aba3d SHA512 54baced28eb20aa14c78605ce7828f7c48210125d9193c3e1c88e9ae81616b2baf37a1eb97c5eb0ddc9b6820d534d134ad047f3c7ace374e29191a42142f35a1
+DIST timescaledb-2.4.2.tar.gz 2409324 BLAKE2B 387f8ba3f446af227e7bd578177a6391c6ad6b1f889eb305499dc420805ad84041bf09b48cf7087727a5d111a7b374a5a5b9b83c0c97a69dc09d9c2c5d3ee9ca SHA512 56a0ff981e7374e2845d949c5bde2f157063b36cb7f9c54c6627c35ae8a8a5e5a3637fb66c6fd5c61a25b86f80a204ab7a6071b9705646bfee6a9b252c805b2d
 EBUILD timescaledb-2.0.1-r2.ebuild 1395 BLAKE2B 617efa50243741f6b6d561d1d3af2742edd1a0867dbb6255823dbe06f5e7c9cdf816d8dd233ab086b1c26dfe60249df80efc609aa3466714319ffdf6ad918cd4 SHA512 16577d3c60d150126693a73825cdda0bfd93d6cb2edf9a66473c524147744c3be0c717152668eef0d6158937f840eacc27ba5974b73f32794261a4b0292dca5b
 EBUILD timescaledb-2.0.2-r1.ebuild 1395 BLAKE2B 617efa50243741f6b6d561d1d3af2742edd1a0867dbb6255823dbe06f5e7c9cdf816d8dd233ab086b1c26dfe60249df80efc609aa3466714319ffdf6ad918cd4 SHA512 16577d3c60d150126693a73825cdda0bfd93d6cb2edf9a66473c524147744c3be0c717152668eef0d6158937f840eacc27ba5974b73f32794261a4b0292dca5b
 EBUILD timescaledb-2.1.0-r1.ebuild 1398 BLAKE2B a97e063bc73af8d2062acff17b7e6019d65d23241dc00cc6a4bc2d2322e2e16f1b2890f4779ea350aed86a5e3ab871b53cfb5cd04443377a635d4a1cf9d2ddf9 SHA512 599c54854e0f0e4c83740f4af9f316bf1c3ddab3b142030aee242cc13843fca061c6a947bec5cea84885e0388a23e6efefffab75c2ffa10c8b98a7cbaf323a8d
@@ -12,4 +13,5 @@ EBUILD timescaledb-2.1.1-r1.ebuild 1398 BLAKE2B a97e063bc73af8d2062acff17b7e6019
 EBUILD timescaledb-2.2.1-r1.ebuild 1432 BLAKE2B cac2105c56b96160662c395e5690d7474a776200ed33fc7c05f0e305d8db22cb0dd1e2bdc1709410d825c960aa9cb3e278f633e78fc75a57983396ac4df3523f SHA512 154b0556d5abb8a6a4cbe82383689b98e81b8c93626b0a197cee7d0b1876407829366145dd2ec18a8f373d26fcdc5f20470ed492182cb5cfcafa2cad269f9e9d
 EBUILD timescaledb-2.3.1.ebuild 1432 BLAKE2B cac2105c56b96160662c395e5690d7474a776200ed33fc7c05f0e305d8db22cb0dd1e2bdc1709410d825c960aa9cb3e278f633e78fc75a57983396ac4df3523f SHA512 154b0556d5abb8a6a4cbe82383689b98e81b8c93626b0a197cee7d0b1876407829366145dd2ec18a8f373d26fcdc5f20470ed492182cb5cfcafa2cad269f9e9d
 EBUILD timescaledb-2.4.1.ebuild 1432 BLAKE2B cac2105c56b96160662c395e5690d7474a776200ed33fc7c05f0e305d8db22cb0dd1e2bdc1709410d825c960aa9cb3e278f633e78fc75a57983396ac4df3523f SHA512 154b0556d5abb8a6a4cbe82383689b98e81b8c93626b0a197cee7d0b1876407829366145dd2ec18a8f373d26fcdc5f20470ed492182cb5cfcafa2cad269f9e9d
+EBUILD timescaledb-2.4.2.ebuild 1432 BLAKE2B cac2105c56b96160662c395e5690d7474a776200ed33fc7c05f0e305d8db22cb0dd1e2bdc1709410d825c960aa9cb3e278f633e78fc75a57983396ac4df3523f SHA512 154b0556d5abb8a6a4cbe82383689b98e81b8c93626b0a197cee7d0b1876407829366145dd2ec18a8f373d26fcdc5f20470ed492182cb5cfcafa2cad269f9e9d
 MISC metadata.xml 424 BLAKE2B 8cbf1315da7aa52b81fb2b141d7d34100cd838667ec366ba000fb914251cddd35632d9f9b8f6200bf4b679683db9c487522d18bedb4b371f92651c26a3e6121b SHA512 8e8b90dec46092f8d7dd36e67fa000e3f4c108f80903ebd3dad4965bbb4797bf952208afa7e90646946207382547fdd59d4d282379a898a3121b91f86e090c20
diff --git a/dev-db/timescaledb/timescaledb-2.4.2.ebuild b/dev-db/timescaledb/timescaledb-2.4.2.ebuild
new file mode 100644
index 000000000000..eba5dbffb770
--- /dev/null
+++ b/dev-db/timescaledb/timescaledb-2.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
+	if ! use proprietary-extensions ; then
+		mycmakeargs+=("-DAPACHE_ONLY=ON")
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 2e7ce9150097..4733f93435c8 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/stm32flash/Manifest b/dev-embedded/stm32flash/Manifest
index 18cf1843edfd..0077e1a3384d 100644
--- a/dev-embedded/stm32flash/Manifest
+++ b/dev-embedded/stm32flash/Manifest
@@ -1,3 +1,6 @@
-DIST stm32flash-0.5.tar.gz 41087 BLAKE2B 581ef883537783fafcff8a7471a697f50929b572d847791d692799040fd54845a67a7b6b608401df24f05810ae81b7e19df646f2835bc3d7cd35888d8649be6a SHA512 a01875a315d92d5e347372b736f2afa2f633851bf13af1326341c0c91e17cef54b6730ed1279280e86d3797033c856dfc25e8c595e010772b9287aaf965273f9
-EBUILD stm32flash-0.5.ebuild 493 BLAKE2B 005d32677b1960a3cf928df51c938063fb0cf80433eb6023853cdc3715d69c7d63294d61e9548589b52fdbc1fd1d8596cd1c049f6e736dd8c7f92c3dc4d0dc0c SHA512 b06eb6106ea672cccb75c4d75f4ef77ea1cafecb8d30d72376a77971d0c806e5005549e01cba9e9359d6632e5e1d0b58bd040b3225e145a235a867cad963e8a6
+AUX stm32flash-0.6-fix-i2c-erase-01fbb65.patch 897 BLAKE2B 1b0885926d95c828dfa3ae04050ce7c1b4a10cac22e0d33776a2ab2e2e32fbdce825d05dd21dcbecc60a4bd88e7b302103b7809e999084bc881b724dce56c2a4 SHA512 3646b737bdd8d7f1ad750d230b6d975a92557f3204261b8637aaef75fad311c6b43717c4a989e23d566a9d37c4a464a8ef0736acee1e2be15683f2c8d17bb07e
+AUX stm32flash-0.6-fix-i2c-erase-17a24f8.patch 2355 BLAKE2B 450e7bf2da49e38eeeabfb380ef6f30bf8154226ed12e0392dd00a01cd37e423957a37d63ebcb35ddebbd84899b07f0ed730e8bd79b2e8eacf9594757e917afc SHA512 b97d2a303a218622587e08a369e5971d4df4502f0088b10746d97ed4950a44460e5856d51ad90f787975d701a0166b0f15718e8e05b35755e4a4b9b92d0bcab0
+AUX stm32flash-0.6-fix-i2c-erase-b079cd0.patch 3165 BLAKE2B a3a6c78bfae85e3fad0c8e4d8a7f2b0759d5baac7c1001c5f45dac012258f9fa05f1c8191e58a424e3462d6b24a8dacf4ca761ccb952522e4d8eade93a2824f5 SHA512 a1619ab49943047b47a6e96137a9157dffbeb43d06b801642c6c822427cd86ea6025dfea4d202d7998c062309f33a04802d08e8c13fbeae059de979e80a2d7d6
+DIST stm32flash-0.6.tar.gz 376186 BLAKE2B 82e479b4fad2c3ff832aea9d0d62d556500fd8c0530e879690b9b83cdf05f078b0051e1e104e7cb64b9c360ef84415904639ee67ee147045ce8e15ca3f6c61e1 SHA512 2d92ecf4f82b8a702b596cbf3c4ff594f67083f7dcec82c064555f73b47834b41a918efa1846e47fc8740ae63fa818b16dfb5b38fa242c17f465666a651eee3a
+EBUILD stm32flash-0.6.ebuild 658 BLAKE2B 0d049260fd53fc849f8397a0206acfa29f73b0fda1dca319cc42ff8f1693ace469c78db663615b5e844f0a390affad7e689a8b2081c2c6c5828d4beae7b8692f SHA512 084e3b2e0874a7a0fb31f12fd9a056bbc9e1add8f4d28d045f93e191e74dc567c0918b3955cc882ff9184e597050d3ff552f6529a17000872f2243afc7c03b0d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch
new file mode 100644
index 000000000000..c4c7a2a7fedc
--- /dev/null
+++ b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch
@@ -0,0 +1,28 @@
+From 01fbb65d4626e1c122e329075526bd6035cb0be6 Mon Sep 17 00:00:00 2001
+From: Tormod Volden <debian.tormod@gmail.com>
+Date: Thu, 2 Sep 2021 16:25:57 +0200
+Subject: [PATCH 06/15] stm32: Fix typo from recent commit
+
+Oops, I got this wrong while amending commit b079cd09.
+
+Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+---
+ stm32.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stm32.c b/stm32.c
+index 6e2e402..0edaf01 100644
+--- a/stm32.c
++++ b/stm32.c
+@@ -851,7 +851,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 		buf[i++] = pages - 1;
+ 		cs ^= (pages-1);
+ 		/* For I2C send a checksum after the number of pages (AN4221) */
+-		if (port->flags && PORT_NPAG_CSUM) {
++		if (port->flags & PORT_NPAG_CSUM) {
+ 			buf[i++] = cs;
+ 			p_err = port->write(port, buf, i);
+ 			if (p_err != PORT_ERR_OK) {
+-- 
+2.33.0.309.g3052b89438-goog
+
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch
new file mode 100644
index 000000000000..e0b519c48413
--- /dev/null
+++ b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch
@@ -0,0 +1,65 @@
+From 17a24f873122b96481adefaadc128bd1abba594f Mon Sep 17 00:00:00 2001
+From: Tormod Volden <debian.tormod@gmail.com>
+Date: Sat, 21 Aug 2021 13:06:34 +0200
+Subject: [PATCH 02/15] stm32: Consistent and unique erase error messages
+
+Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+---
+ stm32.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/stm32.c b/stm32.c
+index 82fa26a..e071905 100644
+--- a/stm32.c
++++ b/stm32.c
+@@ -797,7 +797,7 @@ static stm32_err_t stm32_mass_erase(const stm32_t *stm)
+ 		return STM32_ERR_OK;
+ 	}
+ 
+-	/* extended erase */
++	/* extended erase (0x44 or 0x45) */
+ 	buf[0] = 0xFF;	/* 0xFFFF the magic number for mass erase */
+ 	buf[1] = 0xFF;
+ 	buf[2] = 0x00;  /* checksum */
+@@ -870,11 +870,12 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 		p_err = port->write(port, buf, i);
+ 		free(buf);
+ 		if (p_err != PORT_ERR_OK) {
+-			fprintf(stderr, "Erase failed.\n");
++			fprintf(stderr, "Erase failed sending list of pages.\n");
+ 			return STM32_ERR_UNKNOWN;
+ 		}
+ 		s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT);
+ 		if (s_err != STM32_ERR_OK) {
++			fprintf(stderr, "Erase failed.\n");
+ 			if (port->flags & PORT_STRETCH_W)
+ 				stm32_warn_stretching("erase");
+ 			return STM32_ERR_UNKNOWN;
+@@ -882,7 +883,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 		return STM32_ERR_OK;
+ 	}
+ 
+-	/* extended erase */
++	/* extended erase (0x44 or 0x45) */
+ 	buf = malloc(2 + 2 * pages + 1);
+ 	if (!buf)
+ 		return STM32_ERR_UNKNOWN;
+@@ -925,13 +926,13 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 	p_err = port->write(port, buf, i);
+ 	free(buf);
+ 	if (p_err != PORT_ERR_OK) {
+-		fprintf(stderr, "Page-by-page erase error.\n");
++		fprintf(stderr, "Extended erase failed sending list of pages.\n");
+ 		return STM32_ERR_UNKNOWN;
+ 	}
+ 
+ 	s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT);
+ 	if (s_err != STM32_ERR_OK) {
+-		fprintf(stderr, "Page-by-page erase failed. Check the maximum pages your device supports.\n");
++		fprintf(stderr, "Extended erase failed. Check the maximum pages your device supports.\n");
+ 		if ((port->flags & PORT_STRETCH_W)
+ 		    && stm->cmd->er != STM32_CMD_EE_NS)
+ 			stm32_warn_stretching("erase");
+-- 
+2.33.0.309.g3052b89438-goog
+
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch
new file mode 100644
index 000000000000..dcd7299570c5
--- /dev/null
+++ b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch
@@ -0,0 +1,103 @@
+From b079cd09bc942b4a489cad29524418441a44fc82 Mon Sep 17 00:00:00 2001
+From: Yann Sionneau <ysionneau@kalray.eu>
+Date: Wed, 28 Apr 2021 14:16:01 +0200
+Subject: [PATCH 01/15] Follow bootloader protocol for page-by-page erase over
+ I2C
+
+For I2C the protocol is slighly different than for USART,
+requiring a checksum after the number of pages.
+
+https://sourceforge.net/p/stm32flash/tickets/98/
+
+Signed-off-by: Yann Sionneau <ysionneau@kalray.eu>
+[Tormod: Add port flag, no wait, amend messages]
+Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+---
+ i2c.c   |  2 +-
+ port.h  |  1 +
+ stm32.c | 37 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 39 insertions(+), 1 deletion(-)
+
+diff --git a/i2c.c b/i2c.c
+index bb99545..8425b41 100644
+--- a/i2c.c
++++ b/i2c.c
+@@ -204,7 +204,7 @@ static port_err_t i2c_flush(struct port_interface __unused *port)
+ 
+ struct port_interface port_i2c = {
+ 	.name	= "i2c",
+-	.flags	= PORT_STRETCH_W,
++	.flags	= PORT_STRETCH_W | PORT_NPAG_CSUM,
+ 	.open	= i2c_open,
+ 	.close	= i2c_close,
+ 	.flush  = i2c_flush,
+diff --git a/port.h b/port.h
+index 4e728d7..1a28dc6 100644
+--- a/port.h
++++ b/port.h
+@@ -34,6 +34,7 @@ typedef enum {
+ #define PORT_CMD_INIT	(1 << 2)	/* use INIT cmd to autodetect speed */
+ #define PORT_RETRY	(1 << 3)	/* allowed read() retry after timeout */
+ #define PORT_STRETCH_W	(1 << 4)	/* warning for no-stretching commands */
++#define PORT_NPAG_CSUM	(1 << 5)	/* checksum after number of pages to erase */
+ 
+ /* all options and flags used to open and configure an interface */
+ struct port_options {
+diff --git a/stm32.c b/stm32.c
+index 966048b..82fa26a 100644
+--- a/stm32.c
++++ b/stm32.c
+@@ -843,6 +843,25 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 
+ 		buf[i++] = pages - 1;
+ 		cs ^= (pages-1);
++		/* For I2C send a checksum after the number of pages (AN4221) */
++		if (port->flags && PORT_NPAG_CSUM) {
++			buf[i++] = cs;
++			p_err = port->write(port, buf, i);
++			if (p_err != PORT_ERR_OK) {
++				fprintf(stderr, "Erase failed sending number of pages.");
++				free(buf);
++				return STM32_ERR_UNKNOWN;
++			}
++			s_err = stm32_get_ack(stm);
++			if (s_err != STM32_ERR_OK) {
++				fprintf(stderr, "Erase failed, no ack after number of pages.");
++				free(buf);
++				return STM32_ERR_UNKNOWN;
++			}
++			cs = 0;
++			i = 0;
++		}
++
+ 		for (pg_num = spage; pg_num < (pages + spage); pg_num++) {
+ 			buf[i++] = pg_num;
+ 			cs ^= pg_num;
+@@ -876,6 +895,24 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
+ 	buf[i++] = pg_byte;
+ 	cs ^= pg_byte;
+ 
++	if (port->flags & PORT_NPAG_CSUM) {
++		buf[i++] = cs;
++		p_err = port->write(port, buf, i);
++		if (p_err != PORT_ERR_OK) {
++			fprintf(stderr, "Extended erase failed sending number of pages.");
++			free(buf);
++			return STM32_ERR_UNKNOWN;
++		}
++		s_err = stm32_get_ack(stm);
++		if (s_err != STM32_ERR_OK) {
++			fprintf(stderr, "Extended erase failed, no ack after number of pages.");
++			free(buf);
++			return STM32_ERR_UNKNOWN;
++		}
++		cs = 0;
++		i = 0;
++	}
++
+ 	for (pg_num = spage; pg_num < spage + pages; pg_num++) {
+ 		pg_byte = pg_num >> 8;
+ 		cs ^= pg_byte;
+-- 
+2.33.0.309.g3052b89438-goog
+
diff --git a/dev-embedded/stm32flash/stm32flash-0.5.ebuild b/dev-embedded/stm32flash/stm32flash-0.5.ebuild
deleted file mode 100644
index c1e17f12ab38..000000000000
--- a/dev-embedded/stm32flash/stm32flash-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader"
-HOMEPAGE="https://sourceforge.net/projects/stm32flash/"
-SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-embedded/stm32flash/stm32flash-0.6.ebuild b/dev-embedded/stm32flash/stm32flash-0.6.ebuild
new file mode 100644
index 000000000000..48e734463267
--- /dev/null
+++ b/dev-embedded/stm32flash/stm32flash-0.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader"
+HOMEPAGE="https://sourceforge.net/projects/stm32flash/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-b079cd0.patch"
+	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-17a24f8.patch"
+	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-01fbb65.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
index 404a1941f1b3..58e1c7bf0207 100644
--- a/dev-embedded/usbprog/Manifest
+++ b/dev-embedded/usbprog/Manifest
@@ -1,3 +1,4 @@
+AUX usbprog-0.3.0_p20140828_versions.xml.patch 837 BLAKE2B b3b13f0292dbaa245c3a43894e66034c5de697c4afac16689658bbf43ecb410590cd59f03607f0dcabf957e4bbe54ef60b25b20f0ba20f17442c8cf4999f83a0 SHA512 d863f34f8e7542f8783030016c7be003af73b6e85aa533b210b4cda61975b17f56ca516b4971c9c8133cbda31ef1e6ea8eb153697acf0b62fb1c584ea17a43da
 DIST usbprog-0.3.0_p20140828.tar.bz2 4211124 BLAKE2B b0b1341e34f6f8c5b59925d115be0c45ce12d69d57a330fd111ce41a8f584f68548485f713ee6386e01facd4b7bf7c86e397194c4202ceda226bf912d94ab079 SHA512 fbc4e4edda36c5633f8459723d147bc02a211ef35d409b9a412ce901f3be1ac59f8183caf2a4f93cbe51b9807f7012986e12274167102fb5d84246f23712cca2
-EBUILD usbprog-0.3.0_p20140828.ebuild 1017 BLAKE2B 7cdc6b7415189f9b6e3867dc4f0b1448c12f2f696bd51ef259e415505a54dcb69b18070b4d7fa6bd4a948e05c7837a5b7b784a47a94a484a46ec73ba750eb50b SHA512 d39e058faf3d664a70ae4d3323fd693bc889d4fa79c69e27f1af3ce33df9448e02e0504faf5250f12de5b6bef86ddbc7fa7f2dd3301697e71d69f29657968759
+EBUILD usbprog-0.3.0_p20140828-r1.ebuild 1179 BLAKE2B 2b557db72401710dcda13ab428ff89a3ad762b005e9baa0902f1d2965dc14d9aae74cccd1ea90f023d0e6082cce54d0060249de88e3ff414c25a3b23e3de4476 SHA512 e6221d731929f4519dbc7cf29935409a413e4e635485179acfe93689b73ac1863f3069a3aa1ac02fec5167e78cc68d92076663fb4e22d222e88983b7b9e64f64
 MISC metadata.xml 333 BLAKE2B 2a5f58a2a0d8672b8aebf5533a0f938ca904f3029bdb82e7de9f8468b36376fe6757c770860fd752659ca52b86028831c2356351767f36fb1c9e82732ceb5285 SHA512 b5992d9c2011333c6ca95a607aabb9ce00e912b1427aed6008f411fc55fe48bbaf33b9649fcc07a69970b64a09b631381baa812af180112151e7118e8cabe74a
diff --git a/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch b/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch
new file mode 100644
index 000000000000..dd3a002d825a
--- /dev/null
+++ b/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch
@@ -0,0 +1,28 @@
+From 031cc8495ef5008e744bc3bf1e970e894083d1a1 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Mon, 26 Jul 2021 19:50:25 +0300
+Subject: [PATCH] Replace URL for versions.xml
+
+Replace versions.xml URL to
+http://www.aaabbb.de/FirmwareUsbprog/versions.xml as only one viable
+source for firmwares.
+---
+ usbprog/usbprog.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usbprog/usbprog.h b/usbprog/usbprog.h
+index 38d069e..35dc86b 100644
+--- a/usbprog/usbprog.h
++++ b/usbprog/usbprog.h
+@@ -26,7 +26,7 @@ namespace usbprog {
+ 
+ /* Preprocessor definitions {{{ */
+ 
+-#define DEFAULT_INDEX_URL       "http://www.ixbat.de/usbprog/versions.xml"
++#define DEFAULT_INDEX_URL       "http://www.aaabbb.de/FirmwareUsbprog/versions.xml"
+ #define AUTO_NOT_UPDATE_TIME    10
+ 
+ /* }}} */
+-- 
+2.31.1
+
diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
new file mode 100644
index 000000000000..93073fc987fa
--- /dev/null
+++ b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+REV="293d559bac55"
+
+DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
+HOMEPAGE="http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php https://bitbucket.org/bwalle/usbprog-tools/src/master/"
+SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui minimal"
+
+RDEPEND="
+	!minimal? (
+		gui? ( dev-qt/qtwidgets:5 )
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		sys-libs/ncurses:=
+		sys-libs/readline:=
+	)
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/bwalle-usbprog-tools-${REV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}_versions.xml.patch"
+)
+
+DOC_CONTENTS="
+Please visit http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php
+for additional info.
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ONLY_CORE=$(usex minimal)
+		-DBUILD_GUI=$(usex gui)
+		-DUSE_QT5=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828.ebuild
deleted file mode 100644
index fe1b71567d2e..000000000000
--- a/dev-embedded/usbprog/usbprog-0.3.0_p20140828.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 readme.gentoo-r1
-
-REV="293d559bac55"
-
-DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
-HOMEPAGE="http://bwalle.de/website/usbprog.html https://bitbucket.org/bwalle/usbprog-tools/src/master/"
-SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt5"
-
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-	)
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/bwalle-usbprog-tools-${REV}"
-
-DOC_CONTENTS="
-Please visit http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php
-for version.xml.
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GUI=$(usex qt5)
-		-DUSE_QT5=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index e877af665ca0..703ce4922161 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
index 2afdd4adaae0..94908e24bf6c 100644
--- a/dev-haskell/edisoncore/Manifest
+++ b/dev-haskell/edisoncore/Manifest
@@ -1,4 +1,4 @@
 DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
 DIST edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
-EBUILD edisoncore-1.3.2.1-r1.ebuild 1062 BLAKE2B 528e9ff75dc24cd532f473271b92c02f8251b01d0ba5e6dfdaa65ef9c00288677afa15617ba977b3d93f6fd5c5d8b0c57b3d0c2fcbc5c177e589f6a049406b44 SHA512 5d0deb39b003252d926f3342763bdc16da21c423ef6ef015a5a2653331c783cada3f47088ab5b825ccd37efcd7ff3c250ae0991540fba347b0174415590ec6ef
+EBUILD edisoncore-1.3.2.1-r1.ebuild 1059 BLAKE2B fb24c1bdcaa90fedbad17242d672fe0c8dea9dfcf454fdc7f117a7bdbbd66f0beb37913ff189d58900ba22df3d9744d2844c7825819140328525a02fec86468b SHA512 47da17a839f1c0e27952d6791615e380a8207adc2968ca4b18ae4855b01a0d292f344b8d97a418c60cea1bb27727114040cd683a599856c5e96be775aa68abcf
 MISC metadata.xml 605 BLAKE2B cd8c4113d16c4e3b2db24f51bfeca0a3ac95c9a0c3da525478b178627eb7a6aee768ded6a8b9c2d1c3808bb52c434206c618c12e3846915291575e068ab04687 SHA512 5c47b36e7159c7d0f7430b82c5dea0c473864b2308cfd3cb616fbc5e84a482c5f8cacda7c9a20b873a708ebaceece2b22f060381f352b1ef2ba843a4ff976d6f
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
index c2550f9bba98..7dfca738778e 100644
--- a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
+++ b/dev-haskell/edisoncore/edisoncore-1.3.2.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
@@ -15,7 +15,7 @@ DESCRIPTION="A library of efficent, purely-functional data structures (Core Impl
 HOMEPAGE="http://rwd.rdockins.name/edison/home/"
 SRC_URI="
 	https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~slyfox/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
+	https://dev.gentoo.org/~sam/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
 "
 
 LICENSE="MIT"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d962ac5bc87a..09309a8a066c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk-bin/2 b/dev-java/openjdk-bin/2
new file mode 100644
index 000000000000..e12c387ddb3d
--- /dev/null
+++ b/dev-java/openjdk-bin/2
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local os=linux
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups +gentoo-vm headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		>=sys-libs/glibc-2.2.5:*
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break"
+		ewarn "many java ebuilds as they are not ready for openjdk-11"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index d68d96ef013f..f7f778fe81db 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,8 +1,10 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
+DATA 2 3604 BLAKE2B 0849e85bae2bdd6a583fda88f0b3ae1dd4c8700eb3578e6abd6834131940302af402d633749204a173b36dd484486b9a697c5d7d50a90d81956b6ac591906650 SHA512 c11400ae1db514019262a9768ce68fb3536338755d2dde118bd19e6ff5f4f23ae101ce0b0d5b18111ca3aab6778f13ed4ae8d10dfbf6e6b1ffe1c55c4d318249
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz 189549576 BLAKE2B 9eb55593643911573dbb7aa0f69169cf63c0cd8d0a4b4d3a4bf42131f2dfa51305c55c26e802f07fddd70911dba20c4d7b57983782aa2da61fa730f12258a94c SHA512 f2aa4514bad0a4116d0b703adef866f420b1bf264781b58d4075c54747856a657ec7fd1ef622712419823f76a87b9965426f59e5c66b21dbc073387e66f949a9
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz 189702606 BLAKE2B 110b03fdc85f9456b253569caa6f6be119045cbecb8e13cd1ecc1566236a9ad860dddad9d46ba88c46396a16f27f080364909bf1587f5bdc96e72c9d0ba0b165 SHA512 c6122bae7269143638e43191505e9ea2265280d039de89b7bc2a79aa89eaa3a1658765d8490c4e363e7e7982575bd309f7e6ac18c4fc7bb915dca2b27e7a6a3f
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae126f1c2bb00f97571d4bb3316ecf5ee36a18895eefb48db616996dcdf363acbbd8ac17ecb6a507cc0f3a811f476cd72993b42e0a0b857b82c3e2d4d5279 SHA512 33cdc99dcf119a3f5161cdc08853ed1b8a1630f884577b6a167cf79621b0fa6f87ec652452fce0e27ee550b63952fcf75a3a6bd70c61564faafc0e8e1c74c0bf
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.12_7.tar.gz 180761575 BLAKE2B a04e91561aaa6c3e921c61b8956e797c0de20eea98b1356267a3046db9917df65fcec4c569134675e3adaef259572772deb62c0cbe3e70aef01e7984233f78af SHA512 b0ebe7832c5b03930ee72d2f5ff5171dd44cf0fa1c48120fcb508f1be08921e8ce848f4348f0424eaa9955e1be4b04a9d82ebb72e5bc6a2cf8551fa35da093c7
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz 175004135 BLAKE2B 36b63c4b8c654c418c244c06d2b2d0d6395ec462c98c3b8548ad15d9f7620b685074307f80c79a0d42e353158d91a2a2c9c2dd6a2d4cca889d2158c2f0736f6a SHA512 34c6c6a309205bb02e52565dbcdb3d7a1f7eff9b7c2212f3a45b519a5032491b8d2c55811b097a6a4a744d4ace38d93ca89c463be9f058008786b1ba0b20cae8
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507
@@ -12,6 +14,7 @@ DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz 102111219 BLAKE2B 0af54c05957c3f56c495cc83baf68f27fea4773ab4577b212e8abd19e7c7be123c067cb614fb42a320a865c3ab96c9e6ae663d96f79346f73282d99ea8aba5e6 SHA512 43e74f8029cb0d0ea48c6af4e2b8f00c4664264a51803acf0f539efb117be2dadf4c6a216ecf81c86e24152e6f87933f7a9e97bf4ba526eb01557bf561c2cc22
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u302b08.tar.gz 98335583 BLAKE2B 03cf038f460938b2460f66748257194b8b1b1101a06395be9b21134d9594138e57fad1b34b02c742c721474a299e53029013019fbfbf9f7fc07447ecdd56da1c SHA512 8d1065f6997b5a242c6f68c919bf837820c93580054d23cc4ab46301ed6fc78a53872174a5573a41d96daaf5542a99923b3aee5acb7472471d8a79614fdbb6b8
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d1b32f76359362bc101678b0123d29d32bd720a10b806a55cf9b4cd3e9d5cf2ec50f985a4de85ae41ec4b90376e7b7e2f501bfe86ad9ba832813444a8f9a SHA512 2999972ecd574169d50afc6c7ff3e7b3f892939b125a9d02184b09ac11ed32b741e1bacac64f93fd4fce75bb4b16130290c1011d3948c66095132208cfc05839
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz 100547467 BLAKE2B de5e0432be01db8712c0f19801d7c5478d9f241579042ba9aed60631f4415e025b880f985a7a5fe14af136599cecda70895fab80febe7ea888604615e18ab749 SHA512 458d92a9d4ac7ed2be5bc125db5f5038ee8f6d64c6d1a20d51c3d422f38d2255ca48a30d41ce4a551b7b684f35ca9b3c266992c33810f1bbda6f8a94f8e915e0
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
@@ -19,7 +22,7 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz 102954777 BLAKE2B 8df9f811f
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz 107303398 BLAKE2B 0eda36bfe60a870d7389eef6f5babc96e7777896c3a3fe584cc713db962175aeb504ec3b69c4a8f126568596b81ad3df855097d5c179dbada10545bee3771cab SHA512 a0bd5d487ddd1d0370b20879249b63981b9739455d280c3e7d9a13d62e5f255a7f9cc34e892c45bcc2f8dce0e29c9f93842a99ab909b63432e194eeaf3ec494b
 EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
-EBUILD openjdk-bin-11.0.12_p7.ebuild 3599 BLAKE2B fd189c7d38224b23da6d1f67421c759c65c0860fff0e4215712ef38b37587de6bc6dab1878db207d866009bafa6eec19e58550878bbff799af6a8e9e762eecf7 SHA512 200dfb8fdbbf4ba9c79e5428f5859401496b573ac24592f79f6fc4eb1edd585cb7371dec52848a64e7bc642f64175be931fcd8eceb9b15a77a9fb926577041fb
+EBUILD openjdk-bin-11.0.12_p7.ebuild 3619 BLAKE2B 2ac588ad46b86ae162b8455572b49f7e81feb4945fafa227a63ede23b2be2e30fecc8af1b612528fff5cd962c5b33397bc8472407569bc9454776c0da0c5eef8 SHA512 8fdd4eafb58786e1ab086d0712272d8af2f820a64ec5c638c02719d4fa43fb05954e9c03f08c6cf19caf944a1c10cdf21348edea7e0ae1c5746f8ed02bd8583b
 EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
-EBUILD openjdk-bin-8.302_p08.ebuild 3029 BLAKE2B 3e76e213d8dfb86c033c0cd9f05faee43ff00601c1d5ef0f121158d2cc88d44c5e8744960cdc8639056a0e4cb770a64e9a2ffea7a011a382ac7404837e352f93 SHA512 2ccdd5ceead0c8478ab45923ddf9f292cf0c13f16af6ee1dc620ccbaa2a7d0f2b440191f3e3b118f368f6fdd770bba48df5fd28b74abf8c897a1a46ed7328df6
+EBUILD openjdk-bin-8.302_p08.ebuild 3049 BLAKE2B 28da8ff195565c8ed06235ce2ef9ead6fa21d4edae4a1c8b172f8723dddbf72e17ee812afc970cdca9a56ea2d473d76abeceb7a1d7c4da6c8e289c71ea00a6bb SHA512 7cb3b13cd6dcadec23f6a890fff894718890542e66d1a564d936d1887c1348beae8c7320b4653293f25e5f1e6f090a9800a5d1272e40606a019172622956d2f5
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
index c5bca3458c4f..6bd34d6f19ac 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
@@ -20,6 +20,7 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 
 SRC_URI="
+	$(abi_uri arm)
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
@@ -29,7 +30,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
index f424de9c43b5..c5ca96ab59bf 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
@@ -27,13 +27,14 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 x64-macos)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 2ac2fe7d58aa..3748a20f3bb4 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -7,5 +7,5 @@ DIST OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz 41249161 BLAKE2B 643c8cdb50
 EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
 EBUILD openjdk-jre-bin-11.0.12_p7.ebuild 2654 BLAKE2B 83bff5854cb15ae586350e0383f24f6042d87c34576396cab523b607650604233fc0a3a77230d752eded39316d5764bc264494803df58c410a606c9d1a416d98 SHA512 408f1be2b1bf1289108f903f8d154d128cc7102ac8c27f8bf2b6f27b4c9d034cce196a97893043508679dc336e8a7915b5d48052c8b89e83fe9490d49a062c84
 EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
-EBUILD openjdk-jre-bin-8.302_p08.ebuild 1860 BLAKE2B 0fcce9e0cc8ad93c948b099e0a145c987be058bef7761bf3b51e71d7986ae2e74bfda6d834c2ce07227da7b94d34a675ab48f06879ee04bfd6fa9f5400bc6151 SHA512 26f5eecc6a7d130a3dec5277c2b6415d9ac01e9c56f4d53f2464c29915cc4802c7888c7175cc8ba092097a17ce4559a9bc4912f63ff36cd99b132f8c56d45342
+EBUILD openjdk-jre-bin-8.302_p08.ebuild 1859 BLAKE2B 6abad72cdb322bb1c52714b999085eca3a92c7269194e8c03efe1be93c0de274b6e50d72c5c0b804267c074eb76bf9e438ac3c2c565812bd8af8da6157a3e8a6 SHA512 07bc482870ba9810e54aa1e25deeb91f10391e93984ce0fa8321a45965c53324929a6db0374b78037f4d8420d32bf1be755fe80e3258b039da4a7c0bfb96495c
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild
index 84b9bc863e10..d305daf5c173 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="alsa cups headless-awt selinux"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 301ce0372cf8..4ba13e902aef 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -36,7 +36,7 @@ DIST openjdk-langtools-8.302_p08.tar.bz2 2401910 BLAKE2B 64e1d65121bfc75314b0f42
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
 DIST openjdk-nashorn-8.302_p08.tar.bz2 2848729 BLAKE2B 75cb7e04c0b398f7b5443738b08473a4a806ffbd416828dfa9d7696e11c4ed28337330a4ba19794394689d571a05e6dd95ffbb047482b744cf25ac9551e94100 SHA512 c0634948d4d35271c27009108c322779ee67cdc764c3e49aeaa0bf9e59729486bdaf7f54dcd5289e82fd0e83f03f68a04597d187d37ccb4aa5b2e93f30111a06
 EBUILD openjdk-11.0.11_p9-r1.ebuild 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
-EBUILD openjdk-11.0.12_p7.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
+EBUILD openjdk-11.0.12_p7.ebuild 7794 BLAKE2B 253760c7359b3b9f984286fcb94752fa2bc704bf3a532cd833608180afa1d602a1d5f2e617a8da9cd84607ca06404e4b64e34229de584e52d4e6c4dc2299b33f SHA512 f59e09544e0b9f58733f65bec6751d670fc6b6a69d0645930889f4ae521a75ec5c62ca804d1dee15d5467f901e26c86e1a41ba1c2e06a9ba94b647615262e6c0
 EBUILD openjdk-8.292_p10.ebuild 7313 BLAKE2B 1c5db4f660ab13a3bdd21e009900fd6f4f7b79005f89da8c802e611cb325929f42eb60f59c88220fc2d865fa5554d0b88c09846767e907c11d787a9433b6cee1 SHA512 eb35e875c863ba47d1a1b6de1f493ff2efdd5bc82a82be775f9977ffc46cb64854f9576498aba8cf424bdb78003c1301efae487c7223b4ef138f1efbe7e51b2b
-EBUILD openjdk-8.302_p08.ebuild 7317 BLAKE2B d5fd80468d705f9d5db8b697470c03b96f6913e21b13d61d13a57a1b944a8f4a3e894202a6b81d89f93640f6827f59d5413358fa90defbeb33c4f9b0cf8e6be8 SHA512 1fcac421dbb59fc36276afd7c38ec28dc9194f1005c58a4ac2fcadc1f9d9d1c154546caf25558f5bb4e0a98e81ead35aa7d17d3bfc19fb8dc5a9e06788d8ec55
+EBUILD openjdk-8.302_p08.ebuild 7316 BLAKE2B cf7c98fcb4500366b67dc47dc33d44a967ede29f7ccd8fda721d54a2ff45b964f6617441c3f2e86a19601137289fb953a804941469c41d2e9c8982f07bb57eb7 SHA512 a2ec7e179ff71e05b77f9017f20f979a8833554cc4a566be7242f7fa47fff61d9562f5fccc89e0ea88c957c48d10d79bd802427a348d8424254777e239775399
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
index e6cf8c5cdf7b..f96a8a2c0e7a 100644
--- a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.302_p08.ebuild b/dev-java/openjdk/openjdk-8.302_p08.ebuild
index e0adcf48d134..61e3e894524f 100644
--- a/dev-java/openjdk/openjdk-8.302_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3d0401364e69..75db52dd0b31 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index eb918d8fcdc4..1ab9a94381f7 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -7,5 +7,5 @@ DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c511
 EBUILD icon-9.5.1-r1.ebuild 2507 BLAKE2B 5493470ee8d9a3bdad899e84d76f84b760e6bbcecc27e783247ffc386970948e3a097bb786e546f9c6473247f9707f50eb623cf270e6db2d401bea627d56967a SHA512 65aca9dfd666661578110c0056371a2b2647cadf11410f1f0af73669e2153a5d813da401b1f80ff97cccc7d507a265e80c8357ee86d86516b4de243d02f6f18e
 EBUILD icon-9.5.1-r2.ebuild 2971 BLAKE2B 811c5a0670ec4b68d5ff63f26b16f5b180a08aee91e9afe4399ddc05d22ab962c91b14055a3e2c3ed82e62fc2bfde5da1a07eec04f0b1050a777f8115001219d SHA512 4cca14040a76bdcd15d8b3e200425d9e2ad0dffc9883054f1d0a628f62fb83786928f17eaff5f2eb64bdab8d82c559895471491cac57ae90e9089d902a6956be
 EBUILD icon-9.5.20h.ebuild 3292 BLAKE2B 07c2221714a69ae1a35577bd195879f5203d03bbc8942ae777583153664d766100020a1a221f6a94f254fdff68f1383d828a078a20d9782e0c18064754c46a65 SHA512 c99f537832b4c172a15410202461f45ab1b94794bf7f9f65b52f3ab608691b193ec1ef5af91bc5df14998c840e6fc6ea0c19d2de351aa6ae822eadaa8331e5bb
-EBUILD icon-9.5.20i.ebuild 3394 BLAKE2B 2ccdc8ca3dcd39ab19bdbbdc19a8d49d57b7af27737c58ff55a34a01e7d95a090ee72b7c09770714f95b83dbdd85a56a8cf5a5890614bc19a386ec2fdc121fcd SHA512 4094ab785f7e825f724bc02ab6fe335f029dbca3e91c2e8dede65c42fee78300e1ea9156dd46bec20934d7460695ac68ae791cdc399e3454b8a3f1272482a567
+EBUILD icon-9.5.20i.ebuild 3393 BLAKE2B 1cebf50867a91fa647634f8633b150c18eee036cd3466bf30aab3efb82941bd56eefba71b3d3ff0f1157c2a080444966c7b5731b833da5032bc7a3a4049a0745 SHA512 5de2efbee89b94ee1b043e65caf6c6da5a899f5c7eb46a0942fd4ec77f1307db93bdc78ee5e5d06bd4c9a20ec9d793ebd5aebae166c3e3cea8f0ecba0240b8fb
 MISC metadata.xml 498 BLAKE2B 276c8dfb1fb4216a48752fccc3eb7fab1346cc1fb978d91419e4255bd87409bfcd7807d3428071ded77a68c6edb734a5af3a87b0120f576ee3e8ca4f38ea5d27 SHA512 5ab3b16f3bc642594a4cb1116ae77a30670aa85d20fd8860152741f10a4e16fe539b3a394fa7cb16bad680e381289b5ba555ea0cb418600c6e1040f27c6e82ce
diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild
index 7eb92556378f..10b99668ef49 100644
--- a/dev-lang/icon/icon-9.5.20i.ebuild
+++ b/dev-lang/icon/icon-9.5.20i.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gtownsend/icon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="X"
 
 S="${WORKDIR}/icon-${PV}"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 240e380c51e4..e03c8e454455 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,18 +6,26 @@ AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
 DIST php-7.3.29.tar.xz 12139492 BLAKE2B 7e1287e0fd236252f5bc92009e4ff51676eccd197c1c579f0e79a5428fa3920b5d1f95a459cdd77c22699fbe83984a6d726ab4fc0fc1e309da8b34e0e3998071 SHA512 8a495546d575a31f864f85139d8d7931361e6ac421f2cf5ef3b4cb57f59c44568cb9ad0c8793f50169d8d9933abdcec14ab90add2d7fab056e19e7f66d60689f
 DIST php-7.3.30.tar.xz 12142596 BLAKE2B 9d8d60aa2a24465e53d99be05f66c8c65ce738c866af0889cdfcd95d545d6308fce33ca2faaaeb2a298eae13d58b5f5b5c519de6af48230a4d9c4e3d41debb28 SHA512 89eb62ab4284393f33b79ee336c1672613c498adb858b16e1a17d5b2056068c849b96bbf591311ff322c607168d9518ade3bfebedbc4da4f37c34d2c64c671b6
+DIST php-7.3.31.tar.xz 12142912 BLAKE2B dc68d2e2f38c93653950be4b30dde12fec6e7279e288fe40439a8e3e31110a228a69275e032604a493a53951230f6f42257719617ae18179116be414e49a2af5 SHA512 63a8122233b9892453b6b92429497a7ad9761ad88063e2b95607b5d4d4c0a0e1135073bcae5a0e69a17082d2348911cbbd4807c0d20905d93324d89e5b019a05
 DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681
 DIST php-7.4.22.tar.xz 10348532 BLAKE2B 20e4bfb0362bb13ca8cacf9fb2500ffdd2db011d69cb82f113dd0c25e8a5fd4a017d77481732930afd24a8e092edbce3eafe9d45f27718ddf7567469f80c5642 SHA512 80587ba613b8a863a666f44a16ebb33cbb5a5d396601d1eaf063c8f7793a98abae903cb76fca4216860f1a043d5ee997464d479d53ffff6a1d6a6cd31da9100d
 DIST php-7.4.23.tar.xz 10371160 BLAKE2B 5e9fc033f856132dd6b7b06fc5aedc72218f083779fd90a8c4c7a23fb4f8c248a7ff769f9d9f46e5143ddf88ce9289f5a8013c194aeaf22eca74d97846868611 SHA512 659b6bbf9be21a09640529bc088dfd7a494081188e37eb1f2dac2cab92a1084062fd06d550dc8c97bdd7dd9b57f4146e357447be2cb86643bda1d8dbc8a0d4a3
+DIST php-7.4.24.tar.xz 10372816 BLAKE2B 62e1853c20eb10d8540b9284af93cce4b3976cfae7cdba5c0c2d6d14e732a57d7f1d196f4270687d6af8f376d7a9ccef60b0b606ed20eda7e1b2b7b95074c55c SHA512 30dd0a83d6184791f4cff3edcffeb05470de8f98ddadba3c11544449bf500280ff2048a8ca8588b35d0622dcbbf16f55ea297f51d469ae137048cab2d40da9cd
 DIST php-8.0.10.tar.xz 10703088 BLAKE2B c1be482bf0a7cd2392b4febccca8d9f7b32b12ff4f5ff0ce417658c52444308e67a1a0e702c0d70dc7cece4f8299b2bc12b6f999be8a758e5390e760ce4809d7 SHA512 25f23822a45eab837645a0259c7dbb999766506de35c1bba53e928e2b5935ba70278b931d5085966178e08013ec69407fc68eb041b3ae2e619b81f20ec8ce736
+DIST php-8.0.11.tar.xz 10804388 BLAKE2B 8d32f2bb66b2850c7d8d820cbcf94af5161065612b204f6e30289d9b9fffbae7c45cdf5e31c3d1f774932d7eb7218079f6f0d19774b108d53a81a6c88d3c99fb SHA512 2d346959b2691ea0d5334dc9cad225b7a65ec53d6a6493f3b95c4819a0c088bec36aa1bf4ab3c8044a631bcfefb689d85463ff2259d42000e65dac30badcc59d
 DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428
 DIST php-8.0.9.tar.xz 10678448 BLAKE2B 7d8684a353ccbcd2aaff4c240563cbd9f94b16ad29223d7e00e3d9ca8b564dabe3f1d0ac676e6499af6b95f24ac2104ed9cc0ce30d05c7c565ccb2067a86b355 SHA512 de9923bfa3ca37cd775ff743beb417152d7380fa5622f3fb0055b49e552c6484561f4f503bb11f535aadd12352c92f673f3e3cc86964c767b1f6cec21265d03c
+DIST php-8.1.0RC2.tar.xz 11679352 BLAKE2B 0b4eb5b1f8d3f8fb29421b6c72b3279bc7f3c5f6ba684305afdc7b1f5cc0f45a942d5c0f0a681f152ad87f209fa4e464215aef43732180882d523f2badd4596e SHA512 aecd58eb683467df62032208caa545d243ca2574f6683566a489136c84a19da4383c5aaa122dc09cfb44dc951bfaf85e50b0b9659b49ec1c4ae69f5afea9844b
 EBUILD php-7.3.29.ebuild 22683 BLAKE2B c9a62b09e00619d5e9ddfbd20abcb2f424d1e6d6f702fae36854b4a0bb3e5a1ef49f1584aae2d2b5d225c4df763687ff3e319c720b3946766bd57fe07842a185 SHA512 69a574958c2b644a3c14d39dd8068af550547e4a86c685539fe6c82b9d4b9883fd22b03fae5e04d0a7df4970ba82a82e127afd4609cde177165d734fb1ad116e
 EBUILD php-7.3.30.ebuild 22690 BLAKE2B dd350e0df77cc2a4f006b0e4a9e5bd0d5ac9442a27307ff15df78ccd5b9d3bfdeee307dd7bf6bb665cbe63237678270f370c436b62862e9c7da4483b5d488bfe SHA512 59cf4ee0b998240145945190370e41d20c731c37bb7909f75da8b3deff08a6036c7ce24366b0c2ddc6b325ee4564429bb1339b852ef973f1b2c566b19149757f
+EBUILD php-7.3.31.ebuild 22686 BLAKE2B 7386fcab149068f05162f8baf82c2c60b091d5d1013fec6331343db5ddff84b56953bd6794ded80b38dea04234a27a8153882afec69c535f3174b28afb140800 SHA512 b0748dd4e9a01bee18a490f5ebd0932ac0975ac93d1520d797db40ca24115eaf6fbe0f66f83b3a30edd91ed41ce332af35acacd3f7a387aac9c17a0be84c669c
 EBUILD php-7.4.21-r1.ebuild 21394 BLAKE2B fb0dae734fdafad89d17b823c5a4b5e5956f821c73a9cfadd29d3b5fe163ffc412b19d6ba57c53873e7c165fbad1fcc45b8218f9f8a319e1be622aa1256d2eb1 SHA512 ece48ffcc67868e8745e62a207d00967eb47aed140f0ab631b97ec22ace9e3d650b2385da728997a266fa063b33c4f552b840485d6bfde937722064ed393932c
 EBUILD php-7.4.22.ebuild 21401 BLAKE2B a0f0b3016c360705f9c3138b3a8eb272d4d12844f65694229b8a7441391a295243af769940bf1c2394df354123ececaa041ee566151a5eb05bcd114c47235510 SHA512 ae81d70ee64cc5aef8f03b0d8598bcca7f75b71e8cb3a8a9161ba73536f41e6252cf587c999b37014c59a331d3c243c431548863c017e2da9949a3602a72dd9c
 EBUILD php-7.4.23.ebuild 21408 BLAKE2B 63e5db498bb01eb86183c7b4a9baa1ed8cf1d07aa9c9e63ff754ed9b4e99874903551e6483a6545e6ff5d68f18aac18f90eaa7f5da85bcc879cd34377d8eb7c6 SHA512 454ea4be3c67ab58568d36097dd85fa985230ebc50d682666d7bddb0ea62fc76d8d7925d3b3e00d7fa46469a12a92a90af37e1e41d65425acfc5b5e4039f6365
+EBUILD php-7.4.24.ebuild 21404 BLAKE2B 5875bdf76ffc5aa1b36df6b742ccec07ae9b4c0b709fcd58d5aa7e00dd070f52312b101cbfa8089cc5724aa6aeaf4028ab0474670fbdfafa4232626f9a72c036 SHA512 998380ad160e149187b95dde53ce81a239e8fe4801911e647b61768357f7c4d81cb9f2da528def23e2eb89c088958f54356063744f30916a81b545d6e37962f6
 EBUILD php-8.0.10.ebuild 21427 BLAKE2B 4ccde3239994ca37ce53b190432506b35fb471a148207c1746392fb5cbbec68ecf417a7a2860b792d6efc8475ee1412281d5e70b8754f510699d7743126083f5 SHA512 6bac9b9ef70010d414d1e3e1debaeb2566d035511c38b3104429ebe84e8b7ab75bce096891297f4f7606c2fd221c336cdd93dd8e9e23845d9703ca41ae74f805
+EBUILD php-8.0.11.ebuild 21423 BLAKE2B f932b3713a6829ee92e1024a3f1b515b431c0063b009cbd048119e8d94eb778719a5118a6a015f17c4d64c294da99dd323a64371783296838fef2eee55ddfd94 SHA512 9e783469053093e0975872335b15bac87d6847c6da0c6b2d8d4709fd61603fdf472969ef9054bb0990448e0becaa260ba3d177f7b71d921af77ca8549e333961
 EBUILD php-8.0.8-r2.ebuild 21420 BLAKE2B e34347417fcf4d27cba8f22b810bdb2adc397621d8977f24dae7e5f6d4e0a1ff618b51f5ff8bb1d2bcaa0598490202d921a6379b9cd0147d4a3d7cd0be9066a1 SHA512 de351dd668a70bfaab8871d1a92e3026227fa5cdda7a78529d7c8a0cfe25c8976fa0b7420f24bd17b69eb4bffd36453c9928125cfed22e37256f6a01e8d0dbf5
 EBUILD php-8.0.9.ebuild 21420 BLAKE2B e34347417fcf4d27cba8f22b810bdb2adc397621d8977f24dae7e5f6d4e0a1ff618b51f5ff8bb1d2bcaa0598490202d921a6379b9cd0147d4a3d7cd0be9066a1 SHA512 de351dd668a70bfaab8871d1a92e3026227fa5cdda7a78529d7c8a0cfe25c8976fa0b7420f24bd17b69eb4bffd36453c9928125cfed22e37256f6a01e8d0dbf5
+EBUILD php-8.1.0_rc2.ebuild 21457 BLAKE2B 1ecc29a6afcba5210f229c7e8a5bca3f145af1efc1581106e7628404234f88e170ae3e65bb2f27f2117a7c78924b1957e670d6028a20c1e7f1237d1f13301d7c SHA512 10762a13466b1a3868b98485d6ffbb0b3375e450bf6f5139564cfe01a84009a2f8a4b16ab841aec0ab357156069966271205d9ebd41b7a4b3c78852d45f9851d
 MISC metadata.xml 3378 BLAKE2B 4ea64ce2404205f33be7d0be217ad8eeef2b82bc50700664dd89db5bd6c3aabfe2b0ab72497493bdb1214d3c30d9fdabe0e8790938aa68fd3cff8bb25249057b SHA512 21fc30b50fe9d5fdbd63c19e1bc7856bc2e7d96ff8fbd05aff4fc07bddae68cbe8dffecb1854de233031257dcd40da265463887259f95ed886dac8bc2b6cc535
diff --git a/dev-lang/php/php-7.3.31.ebuild b/dev-lang/php/php-7.3.31.ebuild
new file mode 100644
index 000000000000..93346533abdd
--- /dev/null
+++ b/dev-lang/php/php-7.3.31.ebuild
@@ -0,0 +1,758 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode:0= )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	oci8-instant-client? ( !ldap )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.24.ebuild b/dev-lang/php/php-7.4.24.ebuild
new file mode 100644
index 000000000000..a79ca83e258b
--- /dev/null
+++ b/dev-lang/php/php-7.4.24.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}"/php-iodbc-header-location.patch
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.0.11.ebuild b/dev-lang/php/php-8.0.11.ebuild
new file mode 100644
index 000000000000..ccd597984fe1
--- /dev/null
+++ b/dev-lang/php/php-8.0.11.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.1.0_rc2.ebuild b/dev-lang/php/php-8.1.0_rc2.ebuild
new file mode 100644
index 000000000000..c364c281d1f4
--- /dev/null
+++ b/dev-lang/php/php-8.1.0_rc2.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+#SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+SRC_URI="https://downloads.php.net/~patrickallaert/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index a7eb1621c6af..4f9e740b31d2 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -145,4 +145,4 @@ EBUILD rust-1.52.1.ebuild 20198 BLAKE2B ded64444104b75499de229c06c3d41b2651d3ee5
 EBUILD rust-1.53.0.ebuild 20480 BLAKE2B c8975ccf51cb85d943f0a4011f1cf40682841baae5b1dc6defa01f1d0ff856ad9f1fa35d99507979224c3aab9d1022c17b33efc5da422788ad4bbb028068104e SHA512 5c0d521cb86385be5c42d197016ddaebf7827a52076912194f73c89f4121747434c2e0884608a73e211997e6f70a2f8bc1cb608c4dbe33eefc220f87593689bc
 EBUILD rust-1.54.0.ebuild 20484 BLAKE2B 41406228945d43aa8756c3c47834a887fdfc980450b753b82be03696f7752f18071a1a69cb7bd37760c1bf097818cfbd84ba61f061ef00eb68616e468b65154d SHA512 f180c1bc9979823eb6be35e2fb81b8feed07eaba963160ae42deb953daeb4013c580a1355c005035309cb3e39c2064fee1c3eb4fd7530d555d17220fd965fcdd
 EBUILD rust-1.55.0.ebuild 20391 BLAKE2B b0f48b52435ce794946d64d8bfee769f4fadeb47d2c3e8fe187739fb0bf07a7fe5d43cf1cc423038e7ad5a4b2418683448add5a7c83acd04cd60cfba88fbbe45 SHA512 619a9a83d734e8f31fe1a859b2794562841f66728ab618abad9a6d8e1de6da401c826fecfc2c10a7afc13cbf464127fb0fa602b5a81dc46ed747132d3c4e71ae
-MISC metadata.xml 1084 BLAKE2B 43049e2f1a1d47a3c9ff36469a9095608f4512c9b76dfacd8859ccf03fe734af9c4ba83334e3f52710694bb23d683a992791496d116c101afa682b42612b661f SHA512 248476cedf2601330948ebfeaea8b067a7563d5145c888e12887d00eacbbbf3de620694708dd04edcd3fb6f945c81cb610a63f5371b6de5a4abbda5a2abaa761
+MISC metadata.xml 1112 BLAKE2B 966922f47a426a8d17d1dda931644d0a0f71a544ee7e7a89ec4848f3d8dc514fc4813ca2f571ef0dede6b92bbbf9ea7ebe84054649f280f672e25a67a455d1c1 SHA512 516d9ab6a212757e760d9fe28f8742b92055de681da0a5aad3031e920d0dcdecd78f8aba79a1c5baf74a39fdc2a14c9b665009e62621103c8cc11b9afb048f96
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 7218029cc34a..5515006c5dc3 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -13,7 +13,7 @@
 		<flag name="clippy">Install clippy, Rust code linter</flag>
 		<flag name="miri">Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly)</flag>
 		<flag name="nightly">Enable nightly (UNSTABLE) features</flag>
-		<flag name="parallel-compiler">Build a multi-threaded rustc</flag>
+		<flag name="parallel-compiler">Build a multi-threaded rustc (experimental, unsupported)</flag>
 		<flag name="rls">Install rls, Rust Language Server (used with IDEs supporting RLS protocol)</flag>
 		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
 		<flag name="system-bootstrap">Bootstrap using installed rust compiler</flag>
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index f43945e871d3..f9b0e31a236a 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -34,5 +34,5 @@ EBUILD spidermonkey-78.10.1.ebuild 13020 BLAKE2B 1df644878ca6ced6f09412392dcf44a
 EBUILD spidermonkey-78.11.0.ebuild 13023 BLAKE2B 5c6ac236be68d84fa31d433f425f3298ca114abd206312da92098284478a4e8f40b8358b8298cd3e7f340fb3ce7cc6e7c5609da87a3f2b7f123b2c09a0ac0779 SHA512 7f55e7770c7e3e7bb6ebb7bccf432934e0cdd585b04ed7d0612ddf667eda0bed8c6102dc7d687c9afc5b44cb693c51989766e1c42523e6372471b0001b9719f1
 EBUILD spidermonkey-78.12.0.ebuild 13021 BLAKE2B e0c048fc9845d7b24e72df1efb67764bfc9570efc2a40e753bd3d222ebfe297168a229242a5439e6922bad5b6d4f6275b6b6df52ca50a173049f394d6f8e41d1 SHA512 1748dd580ef80259e81586b24a07495ffd43ca94d6f794e2cd36849396e04e421cb2a40d1c17cf6a9cf7ef215adf31af9cb4de74a31edef7f6c8d60f3f098e3b
 EBUILD spidermonkey-78.13.0.ebuild 13025 BLAKE2B eaaf4df87e0497daeb4bfb2a554f9f2009a64d94e02d94c9a852e3db4047d419132abc671898ce7beb239ee88721eac8be8ce794a5e9abaa2840ae4e87eadd6e SHA512 a8223fb84b0174b24845e8c226662823d196019d10989b08cf4c3c2975609799510edc3b25bb922d86b23bf58c8f6f4c1051cac14e9281ed90942dc926b4069d
-EBUILD spidermonkey-78.14.0.ebuild 13025 BLAKE2B 8e47866c1d3303258389b88ac6fdf58c59d9979f668be2378dee7d99d2db21eaf9454ed6dfdb6c6ea59843ad899a581a1e17613f67ab02f49991f5e19825997d SHA512 41d9fda7c6cb2df23f6ffe23727438fed49845f31c5143c3c8e85b4d43d217af47ebb324621907a9e4aaa4b29f38b9a48e753a0781a47bbe3fd3c93a8c39c332
+EBUILD spidermonkey-78.14.0.ebuild 13023 BLAKE2B ed384c7ec25dd28a55ea548ffc4b88e4a283c0ac746f5b8c86b34455589ee05899a409ffe5054a87df483e4a5cb9746b2f6d64d0e76a4dc36878b10a780a1d3b SHA512 cc66e5b300b6adecc77a3695adb01a50ab44a05c6e656d1fa10d8e8f9fcf083cf6cef84db9a73af0bfaf82f80d94a057aa0469711f16e1df60f299b6c97e4c2d
 MISC metadata.xml 869 BLAKE2B 79d6ea91e84e3bb666797cde6b2993282ff1b4266dfa835eaf02d8aa65d5d000729b149a49c9fa5c8dbf12e4b97b46d976243c888834db9df73a8a5c814aa610 SHA512 f78399a1ad88583c50ad1e967f5ba293cdfff7d58cf26b87bd8888c7102b62d42ef1982d1b8462f3d31f0806b6cead8db28b7f0c7b12c08d3871607b5a4c63cc
diff --git a/dev-lang/spidermonkey/spidermonkey-78.14.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.14.0.ebuild
index 31a1b9912986..37e39ce61b57 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.14.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.14.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/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index dd9cccafe1fb..b3bf1cc599e3 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,15 +1,14 @@
 DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa88dd14284ea147ab5090695ff1c950365823451ac656403bee97c7dd4a039e2d58085456842f8bbc7caa26d18916c6f8718a204097c SHA512 c1f0dce1e336c79fe84a3f9d0fe5e873d33c00071f91cbb683a73fbceaba1c6ca8c2875b58045829eafcbee78a0e713009a07bd51a2c56bf146f14881899f934
 DIST swi-prolog-8.3.28-gentoo-patchset-0.tar.gz 924 BLAKE2B ec13c1ddd748cd389cc369ed722f7e672c564e81a9d7dbc04c3c923b1192dbed09df74fee5e877468e78d3af7dc6d41f0df6adf07af30fe468f1768c6d9c7a78 SHA512 18beb018043d3ca6e1fca30489d5487b6c2378b332300778ff13110800c84cf98c9f0ac0fa13d741fc7e82a86eef7929058d85221f96f71445104be6f0ccb132
+DIST swi-prolog-8.3.29-gentoo-patchset-0.tar.gz 1233 BLAKE2B 62d804ba2e0d358b6ba793809e1845406bc999f43fccfeb3644cc31653880859e21cd8e1bd0af483f347460d3fa7d60108e0d0a5dfc83b771769286203bc9c91 SHA512 69c69d0259b5a56ffb55bedcb77a97e13a23b3f1678784b00e6f48222435101c33274fc598bbc616117d471212131adba80909d86ed318a278bf1288d9c13fe9
 DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f
 DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327f9f995cd46657a71b6779d021eb4f5651b2be77883197c7c5ee31c23259f46ed559aeeb0bb53ad10aea0081ed SHA512 cdbd23d4a0e9699ecc32bdcad9979e4042fb0f24de84010f6f097bc7148af38150b0e61e393c057b0dbae932d0fc1c02a41808bcbafd2c23e24fd73070bed470
-DIST swipl-8.3.25.tar.gz 11186018 BLAKE2B a06befea48e065d516eeeb4ce2fa87342647d02ec509eaec208be143520af7d4de3217ac726720a36cdd15e1e263963cfc71bb2d7249ff55f9673e7e1bea5620 SHA512 4a06cd36ffbf22d8e582776c6181c8e848abe9bfca32e5e0e43d58e801c8b7c8e1d8556279716461df020530d0ea44cdcfe9390e8387b2a8e8936adf8c3f9774
-DIST swipl-8.3.26.tar.gz 11202495 BLAKE2B 5d0dcd7a77592ffa86c67f386708330c0b9efc855a084178613990b93308a4e8e9d8d0617a44ae8f8fca050afb6181158269eea0d5943458790d481b4cb544ce SHA512 bdae2a66200517f3452eaf97efcb21d223bfbcc3868d2defc7474272e2b947e3c3035f2b8e5a8ee192271849a4075752a1b8b9c7460e941290111cec85e4df29
 DIST swipl-8.3.27.tar.gz 11273914 BLAKE2B 8ef9eac9ecdbe8f5e90fed66ed9f416842e644d0360474584008df707dfb04ba9c577b4c85e14bc3766f532e3a4171d8a4f4c1742f49a0d63b6a68748c6c6635 SHA512 1e24d450a0cb79ead31b37cca73dea79272845875c77fac4ca84ab698db89932fbecf302f9d94e640c189365a98470b05ef1a8645791757917ca5e193d10160e
 DIST swipl-8.3.28.tar.gz 11350778 BLAKE2B d90a939c27a8b9e57ebf52f5e7cd1b2f9f5f0762a82121d568742ae98850f6d983c8326c8fec2c9bd0dfca2dbeef2f12da0f6fb19ca99dd3f09db76d61e470f3 SHA512 cea20c53709e86fcba7a3a39214b8c2499d8bf27c55e94239a489d5c6053a7d22bffb5a2b2f813c4f03880dcfea53fd99ab530fa93cdc5c851a7f7a8dc3e6520
+DIST swipl-8.3.29.tar.gz 11362591 BLAKE2B bc541be585d81f04aac82e6ffdef51e816d4ec18f0b517e581f0a8edc89966958d07fe5f3ef11120e17bb5823e3fd26a37fd072895f5dc63be4d4021e109d063 SHA512 2845246b3e8d14b1050cb55685f22ad3be9818ad4e5915e223a55c85bcb51f2dfe8338beceae27a2ed92aa8b2fae209220a4e06deb6e629cc3bbf6019788f917
 EBUILD swi-prolog-8.2.3-r2.ebuild 2661 BLAKE2B 34a523f318cf39453bb07e8f484958585180f77b5cec51ccbc5f1cc5f26016dfa01793e1cc98ddd26dea30e33bdfb8ee14380a7465080fcc4f2b9edefc9675e3 SHA512 554e2e2c587fd0b7de160f8789ecfa8459149c2fca221fb7c8df9bb789b91247ae22eade75fc52b614eba2548db2314a013676c4c0bc7883a2166db0e8028ca8
 EBUILD swi-prolog-8.2.4-r2.ebuild 2854 BLAKE2B 61ed52d692815431f8965aaccb426dab4af427794b7fcc8b9882d16c535386d834b3433a5e0694a9848d41f28f8e56dd27ba1b54da1341b32c141e008c479736 SHA512 a13d74f6e0e69f7a219fb03e18f7de143e52a7e9ed5fdbac8da6dc0e1058802b70491ecf6a81b335377421ac6ecee1cf6aa035579b659d12c5d4ce37e0ec8624
-EBUILD swi-prolog-8.3.25-r2.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
-EBUILD swi-prolog-8.3.26-r1.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
 EBUILD swi-prolog-8.3.27.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
 EBUILD swi-prolog-8.3.28.ebuild 2949 BLAKE2B 5a9bf0e0c1516d27c82548a964c983071bd5d27b21a441917fec53ac9b1123ddca9fd58533d141ccea50e88119a5b76d88dad976b7312f5c254b78df65df5424 SHA512 d4781009075e399ef507c38273c250aa5761cd965ac57f2d4d62567f023b90fa9113f7c104224a4cf8836b2c6cb48a4d99ee8f3df0dd9bb00c9794d1595088de
+EBUILD swi-prolog-8.3.29.ebuild 2950 BLAKE2B 2937554a047b19bc912ae4db649e200fa12f1d3a8b20e4376649c29716dd05ee1cba2db70cfb7531971eecca6feedee6b86babdd36ff60c6f861854bb44e76aa SHA512 08b361f5b98524e1cf74d4becb556269b7e9d2b39b1508dc1d6bbd6adfb4ca4ca87803ba828b178d7ea6ebd6567ebe8f1fb219db5a9f2ed368a50f66a05dfda4
 MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
deleted file mode 100644
index 3b4293326d30..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.25-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	archive? ( app-arch/libarchive:= )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0= )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
deleted file mode 100644
index 3b4293326d30..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.26-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils flag-o-matic
-
-PATCHSET_VER="0"
-
-DESCRIPTION="Versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	archive? ( app-arch/libarchive:= )
-	berkdb? ( >=sys-libs/db-4:= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0= )
-	ssl? ( dev-libs/openssl:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	uuid? ( dev-libs/ossp-uuid )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	)
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )
-	yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
-		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use debug && append-flags -DO_DEBUG
-
-	local mycmakeargs=(
-		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
-		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
-		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
-		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
-		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
-		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
-		-DSWIPL_PACKAGES_YAML=$(usex yaml)
-		-DSWIPL_PACKAGES_SSL=$(usex ssl)
-		-DSWIPL_PACKAGES_JAVA=$(usex java)
-		-DSWIPL_PACKAGES_QT=$(usex qt5)
-		-DSWIPL_PACKAGES_X=$(usex X)
-		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	XDG_CONFIG_DIRS="${HOME}" \
-	XDG_DATA_DIRS="${HOME}" \
-		cmake_src_compile
-}
-
-src_test() {
-	USE_PUBLIC_NETWORK_TESTS=false \
-	USE_ODBC_TESTS=false \
-		cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	if use qt5; then
-		doicon "${S}"/snap/gui/swipl.png
-		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
-	fi
-}
-
-pkg_postinst() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.29.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.29.ebuild
new file mode 100644
index 000000000000..a8fb0188d25b
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.29.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	 https://dev.gentoo.org/~keri/distfiles/swi-prolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b5e10854cfce..a49f363c8308 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e987f5edb812..236c5868e4ee 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,7 +9,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r5.ebuild 4632 BLAKE2B 2fe447be53ffd513c3da12b2408db0ee4c2fbe1075b7d46fccf4eb82bcacdfd94df32ab0f721840cba3a9da6b8349e90c883f06a902532bbeb732268fcd48ac7 SHA512 e248703e1ff52e08288f0f3f04208e99d5b7e4a2cd586a55de18816a39054ad0a9614dd902221ea917f4109bd85bd563f7c3ad1d60ee4ab0502e5c6e88eff718
-EBUILD apr-1.6.5-r2.ebuild 4578 BLAKE2B 9b9a472c369276aabe416d3a36d92b7e1d2e890bbfe70afd1d010f49fa91668ea90ad319ecfcd210927bbe53218f57064ea259bb5c13531f14b1a3e45ba0ff9c SHA512 2a0a1867d03f658c7a1c39c93c26f4cf05b488e14d8c1e9c7ddd981a3493a68311dc69db04fe0ca3194bf1d3a98f990df67e1b1b4fd3c6be0b71965737e3fb56
-EBUILD apr-1.7.0-r2.ebuild 4548 BLAKE2B dd203af3034da46c37ee1b8aca7d708d4e9642d04a3a40a5e52bb94d05f18049d1d2ef5dde3b55030044e4f83ba3e77dc5e75a0d8dfbdfe005356e661c77529a SHA512 60b6c77af2879ff2b9492a8df98b5215399e8da13d9866c621db6075175aa5f2eeda6935d34a8614feb494782d2a2a98f5db47f62ff7534c43a9ebb431b7aaa8
+EBUILD apr-1.6.3-r6.ebuild 4694 BLAKE2B 5d610abd43fd9abc57921c740bf2612f42d735028e4e6d0ce0ef8f1ef38ab63f9ac0315729d8bb647c803c5e24b385173337e10bdef8b3a5ad7985c5d310f097 SHA512 f0d3c7daa05315e19928379236197d57d9b5822227978cd71fa7463801b12c6a7909ca98f65fdfb8daa798651da90fc36f357f0b430f414b78d4230573b6fd07
+EBUILD apr-1.6.5-r3.ebuild 4640 BLAKE2B 72a747721652745cabeb33f66bc83b5af841587a4856e23ea616fa1a281400edb07319b6025756230e32801bd889d3857085abcff7c1451d5526dc0f38030016 SHA512 915917d0010e6c98786c919b82c5332e9553de92ad61f35a1e2638da042021826fdcddbd03c7eee098cd369f8d107ca65704975638acd6d2ef21f9437341f1cc
+EBUILD apr-1.7.0-r3.ebuild 4610 BLAKE2B abb9ba6f854f8603e943e34a562cd608e681195188b51ae0ca5a6d114982cd20be6bf6ac0ba7aedc6b2bd45613cb24cbff26bd3c82e0651e834c026dabcde52a SHA512 f32fb0bc97bd46e5f2bca7e28587e1cc529761e86744629ffdfee8e29a198bcec3c95dfd38cae0745979a346cbf34c05de8e592db99c2033d9f71c8042367a2c
 MISC metadata.xml 434 BLAKE2B b757acb73195bacb3e89e6fefcadd77beb184ecaf6f15471842c5715a2ec15e10157e8916a25580884a570a274047b3e9868ba65393cebbf47c397e6d6474b4a SHA512 d27ba45c40ced6bf6a60bcb74a8ad474ff9048430d9cb8d08573c0f2e1958eda333edfdbf90ecf00f4c33b50502872645457fd11d8f1cb1c5f90f745e08341ca
diff --git a/dev-libs/apr/apr-1.6.3-r5.ebuild b/dev-libs/apr/apr-1.6.3-r5.ebuild
deleted file mode 100644
index 977176aee5c6..000000000000
--- a/dev-libs/apr/apr-1.6.3-r5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir=/usr/share/${PN}/build
-	)
-
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	# Parallel install breaks since apr-1.5.1
-	#make -j1 DESTDIR="${D}" install || die
-
-	if ! use static-libs; then
-		find "${ED%/}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.6.3-r6.ebuild b/dev-libs/apr/apr-1.6.3-r6.ebuild
new file mode 100644
index 000000000000..828c9a2b2e72
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3-r6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-base-policy )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir=/usr/share/${PN}/build
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# Parallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	if ! use static-libs; then
+		find "${ED%/}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/apr-1.6.5-r2.ebuild b/dev-libs/apr/apr-1.6.5-r2.ebuild
deleted file mode 100644
index c7f60001d874..000000000000
--- a/dev-libs/apr/apr-1.6.5-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=6
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	# Parallel install breaks since apr-1.5.1
-	#make -j1 DESTDIR="${D}" install || die
-
-	if ! use static-libs; then
-		find "${ED%/}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.6.5-r3.ebuild b/dev-libs/apr/apr-1.6.5-r3.ebuild
new file mode 100644
index 000000000000..725836e73499
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.5-r3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-base-policy )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# Parallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	if ! use static-libs; then
+		find "${ED%/}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild
deleted file mode 100644
index 36cf05528757..000000000000
--- a/dev-libs/apr/apr-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
-}
diff --git a/dev-libs/apr/apr-1.7.0-r3.ebuild b/dev-libs/apr/apr-1.7.0-r3.ebuild
new file mode 100644
index 000000000000..70e3bd4db4b1
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.0-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-base-policy )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	else
+		if use ppc || use sparc; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/avro-c/Manifest b/dev-libs/avro-c/Manifest
index 98dd9f4418b6..38d1660b6140 100644
--- a/dev-libs/avro-c/Manifest
+++ b/dev-libs/avro-c/Manifest
@@ -1,4 +1,4 @@
 AUX avro-c-1.9.1-fix-libdir.patch 1041 BLAKE2B f6fb235b0e6f4bbf34028168c0822cb1ec320de48e25c58d61b7ae99d8500db21af7fb290fc594a07d1b03e7e13f9321ee2680ad28652fc99d3048701e3d8e8a SHA512 5f936afcedad81f9bd6727e484d0cee3cf3bebcdc111a28b8cd6dc7c48d56ade6ad3d1b4eb96c69c556e4d3c2346a523b12d2ffbcfada864865a618586d3412e
 DIST avro-c-1.9.1.tar.gz 216954 BLAKE2B a1647c8315eaad5af7aabee01b71638261daa82def48227046d05da89ef66e8697d6c31f1a4a7b2b8010e1b471e50e24b85701ad7870e6f1d3495262dfaf00c6 SHA512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904
-EBUILD avro-c-1.9.1.ebuild 499 BLAKE2B b7bfc290a545cb8d5d0be8fde6c81258520de3bd0a71665da0211ca2e08366b74fe2e75a2b19098f0722b692f3445768af19c08cb1c662fbe7b9781c65b1cda8 SHA512 c785a333692db50d9a4211b437b67c48a79f0c4c81887ba759806f73ba4c0cd7b8006507d618e321f4445ed5e2c3a4a42995bf4896631f94f633ce825ea32664
+EBUILD avro-c-1.9.1-r1.ebuild 501 BLAKE2B 4d8d4aae548965752fc598a14734960495d81f164f9a453d7ef88be4599a9a0670142ca148602d677e97c80800f52fc4644b336658585423b0a2aa6b353d93ad SHA512 5bcd5b17541c86decd099a69e2b93359ab10e4bbc4301ef7ac59b6e83a91a0ad380920ca9f4fc7f7acf8cedaa59df16d2ad707d66cf13e8da14ef4c6bb31fb6c
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-libs/avro-c/avro-c-1.9.1-r1.ebuild b/dev-libs/avro-c/avro-c-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..3978e6b7b701
--- /dev/null
+++ b/dev-libs/avro-c/avro-c-1.9.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="c library for the apache avro data serialization system"
+HOMEPAGE="https://avro.apache.org/"
+SRC_URI="https://archive.apache.org/dist/avro/avro-${PV}/c/avro-c-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="
+	app-arch/snappy
+	>=dev-libs/jansson-2.3:=
+	sys-libs/zlib"
+	RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-libdir.patch"
+)
diff --git a/dev-libs/avro-c/avro-c-1.9.1.ebuild b/dev-libs/avro-c/avro-c-1.9.1.ebuild
deleted file mode 100644
index d5f0603a0ff0..000000000000
--- a/dev-libs/avro-c/avro-c-1.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="c library for the apache avro data serialization system"
-HOMEPAGE="https://avro.apache.org/"
-SRC_URI="https://archive.apache.org/dist/avro/avro-${PV}/c/avro-c-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	app-arch/snappy
-	>=dev-libs/jansson-2.3
-	sys-libs/zlib"
-	RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-libdir.patch"
-)
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index c767294d0ff9..d4e5af25c5ec 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,3 +1,3 @@
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
-EBUILD bitset-2.8.4-r1.ebuild 1023 BLAKE2B b7b363a53d3042983663f54c77a7c01d08b2007f1adc6a9014b3243b406bbd50025c6055deb1ddcde9928a8ca0b45049bc05434eca313ccd242361c04ec64abe SHA512 e9f1bf4620afb140853a2fc07af46de5a9f67f4f789f4e97786b26cc64f9c74463e3096005a6315bb0a202d670d4cf20a9b5d6d5c95a5e75a8aac191519adacf
+EBUILD bitset-2.8.4-r2.ebuild 1052 BLAKE2B d792d1902ce341b776d08649c629c0ee05373df2ada9dd648d3c78d8f72999c3b680cfbbef657fb32d8876300e11fef7dd34b682b6e9052bc9d3bad6c822030b SHA512 47e37d0690f6074f0be04871a65f9bff685bc0b31e47dc2cf9fa50239fe8ee4bfc85ad5b8c955fd05b68ad41dcd2cf8bace9631a4f1deb3940370d2f8a920aec
 MISC metadata.xml 443 BLAKE2B 6fbbb9b7d07dcf8ccb20e0040336d5566851f6cc71f9424a5b123f784f39cbf362f719e166af0bbf9b770b97c9c28bdc7605c6d86f237eb043a869d09a5fe0d4 SHA512 80ec4cc1cc20b20b35c4337b77b61f0162c2d63ea93d37dd525bbdf042591180c9833f25c4d3e7fee3bfbb5b4e87cef1741b52e71a39ee9771e426c4aeee7a8d
diff --git a/dev-libs/bitset/bitset-2.8.4-r1.ebuild b/dev-libs/bitset/bitset-2.8.4-r1.ebuild
deleted file mode 100644
index 74a48300b7fc..000000000000
--- a/dev-libs/bitset/bitset-2.8.4-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
-
-inherit autotools
-
-DESCRIPTION="A compressed bitset with supporting data structures and algorithms"
-HOMEPAGE="https://github.com/chriso/bitset"
-SRC_URI="https://github.com/chriso/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="jemalloc static-libs tcmalloc"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	tcmalloc? ( dev-util/google-perftools:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="?? ( jemalloc tcmalloc )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local tcmalloc_lib_name='tcmalloc'
-
-	has_version dev-util/google-perftools[minimal] && tcmalloc_lib_name='tcmalloc_minimal'
-
-	local myeconfargs=(
-		$(use_with jemalloc) \
-		$(use_with tcmalloc) \
-		$(use_with tcmalloc tcmalloc-lib "${tcmalloc_lib_name}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/bitset/bitset-2.8.4-r2.ebuild b/dev-libs/bitset/bitset-2.8.4-r2.ebuild
new file mode 100644
index 000000000000..a40c6612612d
--- /dev/null
+++ b/dev-libs/bitset/bitset-2.8.4-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A compressed bitset with supporting data structures and algorithms"
+HOMEPAGE="https://github.com/chriso/bitset"
+SRC_URI="https://github.com/chriso/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="jemalloc static-libs tcmalloc"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="
+	tcmalloc? ( dev-util/google-perftools:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local tcmalloc_lib_name='tcmalloc'
+
+	has_version dev-util/google-perftools[minimal] && tcmalloc_lib_name='tcmalloc_minimal'
+
+	local myeconfargs=(
+		--enable-portable-binary \
+		$(use_with jemalloc) \
+		$(use_with tcmalloc) \
+		$(use_with tcmalloc tcmalloc-lib "${tcmalloc_lib_name}")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 2dc4b0efecb8..ccdeb8871add 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -9,5 +9,5 @@ DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f0408328
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B 90d0fdd0d832da9f503999914fec8c8d6c49aeee20ac7bab0d943eaa42ce518fb9193da12877304693d55a2bddc62605ad40c7a61b92a202737b43b751f7e590 SHA512 1910cdf860922e7794ccf2a7a7afe316c96e2ae2a2b4b0ee2f87571ac3b44202aab7d328006f962d5ad970bd295bb0b387d2969578e7f14c23a123a9817256cb
-EBUILD boost-1.77.0-r2.ebuild 10759 BLAKE2B 908381800fbe0a3cfcbba00c1f6b47bdc36e400c6da70408607ad20b298d9a1f664ba17e25ef1b74c9ca2baa272686e5ded781fc46de5442bafd35d0c03c0e16 SHA512 89ca69dd4a2e50568ab2b92178177aabca956bb5aa867b8031fbdc4f05bed0cf6bddca60e1ef6534f1e8e4378621af87bbd767da6bdc4e1a63e1b6930c7b6a20
+EBUILD boost-1.77.0-r2.ebuild 10765 BLAKE2B 2b4e7948151ea04834f63b22d61cc1557532355d43d02b64835f82f8d5043db20afa04372353c698237312aada7f29c1f30463845b5d810c93ca98f8bfc7e608 SHA512 86713296f8c1eba476e928bb83877da473f45ca9429646cf580223a80581e487b29a6b58cfabbe85965863c3c047106ba28d62dbf74eac54048b4634175479ae
 MISC metadata.xml 1399 BLAKE2B 118d73d46a29003761ee30d2166e747d192010c47bda8b13448dc3b775ec40e47c51a234fe6eb0994387ce01b5bbe9e5fb1aaedccbf09674e654952400a85b03 SHA512 a82bd9de9e47c55ff4b131549d693443b6ea1986c74afa1a6b2eb2ae7885e5438db60b4c2f5620463b78b8e461942647070729ffc92fcda7fe4a9d0e8c8def66
diff --git a/dev-libs/boost/boost-1.77.0-r2.ebuild b/dev-libs/boost/boost-1.77.0-r2.ebuild
index d1061034e9ec..05e615af56f6 100644
--- a/dev-libs/boost/boost-1.77.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.77.0-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index cb50be501700..a90986069aa5 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,5 @@
 DIST clhpp-2.0.14.tar.gz 99791 BLAKE2B 4859f25359d09584bd96d63c06766ee8c8f05a09d2c79355489ab5554760511a9a500036b2988b0df85df04b591cc357f776097f91a3a9b9172ab45e8d385990 SHA512 f6b6a3c760292d0acad5eb2cb25b0d127c7615167f979c6138361376d03c66bb46735cf56716b3349f9d6691ac6557b983a767559ee5f94b163d85b90b046eb4
 DIST clhpp-2.0.15.tar.gz 99826 BLAKE2B de5f6cab05d21199ffea37bbbcc5d312a4b812b602ce091d8fa22cb615060ce08454de1341881792996dd5c06378657a297505ff25ac159d85b59995e924bca5 SHA512 d24c035425c8204099e5264e61939c568e85b64e94d5ed3c58fe9430f4516495a974080a684b742f5aea1351455a0755efccd14317c20cd34885880cf1d8133b
 EBUILD clhpp-2.0.14.ebuild 582 BLAKE2B 136db303f1a442c414151dda935ef39401f9e25608336af16bf94600777d4b8da2de0686070b7f2cd04b7ff0932e8ab51f1c36d57b601f90a3de8fdfd9b75d44 SHA512 c3d4bfdceb1250ff9ad1b5b7d1539cbc584ccb461de72178dc3eb721c0cd0d807a16f3907b697b5109f7b681eb707081725de72b69637e343a3e63b8bca3bb8a
-EBUILD clhpp-2.0.15.ebuild 584 BLAKE2B 4a2074580a6f558da632153a99e73efcf3063ae8f45cee20d8351a0b82cdb3062a70918fd1956dbca951cfa1d1b0193f4b6695d7e99a5f743382c8d5b1b2f984 SHA512 f846159cf9d795948042fe5d3a9e250e9786ddd7c1fd6a45bdf81180ec15c1efa2fb38df8eca8fd6e1dbc89b566dc62d90f70649f72a4ab9f9f0e8da7a7a882e
+EBUILD clhpp-2.0.15.ebuild 582 BLAKE2B 136db303f1a442c414151dda935ef39401f9e25608336af16bf94600777d4b8da2de0686070b7f2cd04b7ff0932e8ab51f1c36d57b601f90a3de8fdfd9b75d44 SHA512 c3d4bfdceb1250ff9ad1b5b7d1539cbc584ccb461de72178dc3eb721c0cd0d807a16f3907b697b5109f7b681eb707081725de72b69637e343a3e63b8bca3bb8a
 MISC metadata.xml 333 BLAKE2B 3cc0969695eaaef765ef2fcf3b7a529324f4e73e80e51c120a18f21f1a3fa4ad41329d61e89a1eea6a1e175f23441d615a341034edc7d924262e1b0b1ccde29d SHA512 8a62b0bd67dcc8bc40ed01b590863e748e56abf19f4a4ea2b44c0747cb017c111246f6e5b30255304ee57dd9446e61e9a193138acdc776d4d615223dc2ccfc0d
diff --git a/dev-libs/clhpp/clhpp-2.0.15.ebuild b/dev-libs/clhpp/clhpp-2.0.15.ebuild
index cf474607c72b..43da0bfe3323 100644
--- a/dev-libs/clhpp/clhpp-2.0.15.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="virtual/opencl"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index c8de69489210..2c565d67f55f 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,3 +1,3 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
-EBUILD eb-4.4.1-r1.ebuild 924 BLAKE2B 41ab8769ebe9404b0a83f750ba669be58c0f585d847fef8f6cc798be256a14e38ea3601993ee58c9c29678bc98116ae71c8c90c65917c030cc4b500d130f0f46 SHA512 4ba4a092fd93a8995ab40995b96f60b02a863c5d9777366be83bcd3f85c95d6d4ccc91f6d0e14336d62ec6346d1de1c4024599a640f0550fe0a63e7c5bd8778f
+EBUILD eb-4.4.1-r1.ebuild 931 BLAKE2B b0aa385a44c1de0f105eedd0a3d8b1309eded3a733e9ec00b69ecb998e522a4b51f5ecb74d8e502705a393b84bee6d0021c499b854b71626321912429e77fa5d SHA512 5f56973c7cddb0569004d4c7e74726ab44bee2f0c7d214150423259509215fb6d4d0062b67c9763e84e56adb2077a8598947f69b7e19a3332f5a5334ecff1160
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index 42e4a85f7619..2b14904002ea 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="ipv6 nls threads"
 
 RDEPEND="
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 236bdfefc9ce..dc679c25a906 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1260 BLAKE2B ec39f6ee4dc86a6813a0dc1bdd43d290de9bfcb017829fcda8d816b327c970a66c32c6897007d1495e75bde32945bca94b6aebf4f36a885046b805337825b62d SHA512 011aceda7ed6457bb18e85d311700a5853f514d72437e47e2c2301eb722ba23efa2c0de43b755505ae7f2738f538e47c38d55b6735c095e6e3fb7f3676c47d3e
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1266 BLAKE2B c8dfd79b2d0197bd406fbedf697be29848d9456042dac94dd1c122af7d063c18e141ca817202512b610596aa7eab707a7b1a1ffe427b834f1e3f35413fb540f5 SHA512 7c8436d5d97713a784b41e7fb7b15a5fce736b96a254b3871a11d95aed55a4c8b6d65183659664ffdd4ae8573dfa6ff24c1d3e7f154e182aca7f8329adbfc157
 MISC metadata.xml 234 BLAKE2B d40fa5140634a3e2b7255714316f9843a01b761977770c5c8e4e6fa759a77dd2372ad790f9365fa903f9bf83511f5e9ba924b0cc870a1c0838e204f468bdc162 SHA512 6e5e31a8e94de16f8aba257d25cf4668a186da2dd80f152270c287626d8f6694652cf6ec964ae22b8525c4a41489f636ee6f4ea3c7b2b562e10d045dcd08f6dd
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 5b5f6b46643b..9c62e11a3867 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="html"
 
 S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 0ecee424d629..71ad1506a306 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -7,5 +7,5 @@ EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df8
 EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
 EBUILD gjs-1.68.2.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85
 EBUILD gjs-1.68.3.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85
-EBUILD gjs-1.68.4.ebuild 1124 BLAKE2B aab376b682d7cb230178140ce5de9f15a52304725f1075d61425655a109bb63163815ac07463bca353d046c0403e1b5e8092d6924c134e935e7e22390b99554c SHA512 7c86d3c696bc7c1130fa39646574071b5c18ce5386bfd4ac4f69e85f89d886f8b081f97b27231bd09fd765dfc11bcf678f1b86c80c381d867e94bd8aeb50b7a9
+EBUILD gjs-1.68.4.ebuild 1123 BLAKE2B 81ce35a233a0f349bcd2f385a556e1adba1dd2831735a4a8ecdb7f27429313800c6f1d38d482d2c487b2ad45e3d03da1062b093bcbd9ff83a9f6d109d42c5e47 SHA512 689ced56d20cf592776a1e3f6ee7d4385936f4e83ce54edbf5fbd7d27cb887e3df4b09d8b3f1ce039289f873f6dc0827389b831c1ba1755f65818fc2918066f6
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.68.4.ebuild b/dev-libs/gjs/gjs-1.68.4.ebuild
index 59c3cbc790bb..2374d8c78d49 100644
--- a/dev-libs/gjs/gjs-1.68.4.ebuild
+++ b/dev-libs/gjs/gjs-1.68.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc64 ~riscv ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index ecd3ebea51fa..2cd375492458 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,6 +1,8 @@
 AUX intel-neo-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
 DIST intel-neo-21.33.20678.tar.gz 4534884 BLAKE2B 9a5e7f962be08701bec1e890eeb5b6208694a33b524872494e428b73d46629b7cde1522c6b7d0b27725cc170f1e65391892b253ca84d988b209e41631548b135 SHA512 278284fafe0e2d340668e1c21188b706ab48439c6ea573885d1b060df458e2016ed40e0a0c65e4076378ddb3ab284eb2cd92b1db5e6bd892babf2275ed600341
 DIST intel-neo-21.37.20939.tar.gz 4576917 BLAKE2B 42563ce897667025100b40f504fe4897222fd28f1b82ac22fb6cfaa6a273b8e9199d57743ab338ab52b32c9598bbf6856530688ca9cbff360db356dabed6d96b SHA512 ed213e2fd234300ac940ffa503a34ae54698e2d359927b3bdcb59bf7ea9d6b950073e9e2e750ec5b8e3e387f0c8d74b4852627c283964fd6a9742dcdc32f518f
+DIST intel-neo-21.38.21026.tar.gz 4655853 BLAKE2B 28ebfb1cbce30fdefb7104a2b6840ea95d62645ae51a97a0b970aa4344fca7e64eb8f289895c30cf9fe4a0d9e5294490810236c0e565e78383ad7096429e2155 SHA512 08ffaaed80ef5776e6ecff15467170ca143887cda7905a49f7b2d12862ff17e75e7ff89ff2bb76ce25eec4ef32dfc882ac3cddf5a3e71d24adb21cc8c806cf5b
 EBUILD intel-neo-21.33.20678-r1.ebuild 1379 BLAKE2B 0f7744319bc583c37a86f3c3f91ba2a6d90963d7f35d69396096a8d2fbc43672ee5c5681f77365800c95357770f9f9bec6dc75db2df14eeb6c684e4e802d72e4 SHA512 a073f813ba246c9d88f13ebe1977df77a1513b49516af15c4d87037667ef3c5687a45bf3f17b21549986834980a53f0e1ca59606254bbd5871c1f362336e59a8
 EBUILD intel-neo-21.37.20939.ebuild 1391 BLAKE2B e1eb3bbc59e10c5fe95021ea856d74dc9831e40d8b329ef14da04a197d9444b07e27c968651103721c69760048ed6fbb5e3fef40430668158a0bb0865d2cd979 SHA512 98e2835cd742d982e96be8e8fcd572d0067c124ba1e94e31515015c653e32b0354a7b89b5b5b41e6bf2491e328db2ad5f32bc2b7f90f7441006c935bc19db6e3
+EBUILD intel-neo-21.38.21026.ebuild 1388 BLAKE2B a2fddcb0c335ceb56ea0783d969036cfe490254c2636c934c01b9427edbe5607bb04413d4abcf3f22397afc16dc1f2b76d589160702480f1dcafb33b20b9d44a SHA512 c73e578c437a41f3bf59568a1a7c90b995f64b2fba93e3656105d96d1d32066a0a13dfc3ee3545895e630bb7134a7ae2627e7458ec96ec1e5872d0162b6e6b5e
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-neo/intel-neo-21.38.21026.ebuild b/dev-libs/intel-neo/intel-neo-21.38.21026.ebuild
new file mode 100644
index 000000000000..df46dbb3c9c5
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-21.38.21026.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8708
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index d3c86e65b5d5..0b0b85e7ae0e 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,4 +1,6 @@
 AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
+DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
+EBUILD jansson-2.14.ebuild 851 BLAKE2B 6fa261a87936dbc2edd0aff70321ff7576d59063c6e1d2afd1a9ad91b1e0ab3e762e9e1f4f1211c7b03d5e036196d719f092ac581fcab1ceaf8b4c2589b0f7be SHA512 075c4fa6eb753b4d4358f33a5f62cb697bdbec8f1af3b93ace8bca8b56aad062695bf947a7c8d4f6d493f4e01b81cac474b7646a5eafab3cf8830b2b48a039c1
 MISC metadata.xml 395 BLAKE2B 414a914de07c51b1fae68121cbeeff2b4975fa351e068d250c7d88f6ac8832a2c954f311f547494e10a78dbc5b9b7ccd1fdbb46335f28bac7b23cb5aa13050ba SHA512 067ae2c24fdd77747a78590731e1946bc0a2150038e9722d60ef97c428538046f20843bea2bd970d9591c7f7dbbef2fd81b605fcc2d67daaa55551cfd3d7dd24
diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14.ebuild
new file mode 100644
index 000000000000..28cc3b9bc422
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( dev-python/sphinx )"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake html
+		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 970d87818001..02508802a9d9 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,3 @@
 DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
-EBUILD libdazzle-3.40.0.ebuild 1695 BLAKE2B 2121aa223e97a6f2e33eee10520a1a2b6a902518e60f705ff2e75327cc54c23b7370a71863b42ec62762886769c956883b07b39628fec5d4f862184baaad83d8 SHA512 224adf1c785192b0c26a8f2918179c2f31a42e5c86a853fa67c430188ed831ac15599d1a23450cce4a6202b9a9eb4a9c562f0c2c615c5cc6f91ecc0b6b0dd10e
+EBUILD libdazzle-3.40.0.ebuild 1702 BLAKE2B c3e106800152ec6f2d7ef0156f85016fbbfb27dd815cd6ad6fdf7b21a62e31dae5bf58d233e5f2a7e032c9075e00931327a1460e5e72457ab027c6db18a71dd4 SHA512 1ab1bda49dc015ca1a9ff84e467c43373ec74127ff82f78bf34164680038373ad9ddafc99391a19d4b972bdb03726e1459e5780cb1a4f56e27e8e489f8f7144e
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
index 9995d728a144..86eded995e3f 100644
--- a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 29798f82370f..767889914dac 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc
 DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc SHA512 428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc
+DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
 EBUILD libgit2-1.1.1.ebuild 1679 BLAKE2B 9dd07e9bbe4d89983be44c8496fdda580f0934bce1d25088062a4f0b9fdd32dfa7fa845bb7d5bb601aa150d76aa22484845ae1ad0d97a81a23fd788eec737528 SHA512 8ed3e5abd8e9c97bc73c7b487d9669d973a5d3992090eb3a5ca72868a9309193ab03515a9dd1c8804f6c5457ce29a966091489666f40a8a917916a7492913e87
 EBUILD libgit2-1.2.0.ebuild 1686 BLAKE2B d397aafdeeb75006880dabf9653b88921794cee0f79ecf2498fbeb303dd5816d74afe21c03076eaaa6e575d0e96f57d0e697d7e0e859ad97f4bc02860fe9c6f3 SHA512 55e66ddcf474bca68cc61ed829a22b830f083ff584239d23c62d48ec0ad45dca75294c7bff0d27bb425cc6152ea71dd03e05082da846e8fcf086dc38a136fd90
+EBUILD libgit2-1.3.0.ebuild 1697 BLAKE2B 4e336b16d73964d6ecd3547b7da0938ba472be7e693d96267682ee81680823ac3e2847572d0079a46a50e42ec8f7d550749d285495ea953bde115b2e6e5ea068 SHA512 7518a47ed5a06c22282aaf4ee9b722062db1f0dcc42badce7beb6b2eff7c631a1e550b4beeaf84203b0124bf19a720121217934a125786d35435560f3fee5d3b
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.3.0.ebuild b/dev-libs/libgit2/libgit2-1.3.0.ebuild
new file mode 100644
index 000000000000..18a2c3f5725b
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 767fbbe50fbd..56a1b26b67ad 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r3.ebuild 1695 BLAKE2B 0de75b9e4214f6e31f5d6724c8fdf4c4ce1ec908bfbd2bdcc48d8909c858665c2864bae99c66a21d30202997c2e92ef9c6491cdae00324b871e2ffb8d01f113b SHA512 77256f5332fe5a4278278d83290adcdfcced1b9b7d988bbb88c6d048d9eef779ee186dd85df450dac13b13c78f81250eb833f4c5eeec553702ff230af1458b93
+EBUILD libindicate-12.10.1-r3.ebuild 1702 BLAKE2B 4d85590aac09c71161deb2deaac47082d7cb742a1cf25388a83e0c7e5c1d68756f14900a5c645728eee7f9bb7fffe17ff6b8d9691d63563af30a2761f7204b74 SHA512 058fbf32fcb53cf08b8da92ec7fa1fc30ccac7af3aebff141dcba226919ff5cd3f1b5edbf7b42b04ef81bdcd7b42e55eac02e1e63e3c153ef94887ae2cdb32fd
 MISC metadata.xml 247 BLAKE2B eec2dcbcd33f264a92a826ef6e2817dc76b1fa8612c04d9b6404e24b0d210071908466c77f9dffa1349f49b14920c37c017b65f7f184166ca816840ada88edf3 SHA512 e9bb0332e8873e5fc733d47280c49cbeef950d32999ee14bea561e2af2911d7b467da253ec8bba84aac703b9ae6090d690bbede71a4e58ed45a4b1ef513bdf55
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index e008a4843281..d0c6402d4d7d 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index cc8aaa4daa03..93c98ee3d4e5 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,9 @@
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 DIST libinput-1.18.1.tar.xz 618524 BLAKE2B 17c5959b6319838dc65f6df7c532d8e048b0295d20178e636dcb3d7a0418f7c107ffc34f280ac0da66011cc80fb8e9f0881b5edd6a4fb64fb674dff6bb5b4526 SHA512 450e38c0f8245aa0165a8047d25aebee646332f0f2ed442bb2d1bd3e723c2082b6d00d6e3bda308981ece8e29b5cddbd56eab900d2b7497705a45fc27b281828
 DIST libinput-1.19.0.tar.xz 654308 BLAKE2B 6942e704881360724d02f94a9ab87b90c350d16c28305af796a55eed67665cb4c4cbf035a0aaa085ccfc0027bb1936e722bf43dea53dee1c80b2376859dfba9f SHA512 daf42ce797f2b5aef8d6f7a5c0d967590581e6ac12c26fa6bde5fbc619d75319e39ca55d65d5347e554dd6a48b91f5fed4d3167eabef8ad1ebc43bc0c3e8e220
+DIST libinput-1.19.1.tar.xz 654600 BLAKE2B fb1c26874e29fc12d5259b00e0790d65584c8128cc7dc0abf3b094abfef5f26a45fb06142fdad3cef13774d6bc9a99a50636e9745270a4113e76e3ba5b6bad0f SHA512 63084f5e081ee4918fee8584d99e6feb84ce9b771015c556c930843e0097abb9b93b6f9731c488b8493eac18fa4086f4822a2ed00f3cb3258346341ad0061c36
 EBUILD libinput-1.18.0.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.18.1.ebuild 2238 BLAKE2B 43ced7b5366371b3afd4f323b1ac3e495b72b54c534f781b29a0aa4575489edaebe7d72c82397f0217991c359e14a0a0552440bc9c738130b4bc6dcb728fea24 SHA512 25aefacda707d779534b25ff2c3c2dd738d8ca4d185aa8970df51bd31a1b97b1644451fb5301a05dff1f43cae0af660f6635f1abdaa450175ced1d92b7f01099
 EBUILD libinput-1.19.0.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
+EBUILD libinput-1.19.1.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.19.1.ebuild b/dev-libs/libinput/libinput-1.19.1.ebuild
new file mode 100644
index 000000000000..c16d3716f3d0
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.19.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 -b "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version -b ">=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/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 735e63b97795..6f6245f9cd5f 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1,5 @@
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
 DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753
 EBUILD liblinear-242.ebuild 1459 BLAKE2B ad59f7cc9e33ddd6ca95c9917fbe60e94c61fd37a01e2ea9f40ecaeba0b58db1ab8779800b16a3391495acac236797e8a273df47ca89440d43862265fd8e0cd8 SHA512 a539d6f4ec7eb498e08fa4dae3519ece15cf89e574ecd3c9e77ebbe747caea3a924406d8510b74331752fbf0b7059f526190c8d60d915f02b11c2f5766a16ef5
-EBUILD liblinear-243.ebuild 1459 BLAKE2B ad59f7cc9e33ddd6ca95c9917fbe60e94c61fd37a01e2ea9f40ecaeba0b58db1ab8779800b16a3391495acac236797e8a273df47ca89440d43862265fd8e0cd8 SHA512 a539d6f4ec7eb498e08fa4dae3519ece15cf89e574ecd3c9e77ebbe747caea3a924406d8510b74331752fbf0b7059f526190c8d60d915f02b11c2f5766a16ef5
+EBUILD liblinear-243.ebuild 1466 BLAKE2B 9cafa876c51c1249333e8ba8d281a6496deda1e925be38969258296c268056cc8dde11bf5d39fc79194375aaca93072ad81fb971c243667933398d4e89a64763 SHA512 78a1a58ded00873ca43e83798b4227abae72e0173963a1f3e04ecb346c8f32585559bd818d23a5d903a21d1d46968919a40d34267eccb3f70caa7470885b75a7
 MISC metadata.xml 321 BLAKE2B f0d36d15cfe505a947f4c0f4a3506490219f64008ba1d7c2afb4d95e5d8dc20ec93ef4b4d07db204da3a133bb4280bec310ce2861d60105c9dde53b84cf0a9c8 SHA512 1c964bff243d61563f5be044b80cb9f57f3a02b089cdaf43399d5813cfd3dcadfdc04a01db9218a7dfaa8b39a463b6ec1eebe4a4a60ae332a1db746de5d0d40c
diff --git a/dev-libs/liblinear/liblinear-243.ebuild b/dev-libs/liblinear/liblinear-243.ebuild
index d05e7d8cc0df..1a25ecb9b04b 100644
--- a/dev-libs/liblinear/liblinear-243.ebuild
+++ b/dev-libs/liblinear/liblinear-243.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libmaa/Manifest b/dev-libs/libmaa/Manifest
index f0854ef53aa9..3c911ecb7cb0 100644
--- a/dev-libs/libmaa/Manifest
+++ b/dev-libs/libmaa/Manifest
@@ -1,3 +1,3 @@
 DIST libmaa-1.3.2.tar.gz 287198 BLAKE2B 62432f7f21e353c68a0e9b8f843a5a5acafba5c0cc8e745b07596d7dcaaf9adf723342474b95895fbe1cf003d87d856892ea52196808937b4befdc50ce6d0155 SHA512 dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176
-EBUILD libmaa-1.3.2.ebuild 580 BLAKE2B 825f5708f103ce2ca9a001727207c9ef44da5e678626b0f5d995cd62089532349c3e0534605095bb72cd5908bb09f7ec01a4299678de8d4f5ed25fb3a759c0ab SHA512 d5b7e67de587f8f40f9faf5317e2f670a334f758d0d1cef8a8307f84eaf82c851b966b4b92cbe69197e5ef2839c45637fc555b3973c0ba21d785d54774f9f598
+EBUILD libmaa-1.3.2.ebuild 587 BLAKE2B 815e6414023ed8c83ad35e5d9d5c31341a42d21925538887dc36e8c32c4c23eb3a5e34c185315b03030c41374429f27cd32f16a6dc6a3e3292c44c11a679a387 SHA512 6cd823d83dc1af56831eab0f15b90f5b87243aff4cd189f2914304de0d6b45cf1991469b23c15c7a8f73a2c5181e0ca6ecccaed7bed9e741e6666abb8eb6fa1c
 MISC metadata.xml 787 BLAKE2B ea09adf2db0d3ad48fd100b3fdf9a8abb516fc9ce75e3503e5a6e5098f5beaded6195ff2c1dd987e92628657c9aee5d54cc2d71038658eab5150562a87f7ca32 SHA512 670545afb3368a782110664a5d3d463be36d4f1ea5ef09430f612ebbdd65456d35d72cba0023e7316358f555224c3c7024a37c07a276e05a5a67c4c937375060
diff --git a/dev-libs/libmaa/libmaa-1.3.2.ebuild b/dev-libs/libmaa/libmaa-1.3.2.ebuild
index 3824b2de2e8c..be5b4c16751d 100644
--- a/dev-libs/libmaa/libmaa-1.3.2.ebuild
+++ b/dev-libs/libmaa/libmaa-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 src_install() {
 	default
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 6ab06aa6ee53..e3c9d7da56dc 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -2,6 +2,8 @@ AUX libofx-0.10.1-docdir.patch 1192 BLAKE2B 0fde1254701b6022970346600f1dbdec14c9
 AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a80470c5b2fcde2c2c2ffaaeb75901e1391e79c617270af5b22942d067d43bb9522e78faeadca300e7a59c2f9f5a4e58332a SHA512 f5bb1ba87e68213e609c50f96635e7bf1de009a8e6720586fa62ad19f68776f9b8871a7782ff439f310ea31dc8010c5a4bce4b78398b980c11a6f8b6a81ebf27
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c59191fe2b836a0c2a988b6d0404821a9f99be1fa4b258afbbc35b0cb254b348a1e7a0f7a8c4010645afff52f91 SHA512 14ba2779d94209312a8a1bbf598e6a31820df4fa7e222ae1abb8d4234a6c7ba7068e06a73ad4ee93bcb53ccb99a8007d799d9e66a9921704dc75c84b0e7dc307
+DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
 EBUILD libofx-0.10.2.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
+EBUILD libofx-0.10.3.ebuild 1157 BLAKE2B 3c53d2e9540cd5f0e97e1ba9b17fb4a82b0f3bd900f757c99cd63c3a92363cbfe02632db68469a5fe1b3bdd73d08323d1041376321746c2dc392b9303498843b SHA512 002c21658a1d11af11de67fdca9380e489fc74991b6cdf2bc50f4396cf4b1acdc9407aba9a36206242e31213f6136b59241edf06f53a04505c1bd0bc96411a6d
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/libofx-0.10.3.ebuild b/dev-libs/libofx/libofx-0.10.3.ebuild
new file mode 100644
index 000000000000..ae5c04394d48
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.10.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-crypt/gnupg )
+"
+RDEPEND="
+	>app-text/opensp-1.5
+	app-text/openjade
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Not included in the tarball
+	sed -i -e '/INSTALL/d' Makefile.am || die
+
+	# bug #566456
+	append-cxxflags -std=c++14
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc html-docs) \
+		--disable-static
+}
+
+src_compile() {
+	emake -j1
+
+	if use doc ; then
+		emake doc
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.a' -type f -delete || die
+}
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 7dfa6c38c5c5..11e46a1ae034 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -2,5 +2,5 @@ AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54
 AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-5.2.0-r10.ebuild 2090 BLAKE2B 518d8b28c5fb2056510ba3f9c23046821ae6fac9883a5c9f10ae8484c12234a2639a28233b49ec98b36d239834dddd8f895df6cb45d46b65aa5ee91a88f18261 SHA512 b024355425efcb4a2a4746324de6d3bdc1087d03aa775281c8177bdf8c2c56bdf76647df7088cc5d2ff4c56a07e1bb336109117499089034b86aecfa3464929a
+EBUILD libprelude-5.2.0-r10.ebuild 2063 BLAKE2B 859bff279c0f3c110fe3dc3b99e8d00456f26a2f4237b714e94150c206def08dbbb62bdf64072bfa5340e48bbb9cd519aeb81b20a47e8a7c3b8115babcff965b SHA512 3cc3df6a72e57c314587e7198efa4184dccd7976fa63a9411d281bc1905185a47b99c85bb8a71a5e511b62c50c7d7a2344b7d60772c758c353470a8af00f7f16
 MISC metadata.xml 902 BLAKE2B c2e06db4cfe2d669d4096d41a00401199b03419206b9d69d011be926a6751bb50a3fa215e5f123f97199c4b0b9abb481a798e97bc61d99af7eeea5a70af26dbe SHA512 002876d6c69fa3df62e13d30d87e5c479fff09c5fe23f925c5643afaa2c2e280493d4bb821d2ac281f7ffc71ff0a139fbe2c5a6d7751fff7cb5b1d3ed151ab79
diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
index f73c8917ffb8..161d051dc157 100644
--- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 USE_RUBY="ruby25 ruby26 ruby27"
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
 LUA_COMPAT=( lua5-{1..3} )
 
 inherit autotools distutils-r1 lua-single ruby-single
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 85dfdee728ec..f2f0ab378cd0 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -2,5 +2,5 @@ AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aee
 AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688
 DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
-EBUILD libpreludedb-5.2.0.ebuild 1902 BLAKE2B 70abf2f4c1a002049b36aa37e173d813679fe875eb3ae127c6e1d69bd2bf17a719f29c6700d9d4615fbd93939817b7a340ddf5e8b6869d26ded6b92a4073746b SHA512 ef0089648810af994210043f51c197a82323bde7d940b95de29140674755a0470308cc2f7a54b10ee7ca1975d77d0c7d13936bc0e90f03903872293f5563755c
+EBUILD libpreludedb-5.2.0.ebuild 1876 BLAKE2B 82ae50c137091dc1a8044ebe71abcdc94e1ef05aad2bd66ea905dc74fd371e58160b2ec6d91db90df528fda3303abded1895f5280c4105e8027450748d127fb0 SHA512 c88cb822e44e41bca58e4467dd27cde10a182aa06c6de89992cd43c2942cca78e0e43bd13ad18542061fcf7acc34d8744b905b4ce10df26df976c89f26a1b9ea
 MISC metadata.xml 771 BLAKE2B bb1edc33156941cfa0ccfb9d61c268b755212bdbf03045fb875f2d9d544412a1d234f287a2a41a5d4d74b0baa509b2a46fc251283bd1f55a822d0145627f135b SHA512 feca887a2b6fb371ecdf358ec464510f0656e34b8ae58e9b16c47b84156f60c6217bf9618fb2def9c17b1633b53d03155954af5e4dca83d56758427eb6a5cc5a
diff --git a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
index 10cbdec64d1c..257006361297 100644
--- a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit autotools distutils-r1
 
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index cd3232b011cf..764e3511a22b 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,3 @@
-DIST libqtxdg-3.6.0.tar.xz 76028 BLAKE2B 138f0f8bf9889c7f6aa0d4016c52d4c7745a9f3b34b53babba5d0be457485157d66884395488d4e978ba953332696b977bb60c1d04b6b0a53086ab7f3b0b4492 SHA512 8574bb6834c0a44c983e906c3d84fb5cfd6e2f40ec2ac70f4998ec5fe213aeb0d4439ff294f56c1988cb9d1b311c4e074906ba66b21d24190a911d0e643d1a16
 DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
-EBUILD libqtxdg-3.6.0.ebuild 971 BLAKE2B a4471147a7ae1f92b03f04c85b65d7950f6b4f26dbc7241583eab924ff53372e588f6a0f02c54e5ad9d56f0c34424b070ee229bb584cbc54c9169c1d3ce97ac3 SHA512 5953b841cef2438a9d47c8690a18e9d80160bc6117baf3f982a7fdbe51d542ba385e88896cb9df1dcd7608f6fafe6c6df286113e79ddb74584cab155e2df48f1
 EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
deleted file mode 100644
index c25bbb458b3f..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake virtualx
-
-DESCRIPTION="Qt Implementation of XDG Standards"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
-SLOT="0"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	x11-misc/xdg-utils
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Tests don't work with C
-	LC_ALL=en_US.utf8 virtx cmake_src_test
-}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 3db37f44f6ee..80782c45efd5 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,3 @@
-DIST libreport-2.15.1.tar.gz 1860410 BLAKE2B 43743fc7a7698851e247956621286cc94dbfcc451b8d95aaff9263e65f787b23f7bbf5d7ec087196d5f9f30a697c66e547bbccdc913b3ea2a17ea4c7bf77ee02 SHA512 70f947690173a0afa57981c9755a18bdd0ad44c888c00713de74624296b81ff25203d5dda5d5c57eac85da4a1631585184b77715c7adf6688b469e32d4113cf4
 DIST libreport-2.15.2.tar.gz 1859867 BLAKE2B f890e3cb8b2a23647e4c3fb0caaf984b1b21fd32e066d04f835f8a475e317cbc75287375e0a10a01b91670d04bba1f15b1180065f7029b8d7d1c0a2fb890914b SHA512 c98003325fa70d674177c9f602a7f121815a9675701ee780ad8908ed69862f2c69be65c7483fd3f017ba299dda51ba304f0908c771c9d97cb5bba057e3a9c5dc
-EBUILD libreport-2.15.1.ebuild 1941 BLAKE2B 999dd154bf0da4387db110706c4a9139fc905a1ec59b7c6b3a0567099626b8f7a175e033d9398fe0e45b4e824e3675bb9526c44ca3d818af08b89f79935ad356 SHA512 ad0a31390264afb01e74acd8d31cf9002785f5210674aac5cae05012b12458dbc1bb7a8036d7f064dbd77d3523b7880f59b7858cdf7911f496b6cfca8dcfbd45
 EBUILD libreport-2.15.2.ebuild 1942 BLAKE2B fffb0d535a1c653c12ef66c4c216276dd5cbcec78f83f9f7a947d0aa645503c05b52be1b2fd1be1c181909adaf2fde992df058898d83c37edd19f68252e3eae7 SHA512 bb7477486d972a73b543444925290dea0eb5b68f1e14db85e6f7a653d5c5bc9f2c049451c3ab346712ff380d1beb936bc56a6bca302c9bf39a547aee8d44632c
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/dev-libs/libreport/libreport-2.15.1.ebuild b/dev-libs/libreport/libreport-2.15.1.ebuild
deleted file mode 100644
index 2cdc5d5a57d5..000000000000
--- a/dev-libs/libreport/libreport-2.15.1.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
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://github.com/abrt/libreport"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk +python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-admin/augeas
-	app-arch/libarchive:0=
-	>=dev-libs/glib-2.43.4:2
-	dev-libs/satyr:0=
-	dev-libs/json-c:=
-	dev-libs/libxml2:2
-	dev-libs/nettle:=
-	dev-libs/newt:=
-	dev-libs/xmlrpc-c:=
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	sys-apps/systemd
-	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
-	python? ( ${PYTHON_DEPS} )
-	x11-misc/xdg-utils
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	use python && python_setup
-
-	local myargs=(
-		--localstatedir="${EPREFIX}/var"
-		--without-bugzilla
-		$(use_with gtk)
-		$(use_with python python3)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir econf "${myargs[@]}"
-	else
-		econf "${myargs[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_install() {
-			default
-			python_optimize
-		}
-		python_foreach_impl run_in_build_dir python_install
-	else
-		default
-	fi
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libserdes/Manifest b/dev-libs/libserdes/Manifest
index fc41c5440bd3..3cbbdf618a4b 100644
--- a/dev-libs/libserdes/Manifest
+++ b/dev-libs/libserdes/Manifest
@@ -1,3 +1,3 @@
 DIST libserdes-5.4.0.tar.gz 62331 BLAKE2B 01f06004e1af2374a9d5d039b9d0a8d53bc1e61bfd4bcc6ae1a4794553903140b73373d7e9d8799069df7369219c579b30b06dab07cbb860b4d42d2cc7e9c0a1 SHA512 3ecddf59c069a4d9ff2b8e718f700e897cad762d0858e34bb4a6a63030226b7e6fe8956431149b59678240d590a2a04f026d49c2052a22f2694fe61037f2e1f4
-EBUILD libserdes-5.4.0.ebuild 470 BLAKE2B 56bed1a6433eaaf224b31ed18408c2f1f8147eae2c4301e1203b2c22a70a0f08d11881d84ec6277ff8fe77624073db19bdaf35ef56439fa8bd27046de6027eb0 SHA512 3c0a60684912bb2d6bd3a6f8de9b45857dcf3ca0e3f2f4003ecb797c3680f8923aa25bd9e3a0dc4b6b2b06c6da916718139b086c20b9effcfc414dbfd1d5eab2
+EBUILD libserdes-5.4.0-r1.ebuild 469 BLAKE2B 20488849e49382168fc04f75f85e4b925c9e5d04f18d924329eaab2fb00208fbf79f6e0b49b6d8a7ab9f4edac3921a7660cfa09aa8b463637fb588e35385fa2a SHA512 4b9ebc7183ddbafcc81010f82e2731683a29a08c5a807a0632c9e6d193d871f01852daaf4a4439d0a99092402733c1405d04e99302dc18b424d2b8899371e98f
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-libs/libserdes/libserdes-5.4.0-r1.ebuild b/dev-libs/libserdes/libserdes-5.4.0-r1.ebuild
new file mode 100644
index 000000000000..50e09c427958
--- /dev/null
+++ b/dev-libs/libserdes/libserdes-5.4.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Avro SerializationDeserialization w/ Confluent schema-registry support"
+HOMEPAGE="https://github.com/confluentinc/libserdes"
+SRC_URI="https://github.com/confluentinc/libserdes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="dev-libs/jansson:=
+	net-misc/curl
+	dev-libs/avro-c"
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/libserdes/libserdes-5.4.0.ebuild b/dev-libs/libserdes/libserdes-5.4.0.ebuild
deleted file mode 100644
index de284b4ea594..000000000000
--- a/dev-libs/libserdes/libserdes-5.4.0.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
-
-DESCRIPTION="Avro SerializationDeserialization w/ Confluent schema-registry support"
-HOMEPAGE="https://github.com/confluentinc/libserdes"
-SRC_URI="https://github.com/confluentinc/libserdes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	dev-libs/jansson
-	net-misc/curl
-	dev-libs/avro-c"
-	RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 144db453df7a..4e71f59de8f5 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r2.ebuild 3047 BLAKE2B a700ba9868cdeff6e096dd309c867f331d64507c34fa754b204743bfcf32ae2ca1ceb4a625f303ff30cab012e2085ee1fdd176f665d81ca42c7731b51564288c SHA512 5bd769cde0c61a158fcacc508691d1e397ce2873fdda9eec545d7bbea5d0d2ac17938fda971f9e85dcb4f6162495be45f91f2efdf42d9c6881c2f35f669db96f
+EBUILD libtomcrypt-1.18.2-r2.ebuild 3053 BLAKE2B 002de7444d478f4d86e198b9caecb36dfac51a61aa0a53270d5c748a3f87fe05bf57139633f246e0bbbe2c92a64a201147307de9911e614c00a049543f5e5f31 SHA512 fb3de1aa006de280ec8ec6ea1317d55148e5b2d5b218adae410fcfc13197837e524f5af8d4edfed9371559046ac47345009c83f5fb881f52106972c4fde2c95a
 MISC metadata.xml 644 BLAKE2B 112aa0ed4b144bc52466f2e247814612bca0ddae22539aa4262826f5bba0c7daac8810939fff61cb3330bc6f921a606a81dae06db9200d22d722a3b6586c17e5 SHA512 2e2fcc358f5f2d0f3ae6566e1af4a5eb4dc40b8eede752bc408d0d77177c6d0540ef5c7b4ed6ca0ebd9822b3260fca3e367b59c1c52d8e7133cd0f92e2b1c957
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 840969fcf5a4..635ce69ed4a1 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 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 ~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="+gmp +libtommath tomsfastmath"
 
 # Enforce at least one math provider
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index caa33938295d..4c2720144c98 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,3 @@
-DIST libzia-4.28.tar.gz 634470 BLAKE2B 1d75f761b171e5b6b34b58b80588b00a13d6ed041d8eee8bbda98ea6b9c381b98f386f653fbdaa75b3119f0701cdd1c25234863a6c5ec608c935dcbae2bf6463 SHA512 12a8013db5db531e22cbe9c3f2e1ddc2c31696e47f527880772933042f8ccb60cd03abd9ef865c4b4344c8efe88e9f275cea4b2c0c07fe6321ef31c9a77b0307
-DIST libzia-4.29.tar.gz 633172 BLAKE2B 418ce8eb6a034979948f284e5153c7cb903647e0e4776210d98a4d78c01a6147701c0be6afd21067a918ab91426cff3710cddfbdb8d4828da361c92fa71c987c SHA512 f487fb36faab0c96cb75ccbb3ce6cd51732648beb07d67a128402da294f406666fe0b65be6be49debd2b3bd78aa578c5c797aaad9dc4beac923333a0474442cc
 DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
-EBUILD libzia-4.28.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
-EBUILD libzia-4.29.ebuild 974 BLAKE2B 5177c338c3ecad1e31a5280bb2d6464de5f4fe2b9f21fcc8bca57509de76d69ba40306753ee0caa93772fe9024a4c2284840480deb855300fa9fa7cb9f3e0916 SHA512 570e34e0a7e696447b8515dbf4cd382250128d11bb54608bb7635154da4b1b6bc76d547ae349b31341f87296791bb0b3f42a276a66092f5659fd5f88a633831d
-EBUILD libzia-4.30.ebuild 973 BLAKE2B ab9bba92505e484b34bc3755fa159cd58da2ab5454a34176fdd00c03e7b8adfa6789ce2b717e97ec13b89d75afd0e3c8aa5a72d29b0ff27b10bbb0b76ab0409c SHA512 ec88f219e7d87c6083b788ca24f2aea7fe8b74a7c524dc4a13f2e184d5a4677d338e1d8fa9e6a43bd57154c34360b358cf6928d9237956954613066665681bf9
+EBUILD libzia-4.30.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.28.ebuild b/dev-libs/libzia/libzia-4.28.ebuild
deleted file mode 100644
index 9e77c8f593da..000000000000
--- a/dev-libs/libzia/libzia-4.28.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 autotools
-
-DESCRIPTION="Platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libzia/libzia-4.29.ebuild b/dev-libs/libzia/libzia-4.29.ebuild
deleted file mode 100644
index b085977f4099..000000000000
--- a/dev-libs/libzia/libzia-4.29.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 autotools
-
-DESCRIPTION="Platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libzia/libzia-4.30.ebuild b/dev-libs/libzia/libzia-4.30.ebuild
index 09c762fe9f4c..9e77c8f593da 100644
--- a/dev-libs/libzia/libzia-4.30.ebuild
+++ b/dev-libs/libzia/libzia-4.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 39c08d61bbd7..c725d26b596f 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,5 +1,5 @@
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 DIST nss-pem-1.0.8.tar.xz 41840 BLAKE2B 6a210517b6f70a6a1a0351970811500c1364c6cbb0159dc4b7b3edeff7c01d3b643a5a4a4946a350a1a49898570141acda1e913fdc79d750339f5021445e61c7 SHA512 9fd1fa9203fd707668506752be6f99d26e53281b8b95d7c3020da33ab8cb287890b66c8a59f1ee952fe8d2a8a350d7c5b4214a523a2e1762e48989f02c408b33
 EBUILD nss-pem-1.0.7.ebuild 709 BLAKE2B be88263a61e86d281777161fdd427bd38b77d25b407713bd076d3a61c1b511186f62a66c71d0a4fe9b8834e858fb93518db686b19438e70000352ad12f8d1b84 SHA512 1fd7d140a2afba6e65671fd0c210b67e829f6ae609695a6bb69e51a0241f0f0b199ced96ee962b995e543fb908841e5c4349ecc041e6a7ca6c69e0cc7b10b05e
-EBUILD nss-pem-1.0.8.ebuild 717 BLAKE2B 69babe83789f83ad5d67ec078d4efa1a8e9ca57bc01e61243383f6ab93298008f85e69175e81f12d815adc2e1c516562971c0779accd5f460bd6401b563d6c03 SHA512 410c940b2abc625ee3a48d65c6e8968bd51a5d892f633640d1fb1dd211aa8a9940a23967dafb149c172942c82aba3cc5092bff7738a412d8f74cbdfbe6cb7462
+EBUILD nss-pem-1.0.8.ebuild 723 BLAKE2B 31264384e6dc4011d9909f23149d856535af1511404fffdedb838764385228fa455fdef595415e3933a20c300ed6d62c202b5db81346d4fbea285a1bd95972f1 SHA512 168f048773c31d9f811197b1385f957d0fca35f8c0218ab00bf3c0b0d9ea186254392285309fd00dd3a634987708cde8012044caeac79b2b7524a6e7d0330b18
 MISC metadata.xml 334 BLAKE2B 7d88d82ca4bedbacb87ab53bc2a30e77ab13b062c439dacd1521f68a5677bad460310abf9f1e69826c44eaee4cade54bdb0d30923a7d2dfef9eaa4554288498e SHA512 c1a58a0c5e2401a1b75e4223f2cc6e0a25e8a3ead8c5c3f86cf96675ecf3dd813d0db4652fb6c68e0acbffa62ca6e4123dc74a4f565345cb1bba79e033b41922
diff --git a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
index f8c08a838631..206d21b02806 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 679d6a9b0543..4ce112bf6d37 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
 DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
 EBUILD opencl-icd-loader-2021.04.29.ebuild 887 BLAKE2B dc8dfa8729cdae1efaf08ef950051ee8d40385ac9ac85b61172ce9ccce8794d4ac208c190d6a0572ad4f02008b01a9437b8312153bf3a5716f7460bb83c273fb SHA512 14e1ca4a25d3dc5819abe67218371ac1b2bc603323c3123432a7789fc345eaec3d62b7bac85cdaca2c2d82355dec8ec9357a82352262fa79f329218c5f02eeba
-EBUILD opencl-icd-loader-2021.06.30.ebuild 889 BLAKE2B c75ae71fa8f45690e58d91771112b7c76035cf8df3deac199a1f7fe46ec7932ed2a9dc366a8056c98ee3923ee5ec7f55759ccb340a10c5d9ab79203f697bb192 SHA512 0b16bfb299d3532ba7c68fef818a103fb008d5dd41bad675b129774057c02caac134037162dbc29d8a943a5feab10a5ec160621329a74ee77852ab4a09d1b1dd
+EBUILD opencl-icd-loader-2021.06.30.ebuild 887 BLAKE2B 152f167a5385e89f7e6929f78186aa8472abca2bfac911ffa223200f3c8231455b9e9d83de56ec36f9708f7a4d27df7c169e01061db30c0b6a4a342c777d3d2d SHA512 1d26f1fb0fde5932ed82a935b6893e0762d7ff8aa419f0ed1afbb69f02b7e72f31c0ebccae5aa7255ecf717b7d1d70dcfaa400e258b298615c93245e38fa60dd
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
index 7ff078b1e4cc..3a69e3949bbb 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index de0daa6cb7df..8a79d819df84 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,8 +1,8 @@
 AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
 AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
-AUX pegtl-3.2.0-no-werror.patch 2200 BLAKE2B d202ab63aef347bc627d2c791a44e9051e98b624529cf7454cd9e210fc49e0c0e9432d19e72eae7b42735da1a94ac81cd7568d41db98842cb592e89334bfdc70 SHA512 82263553435fec96bc24ac269875c92c119dbd02c701f60db6040a8f6dbda7e8681595b774915e37673cd48bed6318bed0eca6b9bad4d23be86cd7128c36d214
+AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff831c92629806ee0e78be602a5457b4fa9dc60eaa4cb143fd4a06343d7c0845ed775a74b6bdfa9b2d3524aa9c4a SHA512 4a1dd50fd206045c1c78a577f792c481edd5e1d2220ce4428074c2cc3b78e9cc67d8f3f5830477cbe8ce76b13f3ba9f0dc280aaff4bd072ae5715eee6d14bdd1
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
 EBUILD pegtl-2.8.3-r1.ebuild 735 BLAKE2B 954e7a6b26792e51e8cfcc80a3fa9923a117e36cd9afe091322501eefd06c3398796de9b50ec3d63bc015333e67ec4de840ca868b11d3428c655389856f385e2 SHA512 dbdf8f3c6eccc8992800b3261c220d8394ccf03f4142baf4b3ab2f3347be1c5901039d9efca36d47a6baf05977b78544b5114cf5ba693eaae2aa9935331535f7
-EBUILD pegtl-3.2.0.ebuild 693 BLAKE2B 8c16f80abe747f59aa7e03508064f6c5b03d0307697637df125140176edf6f622896d431cc57945454bf4d13617692e54f4eebd1307e6c3bf9b278b823765cc4 SHA512 03db97ee727fad813729146c971ebfde7bc79c0205ebaddd753b193677a932ce3d5e4a492bc3130d9ac9bc55f7d33f31e54efbef7337207c2e9a26479b72f6ca
+EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
deleted file mode 100644
index 32bc4b5103ef..000000000000
--- a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/787854
-
-From b807854fc6573d59350551578375075fc61a21e1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 15 Jun 2021 01:31:40 +0000
-Subject: [PATCH] Drop -Werror
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- Makefile                         | 2 +-
- src/example/pegtl/CMakeLists.txt | 2 +-
- src/test/pegtl/CMakeLists.txt    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3ecca07..2b8fa20 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,7 +30,7 @@ endif
- # changed if desired.
- 
- CPPFLAGS ?= -pedantic
--CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS)
-+CXXFLAGS ?= -Wall -Wextra -Wshadow $(MINGW_CXXFLAGS)
- 
- HEADERS := $(shell find include -name '*.hpp')
- SOURCES := $(shell find src -name '*.cpp')
-diff --git a/src/example/pegtl/CMakeLists.txt b/src/example/pegtl/CMakeLists.txt
-index d416731..4d1a417 100644
---- a/src/example/pegtl/CMakeLists.txt
-+++ b/src/example/pegtl/CMakeLists.txt
-@@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources})
-   if(MSVC)
-     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
-   else()
--    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
-+    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
-   endif()
- endforeach()
- 
-diff --git a/src/test/pegtl/CMakeLists.txt b/src/test/pegtl/CMakeLists.txt
-index 577e310..84a8ab8 100644
---- a/src/test/pegtl/CMakeLists.txt
-+++ b/src/test/pegtl/CMakeLists.txt
-@@ -146,7 +146,7 @@ foreach(testsourcefile ${test_sources})
-   if(MSVC)
-     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
-   else()
--    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
-+    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
-   endif()
-   if(ANDROID)
-     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
--- 
-2.32.0
-
diff --git a/dev-libs/pegtl/files/pegtl-3.2.1-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.1-werror.patch
new file mode 100644
index 000000000000..776936bd3991
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-3.2.1-werror.patch
@@ -0,0 +1,33 @@
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ endif
+ # changed if desired.
+ 
+ CPPFLAGS ?= -pedantic
+-CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS)
++CXXFLAGS ?= -Wall -Wextra -Wshadow $(MINGW_CXXFLAGS)
+ 
+ HEADERS := $(shell find include -name '*.hpp')
+ SOURCES := $(shell find src -name '*.cpp')
+--- a/src/example/pegtl/CMakeLists.txt
++++ b/src/example/pegtl/CMakeLists.txt
+@@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources})
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow )
+   endif()
+ endforeach()
+ 
+--- a/src/test/pegtl/CMakeLists.txt
++++ b/src/test/pegtl/CMakeLists.txt
+@@ -150,7 +150,7 @@ foreach(testsourcefile ${test_sources})
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow )
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild
deleted file mode 100644
index 439aa90eed58..000000000000
--- a/dev-libs/pegtl/pegtl-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.0-no-werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
-		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/pegtl/pegtl-3.2.1.ebuild b/dev-libs/pegtl/pegtl-3.2.1.ebuild
new file mode 100644
index 000000000000..09fd47749d97
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-3.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-werror.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 773b1ba1f637..328f4f6d408b 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,5 +3,5 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r4.ebuild 1548 BLAKE2B 4ce5af5105d0eb838e24846f730ec7d7d77f9c2fd15cc35f727f0d920be3feaa3ac68a35de362b525bf658544ea6f98494ca6df1e1c45df0b10cf35cb4f46549 SHA512 103a615b9a4bbc8c9206a64f3b3394d65200bb65c51e24bf81823824fd9d6b360e75c96c4723ec0e1e7c6d68b2b045b9344dcb34f4dfc950b86e132f7b376c06
+EBUILD tinyxml-2.6.2-r4.ebuild 1555 BLAKE2B 9d3b221461ca3a3af80110428dba1fb3133001d86b80bc7c4bc6cd5340f1e9b4a823436c4d52a1c5b8a580b9cca30f763afab76aad979559df7954373b61110a SHA512 a98ca3e566bc7b490098ee253f66a4c5fa4362cdc2c531fe754c51be44d6f7ab512f62dffe0344a4536e52f4595828f78b5e642ce8682650c03e8df45bcc9285
 MISC metadata.xml 406 BLAKE2B a9c50ef75e9049b1cc89df08b71e7640581c5f34fadcb0cd9fd9f29679bc3a1122db2e8fe8ad1ed738a9f4fe39771a8b4980fa4f2cb387e3e464c92a492b833c SHA512 b589dec8ab67f4e0aa9e073f55ed147ef22b08aa9adabb3270bb83d50a17da967e364ab131815c3a9ee32c8c61b0f3ec6ec6e3d7f4d8dd0fe5daaaa5420a89c0
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
index 59f37c5da51e..e11d76946f84 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 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="debug doc static-libs +stl"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index b7317fd44447..2433dc8357c4 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,5 +1,5 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B c8a5807133b732b2f6803ecfc94cd2f659d8beb639a3ebf076f91d74e724774f3b9e2dd7e02e02ea5557714fab0c78c7b2401147478b7fa0cf3fa6c7191291db SHA512 9cf93d1630b2214613b93b3c03524a37a853aa0ed196591db777ec40221dd663a1d1c4d450996864330b203791ca09c94764ac99df2869da88460b57a45410bc
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1731 BLAKE2B 29decd63a892b95489b674cc907ab01b1d3430c8263ac73bc1fb8b3c1d906336fff2f791f5d4061d21c5294f77fccfd9617747baedaff850edaaf31f0c89c90c SHA512 28e69bab1dbf8bfded72496873f9cc56c298c81ee2363facd7794f8449ea4f09aafc80d644ca17442952bd4bf5de5a6788feb23daa409bb4367bf2ceeaad892d
 MISC metadata.xml 359 BLAKE2B 030e4a98548860a65398f536ba5cd9ed5bdfed894d48ecda1e41b0808123ea50da90264218d64f79a2df90b8841a69d4a605f4ae76904157b18659cb1b05a25a SHA512 cdd01b2deaddb96866d614bcc23dbed7d320db408d70bdbc6e1cecd06b6851208a49870155c7790db8e1db34b1bec2fb565de55045d1e39185819c42fa0fd75c
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index c369b6ebb419..f07c6214647d 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="sys-devel/libtool"
 
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 52d2a9c0d2d6..6019da8382d0 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
-EBUILD voikko-fi-2.4.ebuild 848 BLAKE2B 31d6bf4f4af6ca80b70da74cce78614b469bc8c176803b0b976c90fe05645c43518e535b613dca80cb68f858ec921ee52511aa39569ea3179d7e916328752704 SHA512 cbd67839b92ea4657a7e5b856db6e1fc7fcf51ec4a9e9d3cc9a2c5606e08e59dd18823a24d8b3c78398f95adc13ca0dbcc337a19548aff28931d8b563267238f
+EBUILD voikko-fi-2.4.ebuild 869 BLAKE2B a70729fe98dc6fbfbb296432f8bb7e5e9766896a932fadbd115e307c107b3ed52ef39a983a4153154544e070141fe39c0c480e656977347cb89502db737f0bbd SHA512 2e0aee9206204998b87e737a19bc1ba40a59d7b81ea60649ffa4b90953e0e75aa7393d62043dd6bc86a7591f55cc3b1acd979336d4bb4d5c9d0925e3b93edded
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index b2351309f371..24cb050502cc 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
 
 inherit python-any-r1 verify-sig
 
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
index 8f4afd170344..1cdb16ea1bea 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}"
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 0e3f4df18ca1..3bc403fc6b42 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,5 +1,5 @@
 AUX LuaBitOp-1.0.2-support-lua5-3+.patch 2747 BLAKE2B 1e00ea3f2b8c99b49bff1b0ed43e3bea370646a2a9c80856bafdcb58f2fc68ed3050ee980546ec75996608f7e97c3201f3b9240a13941edb43f7ef883c261ec0 SHA512 2b6a247b4fe18a87b7b3114d7b01dfbd36e2acd2c937661e1224f2828f610150022949f8b4b8a2d07f21bb1c79a1113b6d78436a284b4552b3ebf9f72184be82
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
 EBUILD LuaBitOp-1.0.2-r102.ebuild 1746 BLAKE2B a065378b441af4f0ce0c571f17a1942d631e263fab06348ddd9409ac36eef4eded9a213413da3e98ea6e035a1d5b90a21137e4ff10c087409d3c2098c47bafc0 SHA512 3cdf405feb439e55fd2060c337e34ba23b79a5c8a2664771cfd0da378afd9f46bb58d904eca96792d7a73e6ae325f194e17124fb2f0d8bf3a07443740b3ab89a
-EBUILD LuaBitOp-1.0.2-r103.ebuild 1808 BLAKE2B 357fc5f6fdff428cbec6d0ed77e05ab8c2f0ecae5d3a68bcdb0df47e285b4bff23623e2e324fc60dfaf21598e0fb01a2688af878eb4dbe76e1442866db6667fc SHA512 d62b70b849d29d33631a8addaed4f7cd39b23c7efa00548d50a1bdd7f3ef081b099421415204fb7e7e494018c905cfe895112f4afb2ea47d86d9d08624904e82
+EBUILD LuaBitOp-1.0.2-r103.ebuild 1803 BLAKE2B a729625004e3dc88cbd39138a0233f20777aae68dac9fd4076024aa00e12fc2197872512162a88d4bdb12787f51a586accac6a5e5df18a26a4a1062bd5c202a0 SHA512 55841f9f3002f696a8d1e7cc2f983d522bc4a856515ecfb66b572d079c803dd1d4ab23869d4353e8b2bab5562d26179209a2e263f0ed85b170b7c46f7dad1e2a
 MISC metadata.xml 360 BLAKE2B e4c9313bdd5791822c8af70399c9fb8674b0650f600ea6c15e804756e50d201e1b07bc98f4556181dc4575a9dec07de525fb972bfa0980920cbefc83d7fb8a06 SHA512 c7bea4ae5b69e5e446054b553678263b5971e620ec491c0f5872ff5b292f45614191ffe0b01ba6a9a73dcc43cca0c249f1a31ad23f22b6a4ff3cc4bfc2980cf6
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index c85ce6085d43..aee26d98b0cd 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 7e2e7bb952f8..4455170acc9d 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +1,5 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
+DIST luaposix-35.1.tar.gz 180002 BLAKE2B fc48ae91c31968cb92ea9818148f135e16e2bacac10265cbfa43539c34a934c4eb636417b820ce3b0b3724fecbf27a860c6b481749d339b009fc01b6f81e6277 SHA512 f2c36bf69c0d73b4a2c6ab0915f81473addce427c22e82e2d1c334016dec7fecb4365fc980fa6adb0de21ad1a60bc75b73f58579e8a423990ad2067c9ae37775
 EBUILD luaposix-35.0-r103.ebuild 1835 BLAKE2B 6223069db43b82d34ae389954d528d8212122fcef2200319c39a2b0fcc89f4120768bb1cdb2bfe95c734649dd9b0469e87d8d5f7dc97a4a53b8ecba8a51a8ff8 SHA512 a1b1a134363de4fe57a583493dd7196594d4fc1d0919ac2dbc1e083c08b7661637ffe94e9a0ad4ceeb96a0accb78ffb7e6b181a41ac55cf1d44c0d0b634fc90f
+EBUILD luaposix-35.1.ebuild 1674 BLAKE2B 62ba3a833e56f4aa46db67a59407e8335548b7accc1b5197255192102ff225d3f134bde0e047d63d56ceeb288db2429e592dca09e554a95899e3c0fb2f639feb SHA512 afb4495a078d36b24e2a83123aa0201f479099918b07c1b64749442546bcb0d1f02a29dc568e243de08fc3823c0465d1668e0e56d3dbd0c1c562d2855be646d1
 MISC metadata.xml 505 BLAKE2B 42b52401c50e93a3698230d49e18e22f600de6e1b991a8294d3c7dad3eeaea7f88029f60db28d6b29b4fb825e75627647e1c5d771b0bf3030e99676fb40110bb SHA512 fa4fe245d0dd8497bfbb0fd13568401258085fc7d3a2f31167a7ba816f2b979430d76bdaccb5fcb5ed7840d559a3478f7208a972cf665a426a9336cd74059654
diff --git a/dev-lua/luaposix/luaposix-35.1.ebuild b/dev-lua/luaposix/luaposix-35.1.ebuild
new file mode 100644
index 000000000000..656a22c8df1d
--- /dev/null
+++ b/dev-lua/luaposix/luaposix-35.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Bindings for POSIX APIs"
+HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
+SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Requires specl, which is not in the tree yet
+RESTRICT="test"
+
+DEPEND="${LUA_DEPS}
+	virtual/libcrypt:=
+"
+RDEPEND="${DEPEND}
+	lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] )
+	lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	# LDOC=true means disable ldoc update documentation
+	./build-aux/luke --verbose package="${PN}" version="${PV}" \
+		LDOC=true \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
+		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
+		LUA_INCDIR="${EPREFIX}/$(lua_get_include_dir)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
+
+	popd || die
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	./build-aux/luke install \
+		LDOC=true \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
+		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
+		|| die
+
+	popd || die
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	dodoc {NEWS,README}.md
+	use doc && dodoc -r doc
+}
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
index 2e3c2f0208c4..475f5a9a30d6 100644
--- a/dev-lua/toluapp/Manifest
+++ b/dev-lua/toluapp/Manifest
@@ -1,5 +1,5 @@
 AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1435 BLAKE2B cdcfa5e194dafa466cca5fb05d8cdfc285b97ff3a91c81fe71159601245576527a2f3d8539c3a3f15be745eab14cfe084a3fc90042e141b503dcee8063c85f8f SHA512 2cf6c341e3749aff13a89cc5894b900132b78b423a3b3c858d0235735c2c237b5503ea5a187ddcb851c12a69d42400da1e7556081e178edaafd406b84fb6e893
 AUX toluapp-1.0.93_p20190513-lua-version.patch 288 BLAKE2B c98560e520abbc9106be46a28e604f1436a110de9fb267ec106c9ad00241dcb849861ef195e9344d785520e78d821b7a2750685778746eefc6c4d3619c81043f SHA512 cad6055a6fd10af78f068abbcc6921f22119206cca190d41010182edd4805b38b595b33bb7fe6ed3e90cca19b9ae944dfde8910ba14d284bca0fbf20f9a4ee1b
 DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442
-EBUILD toluapp-1.0.93_p20190513-r100.ebuild 947 BLAKE2B 89a03f6527442da15fdd59d249c1135a5f18881d2d87f8a5c59d20e0a4af9c58f7b0fb4b966c74fab1d27a57423c7963aa6183b02220aa42db9e0b7d89acbcf4 SHA512 f83eb137cbb7e6ad654ce73f9a1017370d7554f890f7808bd38fc6e6ce45659945bb63a18069caffb63c815c120622ae970c0ffdfb33da43c8571903f1f497bf
+EBUILD toluapp-1.0.93_p20190513-r100.ebuild 948 BLAKE2B e89c8acaf4d0c794c4eb04c2a3bac37aeed123a3044b7395396252ca7dcdf4787b2d14a31794c3a77f28238e210c7d1ade8ceb59443300200124bd6769e02fdd SHA512 90917e144a9c79b49b99ec0209534a83c2f99aa91e7b3b536a10c935b01f4287cc6f04d2cb9828d23ed5eae522f073f0431fb5617958647cfe91c0762b9901dc
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
index c921edc57500..1e925c75128b 100644
--- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
@@ -6,6 +6,8 @@ EAPI=7
 # Newer Lua versions are NOT supported, see Bug #508222
 LUA_COMPAT=( lua5-1 )
 
+CMAKE_REMOVE_MODULES_LIST="dist lua FindLua"
+
 inherit cmake lua-single
 
 MY_PN=${PN/pp/++}
@@ -30,7 +32,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
 	"${FILESDIR}"/${PN}-1.0.93_p20190513-lua-version.patch
 )
-CMAKE_REMOVE_MODULES_LIST="dist lua FindLua"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0ddebea05f19..515754648b0d 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 5558c356ac8a..4ebac7753771 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
-EBUILD async_kernel-0.14.0.ebuild 500 BLAKE2B 8d70ecdd21dc2568ea7e6a94480d79e2f563762f4309ea2136e6f4e6a78918fd25914e93599bb2f62eceb81eafaeef69acd2604b9a5e295630e8adc13e4cf35b SHA512 b80bb0f6c1bba72f13b2e9bacdb4a9693bb510c32592900d9009e20b56555ebb5a074c38b2b2ade4a2ef12474687b36e5b325ba981f247d7fe98ca04a333942b
-MISC metadata.xml 256 BLAKE2B f8f153d6840745fc0af52238d159f66b675d261c09cebe3e5d8251387703e2dd0050b9040e1a6aba5b9769cf4f000258b4885e7c1c379e71cd6d5176c6fc5434 SHA512 ac3d53bb3af15bc9c2de5b1bfab10c62b0e67eedb213230abeddf5006c833af65087fe66a8357963742f298962b49601b1ea75b0bae6bf2b6203f2dbef691be9
+EBUILD async_kernel-0.14.0.ebuild 565 BLAKE2B 9376ebda9f8880bd66e0791bea4710c09aa197ab0d39988997c4f9140a8355d280cb27efa5f195f3abfd8cc3f220af76291d47de6e0f39de8050c2958065fb35 SHA512 0f4bf1064315796f72b8d59f56e2b72698196674032d767cc7446e70788aeb20a9196c0db2785fbf8e352c0abe64094b1e0599b6946c5f7a5be68a8e07278aea
+MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
index eddff5633056..4f2232ed012e 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -19,3 +19,7 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index 4885bbdae3a5..84b93df47b35 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/async_kernel</remote-id>
 	</upstream>
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index caf5d9e4d188..34bd47ae0cab 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,3 +1,3 @@
 DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
-EBUILD async_unix-0.14.0.ebuild 536 BLAKE2B 987e590419d042071795ad047cdda5dead8c7def791753b6ec31c946e4b78085ccb0931285374b724a20df66754548326e5fb372af35147e79c17775674175a6 SHA512 a6542b3fb14b53ee5959b13700caefa8b364649cd2a0a42caaf8884060c0f82616b273d18196546cf222ae290c36c0d0fa1f63f0d865b70329b2518ea2d0e6af
-MISC metadata.xml 254 BLAKE2B dd6dee74755d31c9fab252deefed0731672f3224b343c6bd98393114ee7acac59c5e2240fb220e2ba7e121214a84ff449f1c0c4e038a5340faf129da8bd7688f SHA512 51b639a6e376b68161eb36e430eda17edfa88f3a74e6fbf0cda4682ca8cd3812af98421e8c99fb099dca83dcecc07d2c11f9943da2cc05a5540f7d2447c9ce62
+EBUILD async_unix-0.14.0.ebuild 601 BLAKE2B 168319dec24032943c55367cde25214e08c769db30143d500f9d9a1711176959450d44868e65dddd1b75b6b3bfde07593e5aad6d87b66660f177f5db92b4d032 SHA512 b8de94d856302bdd7e376c8901650dfd0d41026865f53c8619a76e9f0dc51bee3ee887ec861a20e39fe68c1e470916107dcb735c1dc887cb22fd4f9eb1359be8
+MISC metadata.xml 319 BLAKE2B 057719c234859791c2afb0f8e286a8050ad1373cb0318c0d0fbd9ff9906e65131871ecd0cc0f01993c58abaae60eab700b2ba5fc8fe56487150de4aea9e50aad SHA512 5a813d9ff6adc78e1ef4e8dd30b670313bdd15a191ba3ca12c5f4ad2a9dd9d23d69003bcf1805a8490006c46440674db701275c51351b05bcb05902199ae7072
diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild
index 51bdd90f7140..231d23d4ecdf 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -21,3 +21,7 @@ RDEPEND="
 	dev-ml/ppx_jane:=
 "
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index 9a0ff9dd7d4e..517a5e2afdfd 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/async_unix</remote-id>
 	</upstream>
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index e54da8d9e2f9..16e8c37c1823 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,5 +1,5 @@
 DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
 DIST base-0.14.1.tar.gz 385381 BLAKE2B 619c5c437237bb3ea9f428b450085eff2cb4639bf11803bcb2ae9f147b3ae39af72cfcfa10aaa5e74446bff4ba5f553815ff790190845f12e5e5b5080b197237 SHA512 5675a8b6b1ee5b7bd992ac9fbb036239f11b8a8c7cac9059ca38581d91f42e35d7bfa5839a90ed227344dd4c7b1bbacf0e7871d958c81f6ccf7e072b64ceff2e
-EBUILD base-0.14.0.ebuild 480 BLAKE2B 9bf362a5511760be4d1ce2c034d1463bcbbaf454fabde6504bac3cf4f9464962f90912db47a9921d0689679df3fd04ddd0b40cfa1b3e02f52789db79953ea820 SHA512 1c0c091e87a6e3e9ae7cd7204b3d67331f07b8ba53bf8886662c950611452b9e95857f964c1125fd0b3d187402700a1887e810f7605e482b02c2e55a627b0e02
+EBUILD base-0.14.0.ebuild 502 BLAKE2B a7be7cfeb7add4d794834686cbae812939ce7653d30a0e7e0212cbad47cda1335db05d50465d7955b16472d5dddf86366510097a67d108828566e5acac24130a SHA512 1887f190062ab377a3d6efe8b631d00c1735902526046ff59a309c9a96c756a75a4e42a95ff3a4bc0af23745eaf10006df27340a1f3411e92fb2388d75181b17
 EBUILD base-0.14.1.ebuild 486 BLAKE2B f45d23ba7ec9690f78a4cfbab8ccfeccee98fc1bd08e3965ce6d9960d84bacc141485d4f7782e2e6464fe5d35c7183cb046fbd195f14d55f688cf50d1779d9cc SHA512 e0c83936ab8e766ba976fbd4d57bc77d549b291f8585a80caf2761868b7b3688c01275165f1987f3bde830c8a4d93c8d4d335b3778551395907fa76a55052776
 MISC metadata.xml 325 BLAKE2B b6ec2fe282aaec8d1859a20e908ba83bee431d766a21006a2effc6d68d26ea62d7e8bda2b6f2cb4e8a04b9ccbdfa4f3041b154bce987474b3375faf3d889e851 SHA512 ad9744b303444107c9177eca8ab5aa45fef6121d17b091f460c414f13b139672b068e0c041fc335c3f6bcfe8b8657bb2f116e9397b3acefaa61d42e25b01053d
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
index c45143ed9c05..335aee9d07c6 100644
--- a/dev-ml/base/base-0.14.0.ebuild
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	>=dev-ml/sexplib0-0.14.0:=
 	dev-ml/dune-configurator:=
 "
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index f0bc8fe66c9f..47abfea8a68f 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,3 +1,5 @@
 DIST core-0.14.0.tar.gz 361607 BLAKE2B 1602857bee142c23101380e6d54b6f8df1be8bb67e8f8baf7ca65c2f248d1ff9794e33d96cc58ca1f591b69e4a16b7873043549e01d38e2fc390c884d117d0a3 SHA512 fd3202c115ccda53aa32233f2eac223dcc3fb6272fd6327ea6aa5dcd3b7295936d86102640046c961a2af45d62aa3563a2701a2e0ef54f6cd2bfcb81609639f4
-EBUILD core-0.14.0-r3.ebuild 641 BLAKE2B edb3da1a6608f21de5b96a3017a411bdac80b3f5652450cd96eafeab2206c156bbe22e37decf29bdddd82782c412aa0573102fdcc46ff36ce05e0b17442b5ada SHA512 f95a79cb182f14280d8b244962e48a0f658b70173929e8c04c1215c0bb9fd4fda3f24f9c9a16daa01684f6665a2e45df3fbb7e989d6372abc8b1c438827c4d80
+DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42fd9a60d6c4c894187671526ae07e0b93d29bee961b3460e1b0ec5cb346cc711d583c71fde94a9bf9992bf7e SHA512 29482b1f611f2f15f11562bfed7f8a47d2926333601ed57867c8c134d4b10dbf2ba0309ceb6ae602fe8bca1e1f9324603dba37a5df3183cd0cb690104817ed3f
+EBUILD core-0.14.0-r3.ebuild 663 BLAKE2B 1603396fc7966e792be0d0320b79ca222694d8294ecb657f70794ff69838c9c77401f2c986e93810945a418f2094371afe31bd56183e503c1fb1ed1295c20dee SHA512 6afad762041ff18d91d7be8dd136eaa92d4e51d55d22ce674c56b161104c91d618866db19b65c89e567c8bca5d7209d51d8af5adf6c46c16b5e2c929e20e5726
+EBUILD core-0.14.1.ebuild 712 BLAKE2B 034642d0b7b7e414a3a24dddc76800bec600df99377d8b8f6160975083dcd123db50aa0d415c75b00cfb027845e49a09733b97b0abbcf33979b5f099abf51a36 SHA512 8abcec2a7fddfa7bba42194f87c943f71fed22e9ab7e2fff44e964162e4516c19141d4c4420004c6e7127e064483bc1394df868051b2768e6ec68dfe12d41dea
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
index 1774dc183f88..59ff7c24b085 100644
--- a/dev-ml/core/core-0.14.0-r3.ebuild
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -18,6 +18,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/base:=
 	dev-ml/core_kernel:=
 	dev-ml/jst-config:=
diff --git a/dev-ml/core/core-0.14.1.ebuild b/dev-ml/core/core-0.14.1.ebuild
new file mode 100644
index 000000000000..6ebd5813a98f
--- /dev/null
+++ b/dev-ml/core/core-0.14.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+# TODO: Wants quickcheck_deprecated?
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/core_kernel:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_jane:=
+	dev-ml/sexplib:=
+	dev-ml/spawn:=
+	dev-ml/stdio:=
+	dev-ml/timezone:=
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index f383183115d1..756fb569b697 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1,3 +1,3 @@
 DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
-EBUILD core_bench-0.14.0.ebuild 557 BLAKE2B 1a2acc2519e360f7522e07d33a9999b57d8a5f9d335b2a369597c8d59fcdac52af1373d7078994ec90dfecf4d445efcab9b78160299cbf4936fc5abac8a070d9 SHA512 b457aa15b7851a7d0ce69762a9a3dc8c6445ed37dd1bbfd6d325bdf3c100066d591f1925a1da9a9b5d8f6d01d0e992a170b522b08498d0bb25dcb931d356bb2d
+EBUILD core_bench-0.14.0.ebuild 622 BLAKE2B bb3f7bc58d9a4e4de633aecb296e9b2500e06e24e19033bc38d8c2d55f36b81f767c8ac81ec82fa37ae1ddc8d865258164030099d2f565198188c57d94c20cf9 SHA512 79569d266887e26447472493efd8e50f4672666b68380f3256566e8f28b8b5f6808b5a2b2fdeda9f34e4f13e5217bbc3351a64943ff1f4d9177d89bacc15828d
 MISC metadata.xml 319 BLAKE2B e07f2c98a308c50d4037dd942b1a82a4b4a8c71d4be94f96611d8e2955b22c0b78a7bb729030a6ed595fc4ed65f6072bc536f03db4a8a08b43af9d75a65432f6 SHA512 32d64cd410459106199ad3d57a2ddce9651bf95be3b8334632235f9ba3963a0a3fe24142f523889ccd591fa0536b90574e9129fc594c7a7905588978b3aa886d
diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild
index c6b66b01b28d..e181169b6916 100644
--- a/dev-ml/core_bench/core_bench-0.14.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -22,3 +22,7 @@ DEPEND="
 	>=dev-ml/re-1.8.0:=
 "
 RDEPEND="${DEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 737c609c0a67..b4b6a8bdd373 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,7 +3,7 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
 DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.10.ebuild 1031 BLAKE2B 0b291f15603a68a55b067b06d97260aff40ccbf369ba3690a3abc3e5e1716761f461d5290c3213ee5ee1bfe384f22cca05b7db00fbffd0c92d24e8ddefe71916 SHA512 adb3cef90955814d4a0de78e636688132a964ce9d8a56a1867d1c535178812bea47cb9b256a017d82a4abf65dda4ec69617a16db5b8fea9f6fee6b89acc4e3b3
+EBUILD labltk-8.06.10.ebuild 1109 BLAKE2B 43329dcce76e081ee41e741a2c8bf9e089fe835e292e97fcdd5dea84f677155c7a1f3164cce4008f7cdca39b1250328f5eac1bfc0489f49663efe36296a0f572 SHA512 b51fbe704766d898630afcf12e1cac590a610173c385b23c054a5f42a22b8a7c0236c622d60e998e72045ae3e19469d378b9abe1da9fb6c2577ac170bb4a58cb
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 6acd06b500f4..3390c7d7b988 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -22,9 +22,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/findlib.patch"
-	"${FILESDIR}"/${P}-this-expression-has-type.patch
 )
 
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.11" && \
+		eapply "${FILESDIR}"/${P}-this-expression-has-type.patch
+	default
+}
+
 src_configure() {
 	./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
 }
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index fbd78b3cc31f..3510638bcc1a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc2.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc3.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
-EBUILD llvm-ocaml-13.0.0_rc4.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
+EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 2580 BLAKE2B d044f3d8750bf37a1f9079a0f7659edc50f220abaeff810415062774adde9917e074ae1034da360cd4144e6f23a850b6485b83332edffc89a36282362d76f067 SHA512 2b9d1d759648d36996dcda05b872a204081247100e4cb1efe674ae3853d137ab4169115f4d0466d5b02316e1a35a302733085257bf96e22b8ba964d868e670dd
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
new file mode 100644
index 000000000000..6fb5f35078cf
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_USE_TARGETS=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/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
deleted file mode 100644
index d0039fc6ae95..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_USE_TARGETS=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/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
deleted file mode 100644
index d0039fc6ae95..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_USE_TARGETS=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/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
deleted file mode 100644
index d0039fc6ae95..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-LLVM_USE_TARGETS=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/lwt/Manifest b/dev-ml/lwt/Manifest
index aafcf29ea922..e6e2829a08a8 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,4 +1,5 @@
+AUX lwt-5.3.0-ocaml-4.12.patch 652 BLAKE2B 743c149e53b45dca0797b4b6ceb7cdb9eda64b2233561ac11be492223ff94a5043703651899bf42051b9dfe6481e6f84c6ac968ecf708d9fda09e5dd911f0e2c SHA512 d3073948decaeb3888ee93b5a41fb7ef6db69390a08bf5e78752f85a5c7453a3c0abae0dae0fda9a950acc76560937f7e03dc4bc6c81cbcbbb9998d0282b7c79
 AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
-EBUILD lwt-5.3.0-r1.ebuild 798 BLAKE2B eef325ce5007d70b4d2925513c7bd421a002ba17a5dd4b0f3a2f5234c04af2841e02af4b515aa7bd537eeb2c03a873ec775d792fc4067811f15b4a7b50741aac SHA512 999d03e9b1c86e9ba9b7f0b6085b7b61e3477ea8a8aa9e7d7808038284e9678d9d79e70926ada1d3db6678bac44a6b9212f84fd7a80302090133362012f0f7c9
-MISC metadata.xml 321 BLAKE2B b05531b4f8b4ad6cc9b111231a7c114970a4506514f099156653fae278076399f50900d339d735cdbdf1a98206c822a3e581839e04ab82bccf994888e8b966aa SHA512 8a5dd27270f1a9ecdd18cb632a7e5812a3b5d6a4cbc87e4fbf5ab4e7396302722a3583584939b8d2fe0182cc70cd79b0c32798edcdb516ebdd472c7b316208cf
+EBUILD lwt-5.3.0-r1.ebuild 900 BLAKE2B 81df205f80c964da2d0caf0ed5437731507e6eae59700279e55d702c442800b3f9051fd07afa67437b6d52b316a7cfc73dfdd9990514789df43b964688c9c139 SHA512 88dac96b1bf0bcc7dc08f7ddbda5cc065055e0cd0865d32a2da6344823cb8efa3ff1371f68042b92e1ee88df5913ed74bcd2628be50b080ad974905d957a30d2
+MISC metadata.xml 414 BLAKE2B 34a1192334c52a4dfe3746119293c05cccc14f6a4b7b5faad4834ad33996a98be8c7854096eebe870a4a0bdc675d796f55788334503423a99632b1625d84b8d9 SHA512 09660f044d6132779e8e63fe6dbca02109317f70af905181b8b344348c72257df804022fedf884c84ddbfe2d60dbcb965e3cc273c30c593f70a083d80c2f92aa
diff --git a/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
new file mode 100644
index 000000000000..048e28d1d6bc
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
@@ -0,0 +1,24 @@
+--- a/src/unix/lwt_unix.cppo.ml	2021-10-01 20:35:45.285987395 +0200
++++ b/src/unix/lwt_unix.cppo.ml	2021-10-01 20:36:19.570493202 +0200
+@@ -1819,6 +1819,9 @@
+   | SO_ACCEPTCONN
+   | TCP_NODELAY
+   | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++  | SO_REUSEPORT
++#endif
+ 
+ type socket_int_option =
+   Unix.socket_int_option =
+--- a/src/unix/lwt_unix.cppo.mli	2021-10-01 20:33:57.558539065 +0200
++++ b/src/unix/lwt_unix.cppo.mli	2021-10-01 20:35:30.393202008 +0200
+@@ -1008,6 +1008,9 @@
+   | SO_ACCEPTCONN
+   | TCP_NODELAY
+   | IPV6_ONLY
++#if OCAML_VERSION >= (4, 12, 0)
++  | SO_REUSEPORT
++#endif
+ 
+ type socket_int_option =
+     Unix.socket_int_option =
diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
index b635eab67eb5..40958766de01 100644
--- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
+++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
@@ -32,4 +32,9 @@ BDEPEND="
 # backported from https://github.com/ocsigen/lwt/pull/807
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
+	"${FILESDIR}"/${P}-ocaml-4.12.patch
 )
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 18be4f6c21a9..52dc9a8f7464 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index d2dc0b9c546c..27ac48a08b3b 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b9
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
 EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
-EBUILD merlin-4.1-r2.ebuild 1258 BLAKE2B 0827684f440916233f9577321217024ffe796ca3cf233d657eae007758638c5d3e1f9f4388d0d6fb430e27a6fcfc65ca8b3ac567132144c300a45b3f9d3a4cfe SHA512 f9960931fae791496b32be1796326a7785652457e1551ba8491e744083c0efe2b11ced05e209bacafa78aae0dcb596a09611553fa30bb75eed5fcd230287ee3e
+EBUILD merlin-4.1-r2.ebuild 1404 BLAKE2B 95db10376b3937bfeff54106b8aa1099ba852590b07a670f1499764862e7f1dd74e05efc461570947e0d5f9dc5c94d3ed9bc1449805e91bae33358cace53dd68 SHA512 07798a89c19f854966f3e078127a1f599b61e17ff905f5dd300ac8101b87465995f536c85cf6ea92db0b9f3d5e34419aa11c3d36baa61ceb4386c398e4707ae9
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 70e3b0b53a56..20b1824bea52 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
@@ -26,7 +27,8 @@ RDEPEND="
 		app-emacs/company-mode
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -35,6 +37,9 @@ src_prepare() {
 
 	# Handle installation via the eclass
 	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
 }
 
 src_compile() {
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 79cbb16021d4..47e15659e9cf 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
-EBUILD opam-format-2.0.8-r3.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
-EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
+EBUILD opam-format-2.0.8-r2.ebuild 839 BLAKE2B 9bd5bc8b71da0ecb840f1f5cb14f78052d4d0f1ce8a2beeafa8f7afac25dc1840f48dfb84087fc964d0e72ea8748c48a3df250eb3d29e7197ef949c532faadf2 SHA512 8f78d05582ada892d34954cca1265737a83932bda148890c2ce954a8909cac035f9c5c6c73ec693e7edc193750ee28e5664c26b4d4097fee194a54b7c351cf96
+EBUILD opam-format-2.0.8-r3.ebuild 1049 BLAKE2B 15d7e8ede597b898a9ca914af74a942ff1ba7c1af184439c0d3c71df22899402847d419b95c0c08a53f3297599a2697e2f45206a2cbd4c5831da65ed05f0eee0 SHA512 dd0beec122699837ac24daadefd8322230ac25ba00f36de750f63295dee21bd8737590e08855618aa6dc71c8630a504870a21d79d8b083b43bbaa9d597e90a9d
+EBUILD opam-format-2.0.9.ebuild 1049 BLAKE2B 15d7e8ede597b898a9ca914af74a942ff1ba7c1af184439c0d3c71df22899402847d419b95c0c08a53f3297599a2697e2f45206a2cbd4c5831da65ed05f0eee0 SHA512 dd0beec122699837ac24daadefd8322230ac25ba00f36de750f63295dee21bd8737590e08855618aa6dc71c8630a504870a21d79d8b083b43bbaa9d597e90a9d
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index 54b3b0ce46df..eb552240221e 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	~dev-ml/opam-core-${PV}:=
 	dev-ml/re:=
 	dev-ml/opam-file-format:=
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
index ace83b9a6ae8..ac4e8512b380 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index ace83b9a6ae8..ac4e8512b380 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 866d1b118ccc..34da9e43b6bc 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-repository-2.0.8-r1.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
-EBUILD opam-repository-2.0.8.ebuild 754 BLAKE2B f9d6d9b652e5bd1911cc8f9596a1568928915001d1e1dfa826d760d967d0c867468332496400a844f4d35fa6704656a6718fa9c25ff52ac5469b28cae92da817 SHA512 4f19f6d9dfa8760338fb68b843e6617d6b0cd96673ed4c5ae6a1229c09c8ffabb02e3ed41363d1075988b1f0fbe526cc7b3162cf0cdb01653b6bf57cfb746e42
-EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
+EBUILD opam-repository-2.0.8-r1.ebuild 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
+EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
+EBUILD opam-repository-2.0.9.ebuild 986 BLAKE2B b3b1d78d56d5a1524577eb1823110626a25a9d53a0014e9b60c2c0c54458850a141ab328805660d0608e106ca9e68baa382f8e2597aaf4980943bd7e126605b5 SHA512 4bb978d312e6e3e317b0c56d815293e0fbd8e65aaea93814dedc15af627a4082bb34ddc1617666d68201fdd872e811bb59ef31aee54cc2f09546a0b97bd6a6a3
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
index 77365ae1bced..7715c1f74d1a 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
@@ -37,3 +37,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
index 632b71026c65..4bfd5662c257 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	~dev-ml/opam-format-${PV}:=
 	dev-ml/re:=
 	dev-ml/dose3:=
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 77365ae1bced..7715c1f74d1a 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -37,3 +37,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 4b1bcc5b9fb0..212d7fea8313 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-solver-2.0.8-r1.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.8-r1.ebuild 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
-EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.9.ebuild 1056 BLAKE2B 825aef1af27521197b8376ccfa90a61334a035d8d15606523bcd54a13f720eafa59e7604fb3771d9c1d170026f7a86e88ebe96f9f0995bb0c29bf20597b63301 SHA512 3c6d7039290275bc6e8e355babec59bbc8282229373cd7c3da7eeff75413766bacf05bcbc980831fda64f71f48c0eb6279d50ecfc340bc780c0e98cbed3a3eb5
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
index aa993e87c76c..4a28e3ba2553 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76c..4a28e3ba2553 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -40,3 +40,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index e33b5a1c5355..6f5b43b433ab 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,7 +1,7 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
-EBUILD opam-state-2.0.8-r1.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
-EBUILD opam-state-2.0.8.ebuild 737 BLAKE2B 31e5398a6fd835fab9fe0cf31eeebbd2ca587853b8de942ed54511c04b858b2e3f5fd1a3b46c84bd920c639b606db65fea8c863d5ec746ce75dee0bda3a04c83 SHA512 19caab930f0f43ec38319248a23e89e5e3ef3edb46d84a69ad2db8054a13a806deb3846f1bbfc8e96e1d5a27de9f3a0505316f92a5c34d22cb3259136fd96f00
-EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
+EBUILD opam-state-2.0.8-r1.ebuild 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
+EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
+EBUILD opam-state-2.0.9.ebuild 963 BLAKE2B 00540c40668eb6c09ebed2b7b7681140e4ab57c644bc638159be484b7c52edd25c41203d71cfa4c94002f43cabf0196ed79181832ac47ff6dc8ea8a8e157b00a SHA512 1a17c2ce0eef477d1b21dde125094817c80f87dad847dbb43d0024fed59599309f17bea9e3a86e431ec74911dc6c68d6a2a55c9fb30ef4e229aa1a6117fe3e70
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
index cf9ab72c819e..cde1ebca6cb4 100644
--- a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
@@ -36,3 +36,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
index 48e053b3e9cf..9e492c922944 100644
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-4.12
 	dev-ml/re:=
 	dev-ml/opam-file-format:=
 	~dev-ml/opam-repository-${PV}:=
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index cf9ab72c819e..cde1ebca6cb4 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -36,3 +36,7 @@ src_prepare() {
 		  (flags (:standard -warn-error -3-9-33))))
 	EOF
 }
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 8d0e0a848f76..15f43ca56d9d 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,7 +1,7 @@
 DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
 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 605 BLAKE2B faa09884e58a0c314c0b2da9db6c0fdac422a91a5188680bcf60a18afda475ed147a11b821f916811d22e1fb9091d2e1ad1f96891704d9733710f4c09cd409ae SHA512 20feb2387a081fccf1f9429f5230da9d651ad48ddff836bd9414564d8b4ede11a7d3d6bd3ed675ac642d778efe5ee6a1125b137c970dec82285f13b0a0cf9b72
+EBUILD parmap-1.2.1.ebuild 673 BLAKE2B 75274d441ef9b8d4a78ae5e4b7daf38196fb88293629e20a430bebc1b25207d30f833cbea1918de5978fd42cb54ee2d7ba45ab7e03af007fabbd2a356176c4b5 SHA512 eb817ba2b0d44391ab9e57ab2e87a35fb16e67cb3c4242faf21db40a827eb3f8e918e6a32ae0385f4eae2727ae4446e75e5b5908dd2aeb58bcdd45e59656e174
+EBUILD parmap-1.2.3.ebuild 670 BLAKE2B 1c904777712a4a3e06543e499f381c2f33ac9767666cc8dd8e0f433e733de6f3edf8a3a18da25d6cdbdda39f4db9eded5775d6b5f92ae9eb5f991edc9f1b6cd8 SHA512 f04b0101115c305927e2aa3676dd68695c461bfde8d4b50a5a92580d75df6ab5cca8692a23194e72c3d05fc774c78ab6c2a49244b63036f5608448615258719a
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 323 BLAKE2B 6e7bcddc8f305eb0ad28f81bf09278c703c7dbfdc7c9825886dae7fa1d8489460a816286f0849cfbc4a1b641cfbc43f6b14a74b0d669593324050f5aefe01c80 SHA512 42cb14a0c6f2439fe053d45546efa9a8a66b2e116aabf02c64f7bb8c28316e302cd86b586cd2d6717f37228a0b04598e99d60feb45d16d301ce8a39da1f02d0a
diff --git a/dev-ml/parmap/parmap-1.2.1.ebuild b/dev-ml/parmap/parmap-1.2.1.ebuild
index 44ada0a27777..5e4efd7f812a 100644
--- a/dev-ml/parmap/parmap-1.2.1.ebuild
+++ b/dev-ml/parmap/parmap-1.2.1.ebuild
@@ -19,3 +19,7 @@ IUSE="+ocamlopt"
 BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
index 444af768d02f..974f988af0ec 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -19,3 +19,7 @@ IUSE="+ocamlopt"
 BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index 589393e55967..0fdb51dfc6e6 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,3 +1,3 @@
 DIST patience_diff-0.14.0.tar.gz 20060 BLAKE2B d47d9a93ef0a7eeada7f050aec0427f8352343609da1332de59d6b3ced41e9942556e1d61e12ab2075bc15cf29afc60191f48da43c1a4358d414352eb6efd044 SHA512 d253488402e515d56ed9d83ef45edfce378d6ad5148d80f8d81341cff28d19115350d72cc057ecd6c14b907888eca8e6bce1b8e71c7a978149979a16a5512fd2
-EBUILD patience_diff-0.14.0.ebuild 473 BLAKE2B 210297c3e20a149680e560948d73cb9a41e729a1481c48427b415a3a5a4b6843c49af34066f0f8ec8596f71e765f5ed8a741eb9718d174bcace166cc16318de2 SHA512 dde5506d835c37c8e6a348884c6028771d9e3a4f319908364be129c7f0b24abb53e16bf9ce8e4f49909107fe1909f2e4941d83a71945c691d180abdfbc8c142a
-MISC metadata.xml 257 BLAKE2B fb8b9db9ae5a0f4df897be20e8da32e9522cbeb3f96be4891670c500f4895ef041388f412091d6021c96e93ba4cf3fc265b21f32b3349797e4218fdbffb1a890 SHA512 7f1accfad4cfe0a26413bd6b0e15ef1f38e9ee20b83fb2099ca98446f40ca63cd32fd3ccf6756646202e3f5471f0ba67855973a6dacd292b0109c964bc34eabf
+EBUILD patience_diff-0.14.0.ebuild 538 BLAKE2B 81c91f8be9fb66ac62f6a963cb32bc4b770a75dbd58d6683e8d4ce378c0bca120740c12f25b27afa18b3d9d6ccd74ce88f461e935b7294c90288c01eb556e225 SHA512 faf975726b4daaaba39ddd3a3c3b19c330d9d5dcfe1ccfc38286d92c7c7f00f9f8c4aadb84908a0176bfc1c015a006952b6a1fb1e4ea52834ae6b32dabe4576a
+MISC metadata.xml 322 BLAKE2B e9510a525c3c5f6cd79ecb521914bebe4b0793cd02ed3bbc881d6915503bfb4167499e412376c8ac5f870dcd6bd57721fe7efa82c0c0fc8c0c20e180371aa431 SHA512 3fca89751f8d8ebe30ebdf89ef8629ea1f8667cbb9259fa4b3a53d3e911719babad516ad4320e9abd88f5246a46072833f55f5110ca80bc17098b5e474017fe7
diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
index 65186ef690b9..c87f5360ebd1 100644
--- a/dev-ml/patience_diff/metadata.xml
+++ b/dev-ml/patience_diff/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/patience_diff</remote-id>
 	</upstream>
diff --git a/dev-ml/patience_diff/patience_diff-0.14.0.ebuild b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
index 67d3bdbbc951..cd95ca35acf3 100644
--- a/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.14.0.ebuild
@@ -19,3 +19,7 @@ RDEPEND="
 	dev-ml/core_kernel:=
 	dev-ml/ppx_jane:=
 "
+
+src_compile() {
+	dune build @install --profile release || die
+}
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index db029f4190c3..8426ad8afc8f 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -1,3 +1,4 @@
+AUX ppx_assert-0.14.0-4.12.patch 1228 BLAKE2B e12ae7064c8a223b0910fde08c4c9bf898be1c50b142024ec1dfbd409168a14d1d48f537b772443207cbc66174f4b7f1aaff0011ec1580fc24d55342fccf628b SHA512 cbdb4b77646d81ff96438a6c4510af31cbe4b791bcbbe37dfce228da597783cae837c70a01ffb2ab11264082d1847fdc5172c7fba57d12fe93d8bf1354a05c75
 DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
-EBUILD ppx_assert-0.14.0.ebuild 757 BLAKE2B 786041fb4c2dd55760d00111d8ca1f195ce12f9dd281d37dadf7010d62bc9ba8f7a82a8c5228036eaee46c482c7ded24b7a3c3922242279cdb9d9595e006bc29 SHA512 7a4a00d675b63aa741d084d68ee84101d624e1bf5492e13a06a85959719da6f19cc71d57dbfda9657935b71b686445026e2fa55302567b5ee327a99b43c31b5a
-MISC metadata.xml 331 BLAKE2B 8546586066697782a8be2982480bac5dc2a04510e0d832a498e48aa77bcbf210f6620a85076fb460960f2f8012dafd3319595040f20b69ecd3d83f374075edda SHA512 890664fd96752922eb3e487d88334db9537e4bd29e9a98b01df7df5f5788d0700934b86b93de85a314122504a5687d1e0cd8797dbd88322ac636195953559808
+EBUILD ppx_assert-0.14.0.ebuild 800 BLAKE2B ed5bb8b46fed03a66cca27fb8f7dc70773feec2df9055569b52e3f07a81621719d28b569b7c2eb7c9cec1489aa27d738aa5b63f819a19a07a090b3807861e0af SHA512 6dd60159cfefd21c3cd3d61d469dded46a001074fe969c3dbec2a9d37991558e8a96169daf0d12d6b72f5eade36cb5aee38cfce626221a602e246141c3629d14
+MISC metadata.xml 424 BLAKE2B 36ece1e8c41abefc52c0b403f3607aaed672322bfdb8c700dae76cf2ff7da8ccc8235c051cc4b1736aa9e066d196a131b8eac02606dc27e353c804bffa9ad5ab SHA512 2fcef4859e2b6d55dece207b0daaf34cb08c2aea9fbeef8a6aa7a374b6e3e0fa126dbd08af8bfe0247754e8d4d3af6c58040539e3fd0070b3c7604a12aa58e44
diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
new file mode 100644
index 000000000000..80ff9fb1eb47
--- /dev/null
+++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch
@@ -0,0 +1,30 @@
+--- a/runtime-lib/runtime.ml	2021-09-30 19:07:51.592766183 +0200
++++ b/runtime-lib/runtime.ml	2021-09-30 19:11:18.035634157 +0200
+@@ -71,7 +71,7 @@
+   end;
+   `Fail (expect, got)
+ 
+-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got =
++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got =
+   let pass =
+     match equal with
+     | None -> comparator got expect = 0
+@@ -89,7 +89,7 @@
+   ]
+ 
+ let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with
+   | `Pass -> ()
+   | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2
+ 
+@@ -99,7 +99,7 @@
+     Sexp.List [Sexp.Atom "got"; got];
+   ]
+ 
+-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
+-  match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with
++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got =
++  match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with
+   | `Pass -> ()
+   | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index d2c8c92d51d3..d0d7bf7876c6 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
index 4db2bc4b5920..0be3c6c2301b 100644
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -27,3 +27,5 @@ DEPEND="
 			dev-ml/cinaps:=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-4.12.patch )
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
index d0bcdbc1d56b..5b3d4ded2474 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 14efcb494da4..2e6ec4ba7081 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,4 +1,4 @@
 AUX DBD-SQLite-1.64-no-bundle.patch 722 BLAKE2B 6c906a72b8ecc0111eed947ce9ab06c8ef28a2989d1dcd3d23937dc9a4f656ef7342ab2b66634ba987282934156a1e8ba0621766279293044c1269f2e7754d91 SHA512 b547a410367d739b3d8790788a5d6cb8b7f9026f176cbcaa90c01c6007a406b28dbb06deda00ffb4bd6b502433c6035026754809e1faae6d2855180c0f0b58e0
 DIST DBD-SQLite-1.66.tar.gz 2483436 BLAKE2B 269f10652b1ca5b56d7db096c5cb9010d0103b28f3eca88a426adbacab7a84cd22002af752fcb6afd8a47d87ba702434640a2c398055eca4b37016e104f26bd7 SHA512 4d58003e69f29b18d01ed0b5853cdac40ec9ce5d4c75bc8a3743937897a38290a99be30b1b9fae593b0d8d51d05b7e2438d29f7a7c1c755b66de51826397aef9
-EBUILD DBD-SQLite-1.660.0.ebuild 1406 BLAKE2B 946bcefd4cf561f2ba58f806fd8f0858c71134aacadc4e454ef39f6b6189da07b75b5e1e690ab574cd71af1fab5ce26311e0a4a6781b84b80a4e19379b7cd66c SHA512 d76f3918858f34b6973280ba54ff13d7d6388b10123aced488ac03afd8d6279e3e1f728ba5137f0d72ff5a3c4085e23bd03ed458e93f632bfb302004845146e6
+EBUILD DBD-SQLite-1.660.0.ebuild 1412 BLAKE2B 0671faed5b3a45e7bf9d8bcd4e08742bb6cd6b377cc35c7efd2daaff97f67462fa81f5babf0ea8977a7f71d55b7d8ada6e650d320a8ef4e8d5094891ae038d89 SHA512 7cdcf47a4a4c3bcd5eb03a36a662204a4673781d47c93fdf0f1dad5cc4764c1a073eb3973fab3e374aed10c56f3cb96478022a409037fd4c5c098193ede2eb50
 MISC metadata.xml 1144 BLAKE2B 6fd95b7afc6f741971272b1781c1477506f380d796d2298546715490fda34379338e6e5e536f464fd8f7e3d2de9294ab7787c7ec09f885060af74e60f173f05e SHA512 fd7b6a5e97c6f29f48af30c7a58c72f8569b0e6c26accb8cbf40273011923ff36658382d214ceef04118e3137411f388bfbe3988d98b74384db771292be4cbe5
diff --git a/dev-perl/EV/EV-4.330.0.ebuild b/dev-perl/EV/EV-4.330.0.ebuild
index 0540daeb296f..ec997f6507ff 100644
--- a/dev-perl/EV/EV-4.330.0.ebuild
+++ b/dev-perl/EV/EV-4.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to libev, a high performance full-featured event loop"
 LICENSE=" || ( Artistic GPL-1+ ) || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/EV/Manifest b/dev-perl/EV/Manifest
index 2096c0a4cd3e..8075d34dfa9b 100644
--- a/dev-perl/EV/Manifest
+++ b/dev-perl/EV/Manifest
@@ -1,5 +1,5 @@
 DIST EV-4.22.tar.gz 193418 BLAKE2B ac07559dd2b35e68da0338a52cbc201ed59b0f690e2c2bf7dae0e2476356cdb5fc3d749fd98b7fdb97f16c7e318c8ac20067f89c1c43b84c4ab148c241ded399 SHA512 0d30d1388a75ed3af24c3b854d8c2a54bfc62c274591f13205c35748f3652122bae85f46aae174ce5963395233536222c8fae35e8118cbd5af2f7ed0c45b70de
 DIST EV-4.33.tar.gz 218067 BLAKE2B ea704806b66e2c8f944d417b24ffa3923288f96624296ab0320de693651d675c54a8b58b3b75914dc73dec1d7c65da04dfd9dd3b573d3f11978a3865f66fe991 SHA512 dd90739888ffd793652fc6590cbfd6f3df1ea25b1a6e478dc903ef10f49f9c729e87005b94f47786ca7603cf27b02e1d5d8a2941037bef25ba5a83fe608e89c5
 EBUILD EV-4.220.0.ebuild 430 BLAKE2B 0118cafc70fab5739c265531a03c472b6011ec160d181cf1e5581bf33276fc59a8625a19bae8db0fbbb39cb02112ef2a70029324cc44086ab4b9be08b702f8e9 SHA512 1de288f76bfc097040354197768856ae1bd8471410311a80fc40c9bbb72ec7894a2548c52f5b6389b531bd3e0da41cf4522a52ce7297a151d352e67dc5892002
-EBUILD EV-4.330.0.ebuild 560 BLAKE2B a5a588c7bea3469013f4951d19f8634b66048cb6d58a22722d8b6c6f98290c9f0e13fba0f8a300988abc65a8cfc705e122cef84db2ba13b0a816e46ed3b0cbfc SHA512 29deb7d2cac28361d330c1a3d7c9eea5b486a81705334a71482dd5eacaabbdbc39da31a0cd900f088278877bdde36c4466447200a1b5269f1fae8dba9b4f8f9b
+EBUILD EV-4.330.0.ebuild 567 BLAKE2B 7244bf1354e1cefe1d91b73edb6a452885eeeb27ac11579a6729970dde4194e3acc17bb4ac850f270a05a280ad820be6ab588e10da118efdc31b13618e73a7af SHA512 fd8c9518d5cb005b9ff80f589cfcc79a1f25a531439aa41f7173c10c308e51e9a93747ef87d43a9bfb60112b517fa30ecca4a6fe86e63c6fc340ceafd9d0dbc1
 MISC metadata.xml 436 BLAKE2B 85fdd18b5fb097c682b63d58c7c5e030353f2e3646f42efb6b3f4ecaf063e749c3502363a21d54224a8e9ea8ca05739d1076db533cc3ae0bd1a36cfa5e23fdd2 SHA512 0621f7beff445169a3fee042373033be0ecb26db5fe0163f1225fd7a320552982274e4f5a2aef8ab717d456a5f7e0f449f6a27ac5cc1577184a8c80be51992c0
diff --git a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
index 6a2eadfb6cb5..cd3621e9c6ca 100644
--- a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
+++ b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check for the presence of a compiler"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-HasCompiler/Manifest b/dev-perl/ExtUtils-HasCompiler/Manifest
index 2576f03e493d..4e4dfe2e831e 100644
--- a/dev-perl/ExtUtils-HasCompiler/Manifest
+++ b/dev-perl/ExtUtils-HasCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-HasCompiler-0.023.tar.gz 15857 BLAKE2B f999cbc13edc4ff9d4fb1f28fc20dc223e2b504a95e44d6a4871c55766ec3fa0cbe6c5a46add40b694a2513604c486d1d98853c17fcce397b21855d6754fa41e SHA512 352e87249eaefcf1cdaa019522849867c2e3dffe60e07c24957072bc27aea39e6855c082b112f326c5a4f86b2174dbb2e03c487b8f7fb2abfd750847f19e7a6b
-EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 443 BLAKE2B 2abc57730e436b72db690f284026ef2808f1ad582a2c3b624cf3549088c52f52196a2de791826aaa3e409c70b77627bfec2b2ec63ae028c709514a9ba116c94d SHA512 1a68b8e14326c27fb0c44171b0e3317c752f4e4448ff88d01fc99728c36499894cfb7e615e9571eb947716a587b162b46ebb93c7fe71791a8b7c1cbefce89339
+EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 449 BLAKE2B eebbb68ac084fba323b60e6c089495cbc293512a67ec1b0ad2875f88e802b213bc66168bfdde0ba2657a13a504b31a4816bd09aa4222c75e893306ce05802363 SHA512 5860bbdfa780296aeea2bb8b01fe08eadd623590cda125628070f1fabaafad68fcff71ca957aa07279cc386aa07cf8a1b9e6f9c38899e3faad45d45c3bf7c926
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/GD/GD-2.730.0-r1.ebuild b/dev-perl/GD/GD-2.730.0-r1.ebuild
index 66ada24424dc..eeb13273e5bd 100644
--- a/dev-perl/GD/GD-2.730.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.730.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="animgif fcgi test truetype xpm"
 
 RDEPEND="
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 20ce7aab94a2..f688a39245e0 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,3 +1,3 @@
 DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
-EBUILD GD-2.730.0-r1.ebuild 1588 BLAKE2B f2baa185d5c1fee0ae92a78f1ffae86fc258c6e6a181917dd8be9ec79f18bf8b16d39c99d04da61bbb7517280a24ac1e5f2dc658b81bee97a85b825a64b0a6c5 SHA512 19fb0fe1c7a6600371a2f6490a3dbe186837ed60aa12bffbc47348b1ef372fc3f51fa77b682af5b6e337082563b68a0038a9b019680ce05d4830b5cdc44ca305
+EBUILD GD-2.730.0-r1.ebuild 1594 BLAKE2B 33b8381b9125557114dc6571c8406c8349fc4b2c93829b13e678278175ccf8e8077494b0aa461adcfe8669d22fd671810268aa33f42969320dae375dc72ceb89 SHA512 8dcd745938479c7e89078499003e9704a060ab9992cfd101a11af58c9284d5d07fb28dd8b7735d9f4a2f306a3784c3476720fae230704206714b3a39a6473850
 MISC metadata.xml 853 BLAKE2B 4332a510e17993dbfe948ad2ab9bd2a87fed7336a9fb536e933ea81d595674b019a4fc4312e61306ed224996fdcc9e9131ced244ede1823d19270b72e7d0e43f SHA512 e96e747f74b628c306f4a28b36d40da109bf6b580c2dcf09426717a77e77620e63f3c559f83662f221e2ba95c9d317856c80e5e0f438edb82ef89b6d1d9879fa
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 e2fb78efd2d8..d68788c5ebae 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 ~m68k ~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 237d1f43bca9..f1c30d5def98 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 805 BLAKE2B 36729948f8a1ba518e7ae14e7b35e2bc9a2471fbaef0b48a8b657c7dcb6333c1b6efb6ba53686d48142216e212ad0a47db46bbb71394742223536686238df371 SHA512 f7a97a3369380b65d50e5c017fb5d4080d7bcf000d5519c037c86a5f3cfc8edf10402951f1580ee8026e53ad1bd456155897136bf439fc34158ba63ab55c1164
+EBUILD LWP-Protocol-https-6.100.0.ebuild 811 BLAKE2B ae8302f3255bbecbcca99cb17a3b8a4900a8376e49afb06c28ccd82d8bce1bdab9350c921406c1d4c2900007c9b1bbbd690eced874cfc9be1aecd3b82489d90c SHA512 0dc9b3ba97718b5f923c1d3b8ca9ed0f82ca37f5809078c04c1276072db9b0024d7744337c88f08fd4557b4cadfd4c2182a19e84b061074c1b4b5132401a245d
 EBUILD LWP-Protocol-https-6.70.0.ebuild 843 BLAKE2B 9efbbc250d99c065c3a6b7e45e7998e6ff7b1348c4d85b32fbd40c1317215ded1af065d0c37519f8868be7262d6322d064398000ecfdb054c01fadedfc6cd2a5 SHA512 74faadfb8cbfeb956014b4c6eb9d3a6f72b16640bf144e73cfd5431295bc5f90f68fb52cf048a1853bfbc94e8735c66c636c5a93eae5f359d4debb9fe8889986
 MISC metadata.xml 471 BLAKE2B 146b7964a443d12de0db87033741ffcd01d57985fcc70ce32f95d618354c1b233789e0242067c326ce41f4adbd2c6a051e895b731c225192a9e9ba1d02c1c970 SHA512 747e960b78d6825c52b9964fb42b98408998fcc7d32e046cd6bf9c5f2348d97692bf013438a522ec7e0a52aba6104f7d832fd24f95e3dfa03dca5941f78f4a41
diff --git a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
index 088b7796bf3c..8443817783c8 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for parsing and creating MIME entities"
 
 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/MIME-tools/Manifest b/dev-perl/MIME-tools/Manifest
index 79da40b97738..6e466333f172 100644
--- a/dev-perl/MIME-tools/Manifest
+++ b/dev-perl/MIME-tools/Manifest
@@ -1,3 +1,3 @@
 DIST MIME-tools-5.509.tar.gz 423714 BLAKE2B 7e11da6f97468521d2e95b9ed71941d91559844a1775597c27f60288c04daf55607a8d962afd6bdf8521187930908c97815fa5664a448d1ab902e3740197cc69 SHA512 0407b09916144eafbee0c75758306e0f44c27db0e8aabf033267f9903f676f0415de99927dcfdb69f9e9d4123d63c280f526dff92e0d97744761c888df90667a
-EBUILD MIME-tools-5.509.0.ebuild 906 BLAKE2B f8f5b3cca84d506e3cf47593be43259f57d8672c1732abfe9a144abf0ad50a6e45103a659e9d2e1a61e8d36c2b09bd523e002e0cddad8cdc9476381bf36a9de4 SHA512 8691a920b3996862a13da1dfc455be9e7335c1be721397ac9476e4385db963942ef25c574f30eddeea93a3e7ed6a14aa37e4b79a1fa24a1bda53f8169a8538c4
+EBUILD MIME-tools-5.509.0.ebuild 913 BLAKE2B 13e7524b9b04554d9c50c7f76110055e37f6b714f591509d0585743beb154b468afba0b76c76f63d5879d7b5a139ee765b52a4ed990b0accc0d262330889cd6e SHA512 549acaddb1ed604f716841a24cd5b7ae2bd6771c2a2dc058586e276e39db08e91253aa3c5de65981b80c9803bcd75d837befbf0276c1b65022c346b4684e6189
 MISC metadata.xml 2237 BLAKE2B 6a241d96bd9176070625612af4db82e1fe8d14da33911016252be14f7eef4326f7ea1097b93e10d384efeaa6aaf5296cda823ba7ae2feda6741676c31dfb8408 SHA512 51ff52bda7c059d66c174cacc74b7dff2fc5cbce77cc04b42a37a76728f86bec2ad0dace849e7e44a0f8f5621be6e10911343f1710bef485d9b04f686b994ec5
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 4296101eef29..0055150ecf04 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest
index c9102c12e9ac..4f60a2ef80cf 100644
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@@ -3,5 +3,5 @@ DIST Mojolicious-8.58.tar.gz 778040 BLAKE2B 80e36b370a89fc3712332e8322a4ef3083a8
 DIST Mojolicious-9.19.tar.gz 841263 BLAKE2B 7510b268c1a5793ba78d8717f5683c3ca53fa95c0af8b374b5767ff4a7c532481a788c08ac66c88295e55307fbf164784547568ce1edbc35b3b03f340ed60336 SHA512 14c29473f040548de2efef8bf5cd5676554f9f518b52e0ee03ed30415942fbeff5f5f2a6dd7592798e433e3e83653ce815697d4614e4680c9a6b8c699b0a171a
 EBUILD Mojolicious-7.570.0.ebuild 682 BLAKE2B a4a1d51ba9c0184478d978dd4da94bcef00fa9481f24a13ac810339721ddd5c43bdc775f2e1a796b4bc11e04162298874338ddd5fa6b6c32f5e1570ee3cacfc6 SHA512 0efb15c91fe8ac2d491b1afd5f93b6e0b79f3ca62cc77aadcac4facad648255850b0f42b786963db09d0331156074f5aaa7954c55fe78a211bfec10be56dc261
 EBUILD Mojolicious-8.580.0.ebuild 651 BLAKE2B 7d9f83846149a2c058c6a5989f86db7aa40acde89e3468d665c35b21eafdd458273ab4dbb6e0edf946ad91f23721053fefa31275f337ea8b4d5129311a224ad6 SHA512 ca239abe42ff3386b557cdf0b22eeca5d3562c51d3a2e897b25af6d502d27b3299b5b0eb150b516d41c3b6418cccb7ef6174a4e5b23fd5c362fda75a5d5920c8
-EBUILD Mojolicious-9.190.0.ebuild 622 BLAKE2B c4a5be66fde54049820ab63752d874a7f3093654f3c61d13b284fd72c7d79bd3282a00c18fa04016b0096e26e17a8bcb68401145c91b9eb27de4bdaf2fd5af98 SHA512 b4d6115d72942f3530ceb8890e6e485c4dc3c57b0c0d51217f8f4666aba4b12cc9148a3362676ca401266c43e3468776be766f874ea1ca32f14edc460c197a28
+EBUILD Mojolicious-9.190.0.ebuild 629 BLAKE2B 47928ec0274839a0abb814f9941b0e84175fd68579c5d56187f72a0e13f5a480d03b044d15f08549a0d18f3412bd7853d2b1e2bea44084038396ce6c1beb051c SHA512 d95be8701e188fc53fb1c89797d818dc3a78d888e1030a6feefd2c3a784d9851dc32f8c4109e39078889a25c3a2fd848ff683d0b5e77f27784600d7b214bce80
 MISC metadata.xml 7808 BLAKE2B 26ae8b8b3ca60b83167e507ec4193a928ac5a3bfbb28a27d0047ac3e87b410827c8318d030ff7b3a250b664d52fc2adfeb4af9be0e35b1faebe261ce82532fad SHA512 fe18c632cb0797640460060f5e794dcd5912f74dea2a3cb7655123668035ad68ff804f1b6eda3b56fbd954776c51766776aaf7e03b891d20108335b4a28bbc1c
diff --git a/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild b/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
index d2989591e701..8d55bfd44937 100644
--- a/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
+++ b/dev-perl/Mojolicious/Mojolicious-9.190.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 LICENSE="Artistic-2"
 DESCRIPTION="Real-time web framework"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/MusicBrainz-DiscID/Manifest b/dev-perl/MusicBrainz-DiscID/Manifest
index c15d840fd9a7..51f885b4bc48 100644
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@@ -1,3 +1,3 @@
 DIST MusicBrainz-DiscID-0.06.tar.gz 6663 BLAKE2B b5cb0820a37e30b33c27e2a57a28ae8143b4d60c3299e534dfdbade798afdc56d9905bfda044e5fdc08f77d56c2caece546e3245a17bf4960dd814d96485a210 SHA512 85483603c111d39f7e6490808817416612a96a0dc3d20ad432e7bd1e39ca0a21d4044dd4e25ff41eb713e4b0dd97c0cb1c486cb7a2c730369df9b782e61ec483
-EBUILD MusicBrainz-DiscID-0.60.0.ebuild 550 BLAKE2B a75e6fe5fb235dc12c6f41905adeb3b1589d0035107adba0c3cd364cdcf966c0e82aeaf37bb0160f22952bdb0adcff2c45f35fa1d555a43df955b38827605129 SHA512 1317d761a36d8bb0ed56a4af59ba50742b5f1b559c8ab4bc830628d825f225d0bff64b48650c9b639e8c0fcd4407717a973e0f5f94f61e1d958c23b1719c0a62
+EBUILD MusicBrainz-DiscID-0.60.0.ebuild 557 BLAKE2B 57903c2b6de039c6639c8ee361670be2740ef2122ee3be487331bd434f531c77323b6391b0d0ab4f476abdcfcb67bbe5f5d38598e22096469beee07778d1b2ed SHA512 f907184715fbdf6e2b1dee4a405ef7868d0c69a40f09af9deb791640f9c20a1832a1cc184f3903ab59d0272d5cdd451971a71200f748fecd9d344d098e79b072
 MISC metadata.xml 493 BLAKE2B 61059fa0bfcde3ffdbe16652470ca568598a5736f5d8aa7b083362348a4276d8a2a33c9c7e0f343488a1c576487ef0aac2d63d5468634190385e8bba464505c0 SHA512 e3e5a058c9dc601bae849546e2c0cbcb82838a1b1db3301f8365aeb32f2f31246b6facd8dd724cf59b740a1317ed4fb9cf9a32eaeea2e90746d11bfd1c2b5087
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild
index 4486e87b2e84..c7c5d3c60275 100644
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 RDEPEND=">=media-libs/libdiscid-0.2.2"
 DEPEND="${RDEPEND}
diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 8cd89391b479..482a0436c975 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1,5 +1,5 @@
 DIST Net-HTTP-6.17.tar.gz 37943 BLAKE2B 7b32a1bd12803fa5ccabed0e312f97eed9b932f448d2675a01cfa81de2d2d116c41dab1c1a5884a68621cde76bde1c006e6a88c40e88d09b7e60703c6658f14c SHA512 ce4453896fea1194342ed5279173fe3289ae7a2f489145930bd74eb680a347d974675b65d387aa7735d2c5404d7c5a34049b10a1ba87f36df0ad6e3d45d4f2f8
 DIST Net-HTTP-6.21.tar.gz 38914 BLAKE2B 7d0351912f279a60acf30c5867ba54023e29b7208fa3605bd493271f9b59b3c8ca4e26c093b80b24a8f9a98e57bef54304b70c98896d270f9580a7e88794db1d SHA512 ca50e54a893e38456dc107c216c6b119cce9c30b2d1ca47607e0fed426a79d2ed660818a5d5a6ef240cae28844c2d7ca613ce81f53e890e7f15b22e4d0e2887b
 EBUILD Net-HTTP-6.170.0.ebuild 818 BLAKE2B b1894fd753f7c65d10616ff34d4bd30c30e891cb5fdfea569de07fe3b6f70291d9ce468d6972629134cc956aa619eea0bf5246f81843583f3cf708450450165a SHA512 77c0bc18c35a8c71c494e101c4e507e81178c484b81af28cf46c5bc38db804537214d2c5c2b927837dd9c7945ff19144ea14338bedd6ab168811b6084dff4307
-EBUILD Net-HTTP-6.210.0.ebuild 819 BLAKE2B 7c65e72a61024d2eff867798f910e24c9ff1322d5042452963abec48df5fd7497a73fbb0d866b11c597bc4c9d7dbe9abeeff82e7320b761bc8369189d5e36782 SHA512 2c98ad862a7241e9d6d6d1e9fee42c18834b79403eb730284eec6e9db3d82320bb33449ffcc62a1118cfdc7e56e565f4e386ae4f8ccd78f689a107bbe3013d8c
+EBUILD Net-HTTP-6.210.0.ebuild 825 BLAKE2B be3ed857329d6118f1d23e8a6d59c3dc04d0a7fceaca2564c3e3a8eb6b71631a1ae3af4abd67caba942fc2725525a2e013d5e96237f6bf0c748aa9316919d6e2 SHA512 8e64babc4b64e3f65a819b79c7f549f2cd2757a32ae94761a0cedb01595944046b6f76dda4ced9f3a7b4fbafe15802a59b54b852165bebb30fe0ed63158fbe60
 MISC metadata.xml 553 BLAKE2B f6b1a86e8ee72d4fbf04ca30b0dadae64219f155190d20e5d8ac5bd0dfb48e9c0adf9d6bb313d9626ba07d4a3f5efc96d614800ac0556e114ba826680c3b105b SHA512 3420d4b3800f5645cbee4b21ccfe4745941a01e225690771a639ee5e198fa795f1d36f27e8218e0ee47b3844b6c2548d6472b8ebe4dbd2699ea36021dfc196a9
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
index f46efff7794a..21f48bac6482 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index dcd95959351f..f8c426efe10d 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,5 +1,5 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
 DIST Package-Stash-0.39.tar.gz 55606 BLAKE2B c4e9ff6fe83f2c8a537fba0b8e38456b3b9a9768ee7dc1c8a2b471a42cc4d8b82c5ce74972cc462996718bc84eb7bf4cd651bb21cc870e438481e85d024a32ce SHA512 c5a6cd56c86fb9f6c8585ee7f65d0add8e905c586747763c7841a054f3540b6bc505f57952f44bb90a6bb500d0d60d20ad5df7a40944480abbc9d8d43d64e30f
 EBUILD Package-Stash-0.370.0.ebuild 1040 BLAKE2B 3e7ca230660abbaaba60fec2b677959a826feb6ad8e31eccaf03e683ae472e20adddb0d1649eb4e3a6b9362ab5aac358d58a7f4dcca1717761d40b1a63437f6f SHA512 74ec8cc08c85097d6eadfaac07e209b0cf2859403dbfe873bd92ac6882d6860e729ea4d1cab93cd92f1d706b4e6347319efdc7c4d36e8bada76170b5b96dfa1a
-EBUILD Package-Stash-0.390.0.ebuild 1028 BLAKE2B 01b55ef173b3806f3498f4a48b6bd029adf394838a45cf0482f50509909e64f0d29922bcc1adeb5970e1ab935795a1ad695b9f502c8f86d6b0f7b52cc1b19578 SHA512 3f9247856ad501c34bbbbea4ff18e47b3bbf73f2e719f7b3d3d0f1e51f987d1adc8348cea26831fd46b197719f1979e61ee35e6bf56183c3757a482dd1cb6bdc
+EBUILD Package-Stash-0.390.0.ebuild 1034 BLAKE2B e80518d23d7bd5f81896cabdcdffac994ba57295afe60b28e020b743802e01528ffe1afc44415bb53b10352725df0236b5db96b03c4e400144a633fac80582c4 SHA512 0180beb4fee3079183a0373cf669b9cfd08915b550292861970bb43038fdc8950a7348048f906d955c91a8e120b4ad76fa4dbe0a4ac552592009959e3bf17473
 MISC metadata.xml 464 BLAKE2B a3e46ad9e9fd78e593dd8225f47ac0e49d63893d2e6b32ca463ccee29442ff852b998f2a579b03adb0da00cd59475386b31e7387e0d1720ff2915a07793627b6 SHA512 fd41098b2d27d9ca25928d5c447518dabe8b7281bb91a8f446f4ffcb177d4d24591112faa915a1ec8e4f65980fcf87d017bc8f0979ceff1d4ded8f53189dee57
diff --git a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
index f8dfb1df43cb..f976b330dc8b 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Test-Fork/Manifest b/dev-perl/Test-Fork/Manifest
index 6e1adc8180ec..3ff1ab0b9405 100644
--- a/dev-perl/Test-Fork/Manifest
+++ b/dev-perl/Test-Fork/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Fork-0.02.tar.gz 4368 BLAKE2B 4e26f2203587a2ca66fede0c864d7f232c58fd0e172a26fdad537af95871784838acc4cc3c8c6485773ea9504778632d0b5e3b7790bb972528698ea7e2d35a7d SHA512 854f92eabc786735dfbc3c7d0ad29e4e65ee8c99bac1bebab79876c064dec60cbdfd7ef1f5a04d7a5f5dc73b633e903d4d68c4caedd5890914707b829bca46fa
-EBUILD Test-Fork-0.20.0.ebuild 383 BLAKE2B c4b3d43737b0431f0b279e8af36d8970f958a187bebb2342d4c7777ef5423087ff3e7c8c557061818d84e42d54cba2233ef4fa6ad61bfa511af7c483f6ace2ce SHA512 d90d65ba5686e4284b9e99e917aab260f50809b2c4b7a5d20e55c6092454d113e7ff61be32e8a8c49cf923303fa223bfd81d48238a5d9951827c5eb359499a11
+EBUILD Test-Fork-0.20.0.ebuild 389 BLAKE2B d5fce7f649946b5b702eb429cdf49050a36659049024afbb62fe225211708f97fb3889310d286a10b8908fdc760f6b6c0d2189a64322bd472c7551cbb68729cc SHA512 0d3c34fdcf08ccd419e3f328b91f0e14514538105b32521fdc56d5528ef7e5764e27122b603684f766a9b4f4d94f7968de90961c2a61ce1558e4a53d32440a62
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
index 3590baa90673..2d8581b80334 100644
--- a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
+++ b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="test code which forks"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Text-Roman/Manifest b/dev-perl/Text-Roman/Manifest
index be47ec299028..8236d3203bc9 100644
--- a/dev-perl/Text-Roman/Manifest
+++ b/dev-perl/Text-Roman/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Roman-3.5.tar.gz 18122 BLAKE2B ff065b39555f45f9613275575726c8db0725396a737c2989e071b8e0e52f5896bf2a54a762210640243467dae350f2d16d5ea5214925b396f809b83575ffa7cc SHA512 597ca054094f58c0983c66ce2b22dbc4d69861b02495663987e6b66dc0044a0d7e18e51ef817ed3c76832d283c01c6f9f51e68af7cb6b186b27553b5a877bc33
-EBUILD Text-Roman-3.500.0.ebuild 310 BLAKE2B 670ab3942e78e0821d7bf864e3c0e7356169f025830101b8423cea93e30e25bc9a250113a9f5ac00f4c6bbdbd849daa132ee1b0c82b2a72057098c891b2f8c1d SHA512 af4fd94f3404447fd3bb0b1cae716af1629245368c1e36d3406b8e965d32c144e1a362b3d3a4e8a0334d305bb76fc251a44fcf3933ba935bee89ffd17d754ec7
+EBUILD Text-Roman-3.500.0-r1.ebuild 283 BLAKE2B 92bce640825df1b139001979a57b2ec185c38dc290df9312309c6017450232cb2bf728f7ada985ebd3dfd4dccb29c70d71dff1c305e485c0d099574d7b1cffdd SHA512 978706aa5b47d7dda92838932cad0330e00d74cb4c47d86864f999574e70ac24cdb18ca0dd4ef13258fa5f6728ee09ff770cc9ff3387b968141b21a971043177
 MISC metadata.xml 393 BLAKE2B 3b756d11780d6530ed53067e8388b3a90e7e9fca65dd93df380dbfc82a4a159dc38dd51029550cacc698efa0fc6c107c00ccbf23b8f70474020931045797048a SHA512 67fbf2e19bf696d3b02071588b415d324cff9e0f23752e50d496c0b769fa3888331b40cecebd0a2d883db00ff6c99acb0069d1b135a89247ae700b08cb75a7ca
diff --git a/dev-perl/Text-Roman/Text-Roman-3.500.0-r1.ebuild b/dev-perl/Text-Roman/Text-Roman-3.500.0-r1.ebuild
new file mode 100644
index 000000000000..bbbfc6646812
--- /dev/null
+++ b/dev-perl/Text-Roman/Text-Roman-3.500.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=SYP
+DIST_VERSION=3.5
+inherit perl-module
+
+DESCRIPTION="Allows conversion between Roman and Arabic algarisms"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
diff --git a/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild b/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild
deleted file mode 100644
index db2ba3a8ca85..000000000000
--- a/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SYP
-MODULE_VERSION=3.5
-inherit perl-module
-
-DESCRIPTION="Allows conversion between Roman and Arabic algarisms"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Text-Shellwords/Manifest b/dev-perl/Text-Shellwords/Manifest
index 980cae085ad3..b806b2ad256b 100644
--- a/dev-perl/Text-Shellwords/Manifest
+++ b/dev-perl/Text-Shellwords/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Shellwords-1.08.tar.gz 2591 BLAKE2B 41ecc367a76bb5c200b638ceb74e607718ecf98278767904aaa05641e74751fe2cddb7d20060718746e7a10f12fe7e21670668642ec571467c176b8b61f86153 SHA512 478e06cb558c831742436938ae59183ce06ecd1c7aa4c1b19099d6012a4ab656e000e98c07c3128f3e13152d74a01736d4bc600c75d7d9ad9a4e12d57edec549
-EBUILD Text-Shellwords-1.80.0-r1.ebuild 390 BLAKE2B 8e56e6cba20353d8d9999e07ffc948b9163ff7716f37382ee747bb71bbf51da0dd53844a84ec5eff91ef4f311b9fa744526f8ece91e3c0b9e4bf367b6b1560be SHA512 cc88ff57f09c5ad10a9dd84b4304e880ddd0cd163730594fbaff399b0d06d31b93c73852d3710de56c61306d0bd7257e3f7b69f1ff6f83e04e49b73c7b08fd47
+EBUILD Text-Shellwords-1.80.0-r2.ebuild 363 BLAKE2B 8e6d5c524339b8e4f5ffc1fc4f6d8bccac317f7d439d245c1706abb1f92f7cdc8736bc65bde3ea790d32ef91035fd01778b7cc25b1e03aea36b11168fee33f11 SHA512 2dc569a75cd281c73a99cd0bcacbc85bc11064bf451c2a097ef5e325742ed5a64ac0047c0bdc36e2a0323374b8674f0f78d34fee2eb0103b0d0da97ccfb3ab0e
 MISC metadata.xml 403 BLAKE2B cb57044f5f72c9eb2645b3e7fad6583db8e0330c2896ee74218e0afe2afa8890e8bcb17a9e9c57f16c907493f5700c9c27779e8ae05ebd8f351dbb172e6b8658 SHA512 557111d4cec02b273739de3e039c84c67e3140b1fbdf7ff9c607878a4ec83106be854f7b186b847e70196f37343d56dee79557362751510ec6e9f806df3e86ba
diff --git a/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r1.ebuild b/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r1.ebuild
deleted file mode 100644
index 027623d695d3..000000000000
--- a/dev-perl/Text-Shellwords/Text-Shellwords-1.80.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=LDS
-MODULE_VERSION=1.08
-inherit perl-module
-
-DESCRIPTION="Parse text and return a set of tokens using the same rules as the Unix shell"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild b/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild
new file mode 100644
index 000000000000..e7e1a5ab6a90
--- /dev/null
+++ b/dev-perl/Text-Shellwords/Text-Shellwords-1.80.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=LDS
+DIST_VERSION=1.08
+inherit perl-module
+
+DESCRIPTION="Parse text and return a set of tokens using the same rules as the Unix shell"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/dev-perl/Text-Soundex/Manifest b/dev-perl/Text-Soundex/Manifest
index c8e2317f972e..ac84734dd5d0 100644
--- a/dev-perl/Text-Soundex/Manifest
+++ b/dev-perl/Text-Soundex/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Soundex-3.05.tar.gz 15527 BLAKE2B 1c004c69e8cf5d2d67c0826b9db043cce4b6a5b5751fac9d1b99ae7ff87047f0a5f2f9a8df2f6917a8fbc9277409c96a6dd21dc475a9ccf150bc7aa0f1f4065e SHA512 f7ea405cb5960cc2e3f5e257c18c1bbb499c5244ad6a6d14612f07329fd2177ad71dcdde85129e65c65541d61e45d7e9e4097c37ca6cead9783838900b3ebbec
-EBUILD Text-Soundex-3.50.0.ebuild 538 BLAKE2B 0cdfebbdf7b78e586f4cdaa30ee5735916241a2b36ee15a11840904fb1511c5527bd11cb253f3c51689906b316af27fb3c950470f3e73f4835b52db5072ed10e SHA512 7030780e727f67ae5775abc72fe0f2ef75d6288382cd51aa6ecf2935828ecc57d4d00f70c7b4da6a63f0d6a4d83c6669b9eab8a91a600241047b5f1d53db4e09
+EBUILD Text-Soundex-3.50.0-r1.ebuild 507 BLAKE2B 9a94bbeff3f672d83b4714aefa8e8dbe9c7d1b102b50abd82896f96443054769f2b08af270ff7b0c3f8ef59324060af144245fa5f0aa4186895e413921644884 SHA512 1b9ba173349bdbef24243b90a1da879b0b9805803e692adcd6774ed7b1d281817284013603a8fe65b446488bf194ecb72686b75db5e717ec70b9fb4df101e2f3
 MISC metadata.xml 397 BLAKE2B 44fac00899a8728f42e6c468eb7a2ce846d3ccad838838a115a9a375cbf2ff6362697048ff2d98b9424a049d4871ba81bd0a1bbc08d03e2ac2e9686535a01ba0 SHA512 5a1e41e9986839271a6a06bfd4542432650b0281ebb13be057b2a0ed1ceb91b025e852d46c5d0483c5658be38dc4de66a9e63ce07117783bfc91a64832cff986
diff --git a/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
new file mode 100644
index 000000000000..671f1617fb59
--- /dev/null
+++ b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=3.05
+inherit perl-module
+
+DESCRIPTION="Implementation of the soundex algorithm"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? ( dev-perl/Text-Unidecode )
+	virtual/perl-if
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild b/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild
deleted file mode 100644
index 6bb5aed3060a..000000000000
--- a/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=3.05
-inherit perl-module
-
-DESCRIPTION="Implementation of the soundex algorithm"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? ( dev-perl/Text-Unidecode )
-	virtual/perl-if
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Text-Table/Manifest b/dev-perl/Text-Table/Manifest
index cc805cab4298..b9a4d90f827c 100644
--- a/dev-perl/Text-Table/Manifest
+++ b/dev-perl/Text-Table/Manifest
@@ -1,3 +1,5 @@
 DIST Text-Table-1.133.tar.gz 27178 BLAKE2B f9df055c62107af8410f6e9bc8cd1b6f5d0ab0d29386535c81b68d5a3e6ba5836e747be83931008dff0f750252bcd9d679af6354bee038ec720fb28070862aef SHA512 fc9ebcb7accc07ec66bc8157a679d3905b06dfcf21560641b149c5930e527385ea2be45190190319c73f6d184e3d4f4ce5deaccf3da58b91f45a820e86fea2ac
+DIST Text-Table-1.134.tar.gz 31029 BLAKE2B 7351cd4bd756e530ae083989c3a3fa38a428d16c92da2a979996b1ddd28ff9a8aced66e110cb91e300596a5727809285d545b2bdcc28187bb7cac011b5289c10 SHA512 ee10c9811a42a07b270ed28c310b0f836a47f1706d541849f7c12d39b7603dd4c05ab4fd4e9f8fc3065b3f30d2f4ee7eb8954221af5a825346eae4493fed94c9
 EBUILD Text-Table-1.133.0.ebuild 706 BLAKE2B cfa134edba3b73fd2cf66ca9a9f18d52d0988d892f5b8f399f16cdf6ca35e9ac3a8b938ee490907568b57590e9e3fbcad7aa131633a9967e4d2c55be18b00329 SHA512 ba229f0032535acb3189a7655be2ee958028cd449eada9785ee7dc3abfd0c5d681ad1c5d6647710e426da268f3c33f156f9f370efc751782bd8bab72114a77d3
+EBUILD Text-Table-1.134.0.ebuild 659 BLAKE2B 53a84fa61071bc300903c399734d69bf972d49d7e9421b6be90d3b9b990b85e83e7010013bcc733c025767636da7e73f0ceff65167ebb2db9661590710bdcfba SHA512 ce988faec78c0f86f510dcb7e335246a1a7cbc50a2f0a39081ef7fc43b34ac0ae35d2d9d968677f555ce18acbb79e5fb19fa2edc4f94c201b49d1bfc8e99f62a
 MISC metadata.xml 393 BLAKE2B 31abab47152d968b989187f760e62103356f403f13829b08bf88429f3a1b4334260e895262c2cdef63c14a2e32ea84fa553b62635438ae4e2c43e060eb1a23ec SHA512 963dd4573387694b29537e89cb363747851a70dcd0a5d5f0814ef0d73fddeeda0644a0609bfc04f93790d095dc22a0afed0fca16cbe0fb3b4a62668b4ed82710
diff --git a/dev-perl/Text-Table/Text-Table-1.134.0.ebuild b/dev-perl/Text-Table/Text-Table-1.134.0.ebuild
new file mode 100644
index 000000000000..154f2ba33fdd
--- /dev/null
+++ b/dev-perl/Text-Table/Text-Table-1.134.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.134
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Organize Data in Tables"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Text-Aligner
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" "t/release-cpan-changes.t" "t/style-trailing-space.t" )
diff --git a/dev-perl/Text-Template/Manifest b/dev-perl/Text-Template/Manifest
index d2ed65fcf2dc..36fbeef7e117 100644
--- a/dev-perl/Text-Template/Manifest
+++ b/dev-perl/Text-Template/Manifest
@@ -1,5 +1,5 @@
-DIST Text-Template-1.51.tar.gz 48054 BLAKE2B ca44e383799624949a5fa05de288a86351422cf7e4efcdb7f1a98b16216443aa3e269f7e69eb134458e889250133aa81dd15922b8a20ab4bf83b92fc16ac82ed SHA512 038a810746684b26cd6a763cfb8adff57a2ed8dc57e44b170b6ba6c8271d513289546294439cfe1c8b77f40153751596a023079ee79bfc6b59fa9393cfcc04f4
 DIST Text-Template-1.53.tar.gz 48863 BLAKE2B 1b054122fb9b17e36304f51888b8c284a2cc83db0d416827ebafdf65d45c683840c89588936f5ccf3ad26ed37bf894bb76c30fb07cb86b8e188df3a9654413be SHA512 136860f16f5100b7a672ae798be1e8d2bd1d6091e63248e9dca3bea42566e8289809d863576c7dcd734865eadb79f8d8f6443457cd14012f486ef14c98732228
-EBUILD Text-Template-1.510.0.ebuild 596 BLAKE2B 63f3f24ee0b99335c6ca20041e4d8cae83981820df37551ee01019fc228e9db8806ef454ee0af673d09d9b8136d41589c490d98140cede01ae38f0ca39b847cc SHA512 88ba61fb430002e7a5b5654ab8de16ec302257a0b5eb281f0214be19d17436767328088111455746304523d9346c71a0299a8dcdf16eaad69dbf1b24f4b00d37
+DIST Text-Template-1.60.tar.gz 50312 BLAKE2B fd3de1229a39d5315ef8ad02e8480e776329aa09d2208003b6370ba3a160cfc27a4bf494ac66abbc3cfe2d234fcad3b42c41176e2a1ac200c4bf36d036da97a1 SHA512 14dbaa5075691bc83d8f9ea58b6f86d6444948f9cbd7c27b0aac041c833d078940db7554268d3ff45f711a5646181ddb010f31894de23dc7226e79a103492e60
 EBUILD Text-Template-1.530.0.ebuild 656 BLAKE2B c42637ea49935556af276b04650bd1f322df58f22a47f14d538e252a6e872e11d658ebf9f0e17438f99cc0053c93a084f94ddab0fed29449ec77812a798ec195 SHA512 de71d68b21abafc8981fb3f86d98bc643bb68271b7c38c00c62e05a281a4fcda5f32f3c6b8dd32e2982b595e70b477a605fd4cb35a6ff5a174952cbec99576d6
+EBUILD Text-Template-1.600.0.ebuild 624 BLAKE2B 49519ab4410a9c654bbc7d0fd149c607b89487e0f7bb4823e430771ade25c2bdecd9540876ecc4a6ccade93edf1c5b18ea4ca741edf65e87076fce025702f4d7 SHA512 a7f23d783c030b0adac7c14ca946caf7253cd62c30880af020fba7b784871c3d85e8ed2569e2f01248430a1fb3374b38144ada6b4d5749de6150c64a34404389
 MISC metadata.xml 472 BLAKE2B e5ab033f5599f2ec547620ba8992193bc73b8cad6ca1e9b158b03d6bde4e88ac8c8ebbb87d2dbe76356ea405adbbbbf7473c4756c0cb04d17eaaf07bdd2ac110 SHA512 a1ab1b42695fb831163404c26ecd7ef7e1ce6a0e1c395b8df01bca237cfcb28ad3be30f71339cb8bef726117ffac9a6701517d9f6c7dbc50e8cfc282c9e57a9b
diff --git a/dev-perl/Text-Template/Text-Template-1.510.0.ebuild b/dev-perl/Text-Template/Text-Template-1.510.0.ebuild
deleted file mode 100644
index 79c0ca6c8c6b..000000000000
--- a/dev-perl/Text-Template/Text-Template-1.510.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSCHOUT
-DIST_VERSION=1.51
-inherit perl-module
-
-DESCRIPTION="Expand template text with embedded Perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Temp
-		virtual/perl-Safe
-		virtual/perl-Test-Simple
-		dev-perl/Test-Warnings
-	)
-"
-PERL_RM_FILES=( "t/author-pod-syntax.t" "t/author-signature.t" )
diff --git a/dev-perl/Text-Template/Text-Template-1.600.0.ebuild b/dev-perl/Text-Template/Text-Template-1.600.0.ebuild
new file mode 100644
index 000000000000..647d06b1bc58
--- /dev/null
+++ b/dev-perl/Text-Template/Text-Template-1.600.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSCHOUT
+DIST_VERSION=1.60
+
+inherit perl-module
+
+DESCRIPTION="Expand template text with embedded Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-Safe
+		dev-perl/Test-More-UTF8
+		virtual/perl-Test-Simple
+		dev-perl/Test-Warnings
+	)
+"
+
+PERL_RM_FILES=( "t/author-pod-syntax.t" "t/author-signature.t" )
diff --git a/dev-perl/Text-Unidecode/Manifest b/dev-perl/Text-Unidecode/Manifest
index 87d64f11b2a6..b676f60c1659 100644
--- a/dev-perl/Text-Unidecode/Manifest
+++ b/dev-perl/Text-Unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Unidecode-1.30.tar.gz 137977 BLAKE2B 0deb00376f5bf458c71c6ab1aa96d6ef43c404bf75b886b2c57050d71c4c7e2f3de2ef12b784459346c73717dc8852bb4127992bec71dbcf0f5398a066418f08 SHA512 194f8aba0dcdc7a53338b86370b7cfb6c60d4a8982ada6084f0eb0ccd66ce461b831b6daf04932f039ff1b983dc3cd0c0ced1e8b455955d2699c36120b41a526
-EBUILD Text-Unidecode-1.300.0.ebuild 503 BLAKE2B 0b5732349573865ab96fbaf311dc16af32de71e267d97927a3982ca1c48a39bc9094e9f19fcafe202849a3ec9d7c712b1142eed00c42d834d92864be800dbf56 SHA512 d03ff90822041ee391eaef303024e69cc92f44e884bafceea32be34e08edc2b8e8a6ba7ad89a234e0f33e83960f3cc38d5787d8740ba97dc04b3898a5f96410b
+EBUILD Text-Unidecode-1.300.0-r1.ebuild 429 BLAKE2B f3de2b73f38441a4a0a49e61271e6853d7118a8f5db70c5780fc91d9070353da46f4e656f643d6be52b1ee41b4edee1864606ddbae0705d7fa76120350d9a901 SHA512 d9db012fa5f6a7b69217e960934bd1fb71b281de10e08530b519098e278447d99365cc51817258480ed733d9bf8705a1a440b6c45df9491f59dff1e85069fcfd
 MISC metadata.xml 401 BLAKE2B 7fa572c71e8f4add9b357bc87df7f9e6fde2bf364ea622d4080b0d6c6155cb7b7f0a19cc2d9edcbce3c5ee16db6d01088e828b1bacfe494892b7e70b2e7722f4 SHA512 e3c282dc19fc59e94d8a31e334674b197251a3670b207c6b6bd4c1d55736a895390e8f95cceef371730ac525f37c22f874b26491f8cf4aacdc366ac8ff3d061b
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild
new file mode 100644
index 000000000000..eeb6c7eeb4b2
--- /dev/null
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.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=SBURKE
+DIST_VERSION=1.30
+inherit perl-module
+
+DESCRIPTION="Plain ASCII transliterations of Unicode text"
+
+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"
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild
deleted file mode 100644
index d35f6a0eec52..000000000000
--- a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.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
-
-DIST_AUTHOR=SBURKE
-DIST_VERSION=1.30
-inherit perl-module
-
-DESCRIPTION="Plain ASCII transliterations of Unicode text"
-
-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"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Text-VimColor/Manifest b/dev-perl/Text-VimColor/Manifest
index 99c60b39a4d6..977318ae1a7f 100644
--- a/dev-perl/Text-VimColor/Manifest
+++ b/dev-perl/Text-VimColor/Manifest
@@ -1,3 +1,3 @@
 DIST Text-VimColor-0.29.tar.gz 58409 BLAKE2B ddc4395083fe39a060ed77f3c8fd75f1dd3b4232445a74236390ef454cb06066675da9d77d2d5139a8dd2f8c315ecc735b246b672152e2aef1cd1ace0621d704 SHA512 6b102b293a3742532bd576a2b8e61cbc87d44595eed19d9300104d5a9c14107c19acd8c2d5d006f1e248560b00ce3ee7c438f323df9e833c0322527d0e748067
-EBUILD Text-VimColor-0.290.0-r1.ebuild 806 BLAKE2B 01a65934dbd3a087b84e3dc867ef704f4af03280ad9eb75bdc0c16a4b0a7609d20d585f4a2a69219dccbdd12a9f195f3a08d72bcc79ba821f19b7cbdddd17555 SHA512 9cf7d87cc95cda0fa6ef078543c9f6d64a314425501bbb03d513131a749188c2f4032b68a83a588e4c01dd6ad41dc875f6beb519b64c3825bc69cabe8677c737
+EBUILD Text-VimColor-0.290.0-r2.ebuild 768 BLAKE2B f5d7e00fb562a7a792e04a11c1899f5bdfe3c9589843640cff07023939dea5fa7af13103d4a8dc7c54c86a9cbcf7b37cbedf7039bc2d6f2ca11152f0e3c24cf5 SHA512 c982364ff7654b21591dcd816c920feb168742f491e98c35641f382f22d2dd537cee1a55491e0147b4a17f9c92e979798f09fb730599dee0728fd366b82aec80
 MISC metadata.xml 549 BLAKE2B b6234b259d7b73781e4610e9728310262fa84d6a35b394ec7e6b8ff0ba92e9ff2f3b9a6a98ecbdc5c131185cde7137b621b82fb9a5a101cc987bee84b868642e SHA512 01c14e82e5a4e0f59543739f5769b32fcb846aa526193579d399c3b41a7ae3bdf01b0c6ec224699364c4e95b74792504850f126ba8103622ef7e23ced2227839
diff --git a/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r1.ebuild b/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r1.ebuild
deleted file mode 100644
index 8f55a2e725d6..000000000000
--- a/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=0.29
-DIST_AUTHOR=RWSTAUNER
-
-inherit perl-module
-
-DESCRIPTION="Syntax highlighting using vim"
-HOMEPAGE="https://github.com/rwstauner/Text-VimColor"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-editors/vim[-minimal]
-	virtual/perl-Carp
-	dev-perl/File-ShareDir
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-IO
-	>=dev-perl/Path-Class-0.40.0
-	>=virtual/perl-Term-ANSIColor-1.30.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/File-ShareDir-Install-0.60.0
-	test? (
-		virtual/perl-Exporter
-		virtual/perl-File-Spec
-		dev-perl/Test-File-ShareDir
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/XML-Parser
-	)
-"
diff --git a/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r2.ebuild b/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r2.ebuild
new file mode 100644
index 000000000000..cbdf1c24f943
--- /dev/null
+++ b/dev-perl/Text-VimColor/Text-VimColor-0.290.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=0.29
+DIST_AUTHOR=RWSTAUNER
+
+inherit perl-module
+
+DESCRIPTION="Syntax highlighting using vim"
+HOMEPAGE="https://github.com/rwstauner/Text-VimColor"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-editors/vim[-minimal]
+	virtual/perl-Carp
+	dev-perl/File-ShareDir
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-IO
+	>=dev-perl/Path-Class-0.40.0
+	>=virtual/perl-Term-ANSIColor-1.30.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		dev-perl/Test-File-ShareDir
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/XML-Parser
+	)
+"
diff --git a/dev-perl/Text-WikiFormat/Manifest b/dev-perl/Text-WikiFormat/Manifest
index f085dde82eaf..ca1a3e7e4653 100644
--- a/dev-perl/Text-WikiFormat/Manifest
+++ b/dev-perl/Text-WikiFormat/Manifest
@@ -1,3 +1,3 @@
 DIST Text-WikiFormat-0.81.tar.gz 34409 BLAKE2B 4eabf2b494a77408358c5dc95564717eaf51300e55caa17593da66ecd3dd5fad263f393feb9e66ce83139e2810cfc49be485f484cd3d340e210d376f69906b80 SHA512 60c781b9bda9dbd5f533a1cef326110f7aebe79078e38ba8ecf2e9d6c1b93cad552077a2015748186d04b7cd457fc63ab297ca24c01e321f1869dfafc4f1b4e2
-EBUILD Text-WikiFormat-0.810.0.ebuild 453 BLAKE2B 1d0a355d52826eb9c695d193c3102c34aeb450e407d1fca832da7ee662623bd3853542559a755d5262c3adc097dabbd3b0264699dc135c9482b6564b75c8cfa0 SHA512 0377e91b232194cbf8ed24dcdacc262fb2460815b45eff8607fde83b9cebbdd84339c0cf15b41fc72e9fe426e07dbf87cfa0f8750055d484a7da8fe65594a5d1
+EBUILD Text-WikiFormat-0.810.0-r1.ebuild 431 BLAKE2B 7b1ede45ac8169c6b46e400da14ea82c09781c8f84b2d074bada889b193ba367544df21fe6da5c853f6ee593434a399bb13e405e1b36c4d583dcdda628b81745 SHA512 97234f6aeaab6be22fa7cfbf1e1c96990221dc469aa6c7c85face63e4cb22585963c10df6f03fcb314afdc19694af2b4c91405dd49f9150b3362c25a3cd63b24
 MISC metadata.xml 620 BLAKE2B 1912a1fe775af0532228e5911d0d1035de84dd8598e4a6332ffc9e8cc937d5da361ea73a435924a3a32f53d7e7b119e449a30687adc2666b3a4bb6f17547e07c SHA512 3121bb393ef4d9da52ccdb15f9eab94e946b164a9f00b4c4353c86ddacab9d1d2762c569d83d5c2369f5e28502a5353b9f26a27bde0bcb6b81b56c5d8dd83c12
diff --git a/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild b/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild
new file mode 100644
index 000000000000..ab61846badf0
--- /dev/null
+++ b/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CYCLES
+DIST_VERSION=0.81
+inherit perl-module
+
+DESCRIPTION="Translate Wiki formatted text into other formats"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	dev-perl/URI
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.28
+"
diff --git a/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0.ebuild b/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0.ebuild
deleted file mode 100644
index 827b89c16d9d..000000000000
--- a/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.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=5
-
-MODULE_AUTHOR=CYCLES
-MODULE_VERSION=0.81
-inherit perl-module
-
-DESCRIPTION="Translate Wiki formatted text into other formats"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/URI
-	virtual/perl-Scalar-List-Utils"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28"
-
-SRC_TEST="do"
diff --git a/dev-perl/Text-WrapI18N/Manifest b/dev-perl/Text-WrapI18N/Manifest
index 45146329ef9b..2d465e6af8b9 100644
--- a/dev-perl/Text-WrapI18N/Manifest
+++ b/dev-perl/Text-WrapI18N/Manifest
@@ -1,3 +1,3 @@
 DIST Text-WrapI18N-0.06.tar.gz 3812 BLAKE2B 9e85b6afb81dfd5b568722986613150b3cd913ab9efee5907be08f57464b6a58ba58051695e933c7584d9849ab83e659f9814dd48719b6f7b91df08936ae7c36 SHA512 14ff46154f198ae743f1bf354d6bb020968b1e3c3996e882c871e0a0067ad1d6b50911e69aec31380200d64bc4ab46ca1829cce1206ad43406fab89fa7e6c0af
-EBUILD Text-WrapI18N-0.60.0-r1.ebuild 514 BLAKE2B 8c473ae517788a46f90bdb2cb6022d81719b1830868a3185f4c52813da80bf288b14d4c921a3d9e6d02515cd985725342b535b8ff1d0152094fa6947a7bfcd43 SHA512 983d6505855e9d0cb1e033476278a7272930ff813504672e516dfe0179d6cac5b32dcdb7e8992554a1b2968a09a745d3458ce6b99264e14dfe36a64ca584a190
+EBUILD Text-WrapI18N-0.60.0-r2.ebuild 488 BLAKE2B b557340bf82654dee4acf0e947140e0d28d68b380b6cec8c92281a6401d70caed66a2462bc148ccb9a9caa63d1dff5edae77fc635a12d704e50eeef7a7875924 SHA512 61687e2dafa93a7fcdc4dbdd273e9509d4c1c308f7f42a5ef0b159cea0bd4ccd171a67bacee95b10d99d5f9ce04454cf88c010e7383553556047b4dc16126ef3
 MISC metadata.xml 399 BLAKE2B 77f782c5a3503617034d65f10066cba7da239ca2549340008a82e9ffebcb405695b0d8c13339294963d7d1eb4300d67a10f14beaf1ab49df783afbc7ee131191 SHA512 b5d9d0b795680bbdd82846daf0b92f01437da2ec9a14d354c4fb4eedd381619006ca5ffa684d452ddf99674506208308fb77267d49311f6bb91adcd21f0ac2b6
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
deleted file mode 100644
index 856cdba9852e..000000000000
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KUBOTA
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Internationalized substitute of Text::Wrap"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Text-CharWidth"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..0fce69042914
--- /dev/null
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KUBOTA
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Internationalized substitute of Text::Wrap"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-perl/Text-CharWidth"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Text-Wrapper/Manifest b/dev-perl/Text-Wrapper/Manifest
index 0a737591e888..eb2bb6efb72d 100644
--- a/dev-perl/Text-Wrapper/Manifest
+++ b/dev-perl/Text-Wrapper/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Wrapper-1.05.tar.gz 18609 BLAKE2B 4b6420e45c0d12a869ef16371403b6cbef10d1bbed2a821f685d7f6be5c04cbd5579f0917b0ac670f56f68a9afd8bd4d5d7c618f43d5f8362aff061368882226 SHA512 8efd94ad7880069a37205a4b6e38d4b03ce8d83869994916abb831498e1e3d1bc23df39e8546b5b0953db7e0c8e7ef29aa237f8cf20452dc9e4263e49e31dad9
-EBUILD Text-Wrapper-1.50.0.ebuild 521 BLAKE2B 51ecc63e5ddc17a050e7ffcb3c78073604c71ce466aa56d604c3ea9f8edcc7771d3c265b9ddfdc0eabb0edf147f4500f44f9a9f523fff31c72a221800d6a533b SHA512 0382ecf65218c7e34ff93abae21dd68262fda2d74c7085575c61adb3e2535d92d023f48f6cc343bee67b601d007c262ea58d2354e6cd43bfb630c7f692c1d4d8
+EBUILD Text-Wrapper-1.50.0-r1.ebuild 490 BLAKE2B b5401b7100d3c094ebceffef74d503939a3c42b1e58988cc1ce95f0b972f22f96e62c8bd451e90442160fcd6771b2bbd1232623925cce96c5794443db447a78f SHA512 d56c160ff7da4dfcb543fe07cf9376f70095c902a9d1558387b0f8dcbd20fae2c3edf210ff38d55b609e98fe1bd0c34abb5bacb9e2eb8105dc6bcb3ad8581b42
 MISC metadata.xml 397 BLAKE2B be25d0efcae61c116f64f65d153f0cd8cc38977943dd9fead5bee93d0ff47d8618f8e8b5044bb398d676380b80619b3bedd13e182358d58650abea153a360998 SHA512 de8c2116cfc1e9375ba0ac2ee1337e9517bb7b58da30d11d507f80720426ca4931e4893e1e956d4b6a60cba98895bbc8b9d63096059219fed912f956641f2dc9
diff --git a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0-r1.ebuild b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0-r1.ebuild
new file mode 100644
index 000000000000..274ef216b448
--- /dev/null
+++ b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.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=CJM
+DIST_VERSION=1.05
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Word wrap text by breaking long lines"
+
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="minimal"
+
+RDEPEND="virtual/perl-Carp"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		!minimal? (
+			dev-perl/Test-Differences
+		)
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
deleted file mode 100644
index a0793367fc84..000000000000
--- a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CJM
-DIST_VERSION=1.05
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Word wrap text by breaking long lines"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-Carp"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		!minimal? (
-			dev-perl/Test-Differences
-		)
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Text-vFile-asData/Manifest b/dev-perl/Text-vFile-asData/Manifest
index 0b6122076de6..1eb3fcdce054 100644
--- a/dev-perl/Text-vFile-asData/Manifest
+++ b/dev-perl/Text-vFile-asData/Manifest
@@ -1,3 +1,3 @@
 DIST Text-vFile-asData-0.08.tar.gz 37806 BLAKE2B fbb2a1de3a5e4ce3573d4f6fa6357155604459f4fe1b6836b4e50626b04b6e8be3f1ecbd6a5a77e020e7ad7a1d925cb84950c92d476998a56ded1efbabde0aa4 SHA512 04ec51061a7dc1c19d00edfcb3740deae7c70372e8d5eba868e2e62326f0084fbb3f8237f7cffaf1a5d2f49a5ceac7dcc7ea391e1effe78923b6b0e523b2728b
-EBUILD Text-vFile-asData-0.80.0.ebuild 500 BLAKE2B c01bd35ad0d8e782815693070989081e317cbf0d4a9009c303bd3459bbea4c9efce5e1c5d2860ca7b4ba486534a936e2de02674188500e8705eef9e252b1a1bd SHA512 0fac5421731b3ec625074cb943b3e75ba60c96b98ab638e7db4d2b03de1d1669198dbbc4250c2082c19c3bd7b2b9aa79538221fc12c5ad8946dd295fcaf8027b
+EBUILD Text-vFile-asData-0.80.0-r1.ebuild 443 BLAKE2B 73ce1c41b4a7e3be1ab54bce7208127ac09c827b9a2c704f97564637c72864b3096afa41afa96d7acac6d75eb44e8f683d4b04da764f79b3e1109923d2073631 SHA512 8265663a018ed938d54143025243324eeb207ecf1eb0f1a5118bad3ab40a8ceb8c4b0a94834d4559532a836b7508c1b083e2a52ed52087ccfe8be7cb4c1424a6
 MISC metadata.xml 408 BLAKE2B 4d9bf1498d9bd55136493fae751abb58bcb3b1086d99e7e63c73196c1f03db0d685e90b31e3baa235023d657d2009e3cf32b65cf828c40f180f3d05103fe37af SHA512 a3533f89b4885c0ebf8697854fc3d7e21629c8af477ee2f7f3059d0cfb42e8a9ca7bc80360bca9184f8b88fa3235050b8e232bb638ac1b8d0b7e51f30d8ab759
diff --git a/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0-r1.ebuild b/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..81217e24183d
--- /dev/null
+++ b/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.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=RCLAMP
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Perl module to parse vFile formatted files into data structures"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="dev-perl/Class-Accessor-Chained"
+BDEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0.ebuild b/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0.ebuild
deleted file mode 100644
index 64b2d2d78a53..000000000000
--- a/dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RCLAMP
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Perl module to parse vFile formatted files into data structures"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Class-Accessor-Chained"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/TheSchwartz/Manifest b/dev-perl/TheSchwartz/Manifest
index c2f8395a4e6e..cd11f234d0f2 100644
--- a/dev-perl/TheSchwartz/Manifest
+++ b/dev-perl/TheSchwartz/Manifest
@@ -1,4 +1,6 @@
 AUX TheSchwartz-1.12-no-dot-inc.patch 8095 BLAKE2B d8c40697d7d2d10406672f7312b090dedfd97b33f86b76a879fe8b775f0ab0c00e71d1f9e4ba75733be16fefb3e1212d6c23739271bd476823c2b9ade8c3f8e8 SHA512 15e2b5ce6de9b3eb24997086266e515c2a6af480289529a15210b54e5478f11ebc960ec5f33d6b40c6654afd777e40a8ee765cf5d63ff48e7a80ad9aaa0a1e71
 DIST TheSchwartz-1.12.tar.gz 55047 BLAKE2B ebf7563203790dd1ecf7c026cefb2027bf1aa5e1af46200617625d48f6327338f08606ea47d21a474b35331eacd00b03c0924bfc9d28e6cc9f72fe5f96ca2007 SHA512 87c691c6aee0603a68d4116e9254308331974042d8578d6df086bc6f0f07783d757951f8c3a35227b9d716e94ccecbcea1f92ab488005384c2caf2ba9aecae59
+DIST TheSchwartz-1.16.tar.gz 54382 BLAKE2B 3a50f8058cdeeac0aa3c0c2d9e439e142dce1e508c6164149e8c33624dfb2fd5af97584070e3f81477658d322cc79a2d8c69fbdd4e8002019915f3f8fb8d66c2 SHA512 3d326983ebe21ba3d2b64c4af6b3fe8544346d510e04b15f3b7560c2e6d97fb07b062f2a6f77d1107f5cc0d4690c64375cc702c941e7f1e9a50b85efad3207ef
 EBUILD TheSchwartz-1.120.0-r1.ebuild 468 BLAKE2B 865de268cd57439ff44116d9ddd9cdef909b24f0e4f1ab3e7276bee6f9acf8c47256a50166c16e3e51a656d7b71e48b4b9019b5b08aaef0f2ef79529087c86ae SHA512 933f58bde826691d6bb9496d64eb7217b05b858f277d96e87ea4aa1641d0fbe7d3b90910448c018540dc77f296a869a28368eb9e025288498b58ff6f263a9228
+EBUILD TheSchwartz-1.160.0.ebuild 500 BLAKE2B ee9bf22dade8b97ecfa3ee12c462e2039329c58ca4c5c79f20978f5651d2d78fa1f7af907baa1823bbc24e77c2ddf2202092c76eda3a7d830f008ed610b863e4 SHA512 441de070a1a3af0a80892ed8eb8dfe39208b98a7b694df6006b69b590b60eb3f400564d07212ebf218e10fe27352915a7a6585816654909571b4217ab176f97f
 MISC metadata.xml 794 BLAKE2B 970e636895d5f073638cf1a595bdec03a1007fe805a5fe3457434b844e880b868dad44d2787fb29bb2fd389ec9ef69b22b75666246b9345bcfd75d2eb08f480f SHA512 b7c34648c3a910b1b1c968c7cb179fc410cf38984bc84c83b9f0f0654f47048c1e622aa3a988071129d062e0bf0c61db8fff5f26a763abd760654dac5b986d0b
diff --git a/dev-perl/TheSchwartz/TheSchwartz-1.160.0.ebuild b/dev-perl/TheSchwartz/TheSchwartz-1.160.0.ebuild
new file mode 100644
index 000000000000..a5418e301bc0
--- /dev/null
+++ b/dev-perl/TheSchwartz/TheSchwartz-1.160.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=AKIYM
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Reliable job queue"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-perl/Class-Accessor
+	>=dev-perl/Data-ObjectDriver-0.40.0
+	virtual/perl-Digest-MD5
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+"
+
+# Parallel tests fail due to database ordering issues
+DIST_TEST="do"
diff --git a/dev-perl/Thread-SigMask/Manifest b/dev-perl/Thread-SigMask/Manifest
index a05f20844369..b6b13c38c4f4 100644
--- a/dev-perl/Thread-SigMask/Manifest
+++ b/dev-perl/Thread-SigMask/Manifest
@@ -1,3 +1,3 @@
 DIST Thread-SigMask-0.004.tar.gz 11511 BLAKE2B 5de461429ca6245d569c407c6b157a085a924e5bf83fb961db007f64b320164a45aa629d345dd82c41bbcbc8740d8cefeac8a51a7495918499ca91dbc4278a45 SHA512 326891a232cacaf31a1789cdb27fb90602b97c90091ba9a5a519fc8be6512ea36239b45a39cecfdd6ac0690817e5953581f42043a5774229ee76aa407c2be28e
-EBUILD Thread-SigMask-0.4.0.ebuild 597 BLAKE2B 809cf58f6466d55b11ea4c38c56b2ddeb16c89440caefbb167000f1dd8bb38de6b4ecc9ace6f60b9ed4dc545b6f9c22cc8b70f53e4b9c01070275e159f1edd05 SHA512 55b4b708e9209d46aad30e7cc74ae430f6442d5038192acdff7bfb5587771dde0160e432fb8969c24ba7770bc128c0e254b6f5ba06a88941fba38329bd19a655
+EBUILD Thread-SigMask-0.4.0-r1.ebuild 560 BLAKE2B ead2ac12e1f68b511fc222e99e0ba4d58594b607a3f51992ca461b5ffa0c8593239a5ba87b4c15bdcf46158108eaa647bb55ce457b7be3841016d791bc49a3bc SHA512 ea0b668212681e42155149c5360e601c83d6279f4bdd22ab81f0e066b9af74e7d4f395e5e5a5fdf29cec4992f17302ddf1e992aa3cf67369005d23dee062a41a
 MISC metadata.xml 401 BLAKE2B 91f8a8948639081a658d3a48be1d88bf8001d234b8d034a92864e760babbe117af60a3d26353189b4168bb4cca8616d6cc95059649d2be662900f6eb1c00ca22 SHA512 309ae3cdb5d198341c9af5527b2d2f4e238868f00f3a1afcc36e2590a6ccc26c7752bacf5d9f56586082de738c5629e6a13c612f246f8afa5310b91043bf5665
diff --git a/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0-r1.ebuild b/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..ba9dcee47dec
--- /dev/null
+++ b/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.004
+
+inherit perl-module
+
+DESCRIPTION="Thread specific signal masks"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files "t/release-pod-syntax.t" "t/release-pod-coverage.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0.ebuild b/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0.ebuild
deleted file mode 100644
index 8ab19290b6dd..000000000000
--- a/dev-perl/Thread-SigMask/Thread-SigMask-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEONT
-DIST_VERSION=0.004
-
-inherit perl-module
-
-DESCRIPTION="Thread specific signal masks"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.360.100
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files "t/release-pod-syntax.t" "t/release-pod-coverage.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Throwable/Manifest b/dev-perl/Throwable/Manifest
index bc861ac32b60..2891ee2c6502 100644
--- a/dev-perl/Throwable/Manifest
+++ b/dev-perl/Throwable/Manifest
@@ -1,3 +1,5 @@
 DIST Throwable-0.200013.tar.gz 20254 BLAKE2B 96150b877288e9acfba7b72b721a85779b1a3cc04db4159ff0e135653a8c15f5a207d52b4275f56912496ad0fdbb178e455eb668912295053d865f4cfa224e50 SHA512 81ce73709c7c6a0160da42b00ce06ddf4cce79a6801df7aa90ddcce67efed6ace17b06171ac42b2737a98515c17ab46b5a3b7fd9e5bd3079b109a977dc6c0963
+DIST Throwable-1.000.tar.gz 21875 BLAKE2B afa787b0e29f8d962589edb87b93aa343d703ad00bf7e9d96b2a4a66b95ffdde5877a775a7aba053ee7b4d0ad2b7ba46677a1ed8d416003f70a2fdfa176c296e SHA512 d81d2e3eff78ad396e6e61ad09ecf3c1eaaf33ae24c8b74c8336b568dceb1b62aa03f9e8417df2edc55b0c6806599c7e88ccc43f2b45c11262fd8139706a9bc3
 EBUILD Throwable-0.200.13.ebuild 621 BLAKE2B 6d95b9e4f6edfeb8bc79da0b4f9b4b51695d047282db9ce8862ddf6e81cd2df8b1518cc31d19e0419aebd64e84b5f24af0d7861573af8da372abfef2a0bafa84 SHA512 c7780a7a14f6ae93115f36b7f6ad7d38cccdddf549da2c1de385f3a3f97c3f841a4177ec1ba5956f0b4f7d540337cce8c64dcf202e07f1b8ff71506828f678dd
+EBUILD Throwable-1.0.0.ebuild 602 BLAKE2B 06c9d7b10c96b9ceef19e2ad5df3a0ee883939b7145d80406fa61f314f4649377881d62a211da9f35d6ecbe415f2029ba0f89341883409c858fbd848ab4a4c7e SHA512 e005425183339bc82f46ab409822f45cd731bd46cfa6669e409f91d4b5d99a89d8716aa736ddc44a94ca7f6dadef91281e2992f6519084746bcd7c444a00a05a
 MISC metadata.xml 516 BLAKE2B bd949a1514219b6558a4f98d79fc22fde82c76e0d754cbf68ad78a5ef04104dddeeb2c22a9f87b460a57486a58f5f703ab432b1bb4a89bc1a1d99b9686fac7d2 SHA512 10311fd94cb3484c138c924e5424cf50401bffeec193ee93645d4afd211607faff0312c16df0f50fcd52e68ecda7b8a0608bdd4c7a630489a1ac0a3217474e44
diff --git a/dev-perl/Throwable/Throwable-1.0.0.ebuild b/dev-perl/Throwable/Throwable-1.0.0.ebuild
new file mode 100644
index 000000000000..5fca8f522bdf
--- /dev/null
+++ b/dev-perl/Throwable/Throwable-1.0.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=RJBS
+DIST_VERSION=1.000
+inherit perl-module
+
+DESCRIPTION="A role for classes that can be thrown"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Devel-StackTrace-1.320.0
+	>=dev-perl/Module-Runtime-0.2.0
+	>=dev-perl/Moo-1.0.1
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Sub-Quote
+"
+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/Tie-Array-Sorted/Manifest b/dev-perl/Tie-Array-Sorted/Manifest
index 48b8bf167bc6..361b45af4ecc 100644
--- a/dev-perl/Tie-Array-Sorted/Manifest
+++ b/dev-perl/Tie-Array-Sorted/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Array-Sorted-1.41.tar.gz 3822 BLAKE2B 026c1bd9020628d9f6b768045069006141ce7a90ed8192f1b44e5889955e7c389a244b3ee2af3b0f741ea8ad4693c0293be0214ac2fd599e3f987037eb750d01 SHA512 eaabb6aa3ca0d0e97a284835c6712e57f883f9b8d17f9a8a08634137e5c143550e76942d2ef91746325fe35a5c464654f5eb96a741870f7d8f65b8963a8f62ed
-EBUILD Tie-Array-Sorted-1.410.0-r1.ebuild 491 BLAKE2B 9a6c7b3e4aa5b8c3a0964e4d3df7e5bcb0c80bde5e32a434d15666134f2eb910917c89bc0f65b4eaae1870c50dd3718ed118ec1be2589d56a5595c5a8e8016cc SHA512 acb6873338745151e774fb997ea94a0afcb6407d4d219890d86e1f748fc9bc8453daf4ca8776ad1b7c300d93fdcbb4a5fb07e93dc71b20321edbe0cf7952ffbf
+EBUILD Tie-Array-Sorted-1.410.0-r2.ebuild 356 BLAKE2B 889e1b890228134e70fbf0317003e66e94985e57fbda65972bc8312c40f07801bbfaac55b4ded710a76b2224ae9f96f246fb59239ccad90a4651c8825cbb7665 SHA512 6691f0fa1149204696fca8b00a4d4760855b25d41180e763ed400ca6b226af546805e332ebc3784be99baf172e968aae83f0022d9dea7559d90f64ce603f9b55
 MISC metadata.xml 477 BLAKE2B 4cd0252047f24711069a07e01d9012cada71fdab72efbfb6663621bd6ee431a235aad64e64a5b20f639dbeacac706cd9de0f258d6839a8447b3f758a3124adfd SHA512 e069c2399b6889e1d6846fcc6cf72968aa346ca03e85bbb7dea13f7ef28ece63566da216841a0940b7b52c46f46cb487bc8ebce098fe273b60940c4ce729e355
diff --git a/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.0-r1.ebuild b/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.0-r1.ebuild
deleted file mode 100644
index 9de94ff5632d..000000000000
--- a/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TMTM
-MODULE_VERSION=1.41
-inherit perl-module
-
-DESCRIPTION="An array which is kept sorted"
-
-LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod.t t/pod-coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.0-r2.ebuild b/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.0-r2.ebuild
new file mode 100644
index 000000000000..a684433cacc0
--- /dev/null
+++ b/dev-perl/Tie-Array-Sorted/Tie-Array-Sorted-1.410.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=TMTM
+DIST_VERSION=1.41
+inherit perl-module
+
+DESCRIPTION="An array which is kept sorted"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+
+src_test() {
+	perl_rm_files t/pod.t t/pod-coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Tie-CPHash/Manifest b/dev-perl/Tie-CPHash/Manifest
index 59cda57e449a..c9a3253a40f0 100644
--- a/dev-perl/Tie-CPHash/Manifest
+++ b/dev-perl/Tie-CPHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-CPHash-2.000.tar.gz 15828 BLAKE2B 6821f8754b121509bdd919740ad3a43c23eb8caa4aaca328a20e110a1def84d3e768bfc0ba1caee9ac70147b1017aeab6377a714ecbf5100b13313a3c6cc5c85 SHA512 0fae8b82f0600cd9bc058623eb036309c59cad323d7fba42880bcb539f702c300a59e2eb20fa972caa8c67682ab13a636c1cab895401c0839f0025ae981628e7
-EBUILD Tie-CPHash-2.0.0.ebuild 461 BLAKE2B a0f799e7c594623030e7a1bca04b127752d63b8b21687aaedbf3fda7fa30b1556a95d71822a5cf673de4f45b68bf6dc8a4c179288ceb7978ec50fc648a3585c7 SHA512 02537e60c6af769cd3979c93078e8ef63e1227010106b3f3438dd99f1de0cfd7aa29e1b3269f6910227fb9207206ed403a0f6ff3f893b6c2c6acc2ef1c460e8f
+EBUILD Tie-CPHash-2.0.0-r1.ebuild 396 BLAKE2B 29ab393abbefa5b838be5d1505ee3257f1f5c0f4761943b79da8fcdbe8e9a020eebd002aa982463f9eab3118e0596035e2bc097fb7c2eff003e25d54d443a6d2 SHA512 330ae9ea79b24982e9eb92014fd3a7bc14d71ec2d26faba8ddb766c6dc0998a942873fef9fd9a5742863381f27df51e15aebb0f1f739e30e98965bae69b45e48
 MISC metadata.xml 465 BLAKE2B 362fa6434258c21c951c9a63d338accd6a74f3ca2a29f0dc89753d608e38d3c6572de6c589df525d270259b72e0c506cf536c283b9dde1860a24f620070f8bbf SHA512 966d11a8e796f09107195fd1cb1b02866cf22d226cf29c2322d8f57eb1b9a2a4612872e35257f6bd0e17f3f5d0f1d6941778782ec62e90e00070d585d66eba2d
diff --git a/dev-perl/Tie-CPHash/Tie-CPHash-2.0.0-r1.ebuild b/dev-perl/Tie-CPHash/Tie-CPHash-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..2cc641739cf9
--- /dev/null
+++ b/dev-perl/Tie-CPHash/Tie-CPHash-2.0.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=CJM
+DIST_VERSION=2.000
+inherit perl-module
+
+DESCRIPTION='Case preserving but case insensitive hash table'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/Tie-CPHash/Tie-CPHash-2.0.0.ebuild b/dev-perl/Tie-CPHash/Tie-CPHash-2.0.0.ebuild
deleted file mode 100644
index 081970673c92..000000000000
--- a/dev-perl/Tie-CPHash/Tie-CPHash-2.0.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=5
-MODULE_AUTHOR=CJM
-MODULE_VERSION=2.000
-inherit perl-module
-
-DESCRIPTION='Case preserving but case insensitive hash table'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Tie-Cache-LRU-Expires/Manifest b/dev-perl/Tie-Cache-LRU-Expires/Manifest
index 9e241d9a20ec..347ba435768a 100644
--- a/dev-perl/Tie-Cache-LRU-Expires/Manifest
+++ b/dev-perl/Tie-Cache-LRU-Expires/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Cache-LRU-Expires-0.55.tar.gz 5803 BLAKE2B e8d3dd1957cacd6c2bda82623c5c4da0ba0ef8e85edb9c9062798bda7eee4fbf44bbeef4443dece7d211b4e1efec367cedd6efc2c31613b56bd7bc45ec1f8578 SHA512 df1e1ee1bd39e49c476880b478e0d0f2069dc57480bc06ff2e941d3851141a19dff2900e62ccf06aee147bd360c714b26926f870382b057b1da9d7a8f84f34b7
-EBUILD Tie-Cache-LRU-Expires-0.550.0-r1.ebuild 373 BLAKE2B 712444e573da86512035d21dd7852bab8372baadf49b27b59d8bc2abc43ba05186cbbfaea8386817caa346efe806bcba1e44d5b477b351f9d5196dce2e868ef8 SHA512 05cf47db57ac3c07972ccd6a192851e4adfe3986b3b7466f222a14fab5fa495e6c9f6ac85a35bc10b37b107127a7eae768bc2cf1239cf8f91c5735c6cd4a422a
+EBUILD Tie-Cache-LRU-Expires-0.550.0-r2.ebuild 347 BLAKE2B d9ce8f85ba3f33636706dbaaeba60eacf01a98fc1669486fd3fc4074f49747c7d19ef66cffa6b97a94d7b465bfcb8fbafe5232d9ad3084db9d3eb43d70b99a4e SHA512 39ce84637c9a321e03783873ec4bc6080a990bfae5bba5116994e31d3a8604b55aca128a6903ca42ecef1dfe447f976b58f1dd77bc32b23a78e9c5df5f6f1984
 MISC metadata.xml 417 BLAKE2B f43afcf4bf4cb866a0e154dd80ba399084a119c4705a757c88d4ca10f33e1ca31fde2961a1b4d13710115745996d8552a428cb7f648ade88ea4871f0f2104ac0 SHA512 724f0d07d93c400c6149436b7cd097b67d8ed83e44ede54316a4f45ee47dd60257d68abcf59c03d7b4d4d1d42169f125bbe5ba369edef8756318082b1e29220c
diff --git a/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r1.ebuild b/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r1.ebuild
deleted file mode 100644
index d6de231eb63e..000000000000
--- a/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=OESTERHOL
-MODULE_VERSION=0.55
-inherit perl-module
-
-DESCRIPTION="Extends Tie::Cache::LRU with expiring"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Tie-Cache-LRU"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r2.ebuild b/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r2.ebuild
new file mode 100644
index 000000000000..ad75962c70df
--- /dev/null
+++ b/dev-perl/Tie-Cache-LRU-Expires/Tie-Cache-LRU-Expires-0.550.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OESTERHOL
+DIST_VERSION=0.55
+inherit perl-module
+
+DESCRIPTION="Extends Tie::Cache::LRU with expiring"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+
+RDEPEND="dev-perl/Tie-Cache-LRU"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Tie-Cache-LRU/Manifest b/dev-perl/Tie-Cache-LRU/Manifest
index 4cbb57133466..654b25746433 100644
--- a/dev-perl/Tie-Cache-LRU/Manifest
+++ b/dev-perl/Tie-Cache-LRU/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Cache-LRU-20150301.tar.gz 142047 BLAKE2B 057cd9f4f25cae54e242b267246bd183b812dcb9a9cd6a48713fd4d70d8c379a17a0c527a9a5a2f2decccee64a35d1c16f3bf89c8e298f90ee10c21109482b9f SHA512 de43148debc998d7ce40db60448b63195e9e3e89982997add7962b647b55309ee1b2a8ebda87c62cf1a811bb34bdb5df581021648c5a9e05755caa117517bb55
-EBUILD Tie-Cache-LRU-20150301.0.0.ebuild 488 BLAKE2B b3ab747ffa516483fdd5927a5862f2b905e8857e70d8c992ef823dde92eda4eb090ca5f5475d6742ae075958b84a18efb7498b92cdd1652128cf8aecf08864c5 SHA512 c8ef4abe4e52967caf9c7d29d79ca667feea61d4238be5824bdcb92b80da22d5ceb015102444529291ba2b118faa39afbb8e83c316b8a821b18576039173d0ab
+EBUILD Tie-Cache-LRU-20150301.0.0-r1.ebuild 440 BLAKE2B 5365da7ee93735623f2c70e679d73449d8562353fdde40c53a3f9d8af69b89fe063380127309ebd383584cce792334c1c85e4e4a6680e42304839475f2fc5196 SHA512 8062afc9f1184f8657deb2b0260957527838b1589c52b793519b7f85777ff36e4a392b79c2c4d83cae6f11df97f5ecbf6eccac61f169885160bfc003b93413bb
 MISC metadata.xml 614 BLAKE2B bb8ee418eb0f040bdf3be5b43f4f6d189913e375fb40ff352d91250e109452bde95dd25b4e8e98e6657e994f8832aca7247fa878733534e8e4f29739694ed3a8 SHA512 6b6c3467a2cfdb8fbd56d77a4019cdb8fe70870f55e84460d48f55cad6a949ba096148840aa18bb6c31284a6ed9ece3da7067aade54b9deab93bf88c9f841436
diff --git a/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.0-r1.ebuild b/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.0-r1.ebuild
new file mode 100644
index 000000000000..2457ee2e2bc4
--- /dev/null
+++ b/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.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=MSCHWERN
+DIST_VERSION=20150301
+inherit perl-module
+
+DESCRIPTION="A Least-Recently Used cache"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+
+RDEPEND="
+	dev-perl/enum
+	dev-perl/Carp-Assert
+	dev-perl/Class-Virtual
+	dev-perl/Class-Data-Inheritable
+"
+BDEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.820.0 )
+"
diff --git a/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.0.ebuild b/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.0.ebuild
deleted file mode 100644
index 41d9614f82fa..000000000000
--- a/dev-perl/Tie-Cache-LRU/Tie-Cache-LRU-20150301.0.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=MSCHWERN
-MODULE_VERSION=20150301
-inherit perl-module
-
-DESCRIPTION="A Least-Recently Used cache"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/enum
-	dev-perl/Carp-Assert
-	dev-perl/Class-Virtual
-	dev-perl/Class-Data-Inheritable"
-DEPEND="${RDEPEND}
-	test? ( >=virtual/perl-Test-Simple-0.82 )"
-
-SRC_TEST=do
diff --git a/dev-perl/Tie-Cache/Manifest b/dev-perl/Tie-Cache/Manifest
index 96cc67dafc41..2cdb729e073b 100644
--- a/dev-perl/Tie-Cache/Manifest
+++ b/dev-perl/Tie-Cache/Manifest
@@ -1,4 +1,4 @@
 AUX Tie-Cache-0.21-benchmark.patch 989 BLAKE2B 7f76762bab62c4687012ef68682376e60c5a8be5a7baf1926046bb0658705e737ef3ab5339e69ea46051e11e46c51ea16f7af44f9fa2a4ad2333c652872e4824 SHA512 83703ba232d3f68c202d4cb981beb7b03eced718b7121b1c2918ab0e2d157e9f4ef4237933d1bc0480135386e989f2bff00b02a7a4bcf7f3dec07475670be3bc
 DIST Tie-Cache-0.21.tar.gz 11200 BLAKE2B d3c0d9e97a2736c4f5c8acc353e124537c11ffc7fea3e1fde371d457868ef6fe7d24515ff746f1127fbd9fe753ce7823840b40fce77841fad6ecc2f3c575dd20 SHA512 f2d5672c058db0513b1956e077d68c8641b518e3e676fa3f05508a21989284c7a5059a110c0e12235eefd2f7bf358b531a90ba89b60b7ae61d04f8ed24347de9
-EBUILD Tie-Cache-0.210.0-r1.ebuild 364 BLAKE2B 74a419c6cbe8b72fa5dee97c4acb69121213f6dc1a9254380da84c028595575878e5fd67446345067ef79c8b8d41aa1a5270345a4c2658f0bdabf5fcea0dad10 SHA512 bb76ebb03d7538c68b5def67a86ce474ea047c19730d187377e9b8aa9ec468e9d0dc9792fc628aeccfd907ee6b56d5d69201c3ae8fe9e9e95427f9b2bbd38fd8
+EBUILD Tie-Cache-0.210.0-r2.ebuild 356 BLAKE2B 3e5ed805d9d0c271a8a79359a8a75582216816fb006719ae44814c6570b269dcf89cb2e48fb957906d429d75333d6b3ded7be4b3b40a95e66c43ee3bf24b00cb SHA512 01ab39c57556c1b5cb7673c6ed0d23b6df9fa0c232d498b79f64476a926be9f52dbab8ebfa3914f7db7e7dcd8c0c8641a28116264b96088a15d04e6ca94f8097
 MISC metadata.xml 391 BLAKE2B cccdd7c5a9b7489caa8615d271f837ec13c024103062c9a8f273dd8287446aa7cf392e3e86a2a3e4fb4438784575143a893a2086f602a6f25f022af5d390edf9 SHA512 e9b19b3f7eb1016909c33ff5ae83b4c57afd9d10615aafa078c22fe1c302dbc36d567c3e5766149b3dd996213fc9121a59a8fc028f962f93d39502bf821a4d80
diff --git a/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r1.ebuild b/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r1.ebuild
deleted file mode 100644
index 83036a11b23a..000000000000
--- a/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHAMAS
-DIST_VERSION=0.21
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="In memory size limited LRU cache"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-0.21-benchmark.patch")
diff --git a/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r2.ebuild b/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r2.ebuild
new file mode 100644
index 000000000000..0d8221f70f3a
--- /dev/null
+++ b/dev-perl/Tie-Cache/Tie-Cache-0.210.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHAMAS
+DIST_VERSION=0.21
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="In memory size limited LRU cache"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+
+PATCHES=("${FILESDIR}/${PN}-0.21-benchmark.patch")
diff --git a/dev-perl/Tie-Cycle/Manifest b/dev-perl/Tie-Cycle/Manifest
index cbd1035f32a8..136b1eb860fb 100644
--- a/dev-perl/Tie-Cycle/Manifest
+++ b/dev-perl/Tie-Cycle/Manifest
@@ -1,4 +1,6 @@
 AUX Tie-Cycle-1.225-nopodtests.patch 604 BLAKE2B b678658a9bfa7a64d56b6bd9c22add04af9818ac9ec8526559e23763053d142125a36edf29433fc3859d3a7bbfcc38fb5f0bc09a5dd25a870ebc537749bb470f SHA512 a8b545fff8fcfe73a45d176b412478ca872980384b833b09a9a920475c27b139a09fe2e6e2a62364a98db1d4e8268562e165b547552385fe67551386280641cb
 DIST Tie-Cycle-1.225.tar.gz 11109 BLAKE2B 8a1d2905988c33216932e6d88765afcf6f0dfa9ea42f4b3ce9146856a21aaad4931660066d52d18569171292c3175dfe1fd4fcc9dc1f43b42acf0d586122e946 SHA512 68822821a6bb5475bef7bfdb6775a876aaac6afead5b79b0bd1365f99eb1bf4430a5ae97b8e124f66fd4cbef2b4095df526c85d2d9240b0750bfae6af3c9f75e
+DIST Tie-Cycle-1.226.tar.gz 11064 BLAKE2B e7ff61f6ffbf4bbb1b1263c55054acdb6603345e67a9952f83eeb8562910a5fb26a7ad5b0004ecca2b45271d5f7524aa26d9dafdd301fa7c55fc2236c8fe25ee SHA512 74097ea346efd3217e076fee5fec2bcbcd1c0165f6b94c435e022e7aafa581d5b17f2c03768e351c2e404d067b064984c595d7d53b20f5b16e6874c22228ad4e
 EBUILD Tie-Cycle-1.225.0.ebuild 605 BLAKE2B 806d52f62606068a496f192c468c5c1b7637b568238d74c479dad9c186cc0d80654da0a84c11b91ea706a8524631ea27348a22cc3233a57f88a64b1fa5c0d59d SHA512 7bb08fd6c77f8e6bbd8a0dcd80ec5a3379783ac53507ea65caaacf3c78348c2dc462b3a3b3508923e5d7e3b163e349d5c99d835aad356e350d77c2e650fe83c3
+EBUILD Tie-Cycle-1.226.0.ebuild 573 BLAKE2B 04a30dcf535b5e6a1bd9da865dffa585da11a32bfdf36c5ba77b385b5b657d6747e20fba28fb43a0e15f1837d5042cefb1d1aea4a0bcde6643c70ffee7564bf6 SHA512 743e5cee001beb106dad5a050a93f75715c0a30fb8887a41a4b9e13403fb1d97a71af72757b72d70c267da9e913db9f48346625d8398cdf1b6b27d1617b93674
 MISC metadata.xml 379 BLAKE2B b2e6490e131dc4112f7b16c366ff06b301ada6d6b8d75e8482cb41e6e98bb335c587bda396aa48ad4639b4db6f8a7fa7f84e8df97d975c47d4377f8df0a489f9 SHA512 1a5781762354bf3ed891c340cd2923952fb5b855a5feb5348490ab883c34fe405cb536d0b120a4e5d551de7872eae24db0a035d80b98bc721dfc677f8c4d2c5c
diff --git a/dev-perl/Tie-Cycle/Tie-Cycle-1.226.0.ebuild b/dev-perl/Tie-Cycle/Tie-Cycle-1.226.0.ebuild
new file mode 100644
index 000000000000..924772f6fc69
--- /dev/null
+++ b/dev-perl/Tie-Cycle/Tie-Cycle-1.226.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=BDFOY
+DIST_VERSION=1.226
+inherit perl-module
+
+DESCRIPTION="Cycle through a list of values via a scalar"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.225-nopodtests.patch" )
+
+PERL_RM_FILES=( "t/pod.t" "t/pod_coverage.t" )
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	virtual/perl-File-Spec
+	test? (
+		>=virtual/perl-Test-Simple-0.950.0
+	)
+"
diff --git a/dev-perl/Tie-EncryptedHash/Manifest b/dev-perl/Tie-EncryptedHash/Manifest
index b4ca91ed90c9..850653339b51 100644
--- a/dev-perl/Tie-EncryptedHash/Manifest
+++ b/dev-perl/Tie-EncryptedHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-EncryptedHash-1.24.tar.gz 10515 BLAKE2B 8350c49bb01ecf3462aa2a53ea5bc1cd1d301beb3cfb34a012eef32997ee43e57bd5d977f573c67eaafcab4cd99c909d0446bd563d90d462519724953e507bb4 SHA512 1b86af7ed2854f8b5a9f03f22484ecb08021efd87993b3f5786a56764478e022d5e2f2cbb87d4a832743a05e1983174481b95d3545175106a44b9911fc8adef7
-EBUILD Tie-EncryptedHash-1.240.0-r1.ebuild 467 BLAKE2B 4794a415aeb7676c3312d70b6216b2bd990b7dc8f19fedd9a413f8b4b3d09ca662ad49fe15ae18104e37d014b19bd72f0df16ebdd754059920d540074d8ba734 SHA512 370f88c833990f25f3de59da70dac8704fcf6386a96b47b5c343f799b52daaa2ba362a2c089a8c8ed6ddff1ddb87a5d747c9dc7e5f839f6127cc677f139ede6d
+EBUILD Tie-EncryptedHash-1.240.0-r2.ebuild 444 BLAKE2B 1846700c8b2c924a12f93595da07d3c2c97c19e50d2aa32e09f3140cdb272a575db19a276a2ee31df3953f52c312c7610a2bc0ba431382e32e771f886ff2f2f7 SHA512 5ca53e0ae68a252e097db00f91923ec3f01bf5366def9b807a1069770878b4bdb54ea09cc4900f55821dbb89d39b48ed3ebf99d57fe80a19753e86edd315b897
 MISC metadata.xml 407 BLAKE2B 4579c55c320d0caf91861f398b391b983327cd681b08915a276d3fa6da15dbd2892235df1e512fb5c6eef14bc4cf15cd4f8be3fe35630369984fa6f5b06db7b2 SHA512 47bd51cac3de287eb6a561cfe6c749cb2eb2a22c405dfc2117258e4c69a6573b0025928c335ff3b778fcf583bc92d089b4d6d1555583e917624917f137a68ab9
diff --git a/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r1.ebuild b/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r1.ebuild
deleted file mode 100644
index 3d858a418ec2..000000000000
--- a/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=VIPUL
-MODULE_VERSION=1.24
-inherit perl-module
-
-DESCRIPTION="Hashes (and objects based on hashes) with encrypting fields"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Crypt-Blowfish
-	dev-perl/Crypt-DES
-	dev-perl/Crypt-CBC"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild b/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild
new file mode 100644
index 000000000000..99c6795736e1
--- /dev/null
+++ b/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.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=VIPUL
+DIST_VERSION=1.24
+inherit perl-module
+
+DESCRIPTION="Hashes (and objects based on hashes) with encrypting fields"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="dev-perl/Crypt-Blowfish
+	dev-perl/Crypt-DES
+	dev-perl/Crypt-CBC"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Tie-Hash-Method/Manifest b/dev-perl/Tie-Hash-Method/Manifest
index 8b4d48129c4a..f539de34f805 100644
--- a/dev-perl/Tie-Hash-Method/Manifest
+++ b/dev-perl/Tie-Hash-Method/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Hash-Method-0.02.tar.gz 4874 BLAKE2B f3f967efb1eb0cc50e12bedd63741c124a6cc0e3de5ad578d36e9e7a371d2b2e6d5c5c326905b24b8c32a7b317ad7cb1048d3edcf015702fb9fc54aa366f465d SHA512 e32e911310dfbe066167a8750f9e9a4c5b277c4666addaf3a6b00851ef47e190c88195c394b8778b38e570001ada38f00d78b2ca4fa32498bf8fbb1f94b82424
-EBUILD Tie-Hash-Method-0.20.0.ebuild 377 BLAKE2B 1d3d870d4e79fd201f81f4a442ae4c24d19094c6dbfca92d98c75299429a31c9c6c5614ac8a693d4e9223f5420bc41ca0b6b158df28c61474149d87cd904e65c SHA512 375c52847ee2791016371d8f2550813127c7f92f8a8920271c96e21b121dbf660ed89be3b0cc3548997fda2a3fff1c8fe938208037872c92440198775ddb4369
+EBUILD Tie-Hash-Method-0.20.0-r1.ebuild 311 BLAKE2B 4437b90966974ac8dbda317b24d30a2c07580c20d245b873ad9c972bdae9d7fe304287d83b730b7275a05914ac303f73fcb5242cdcd4e51fa621d5fcb5d8369e SHA512 d4518880b812a4e78427af8b5121c42f97265a172f8ff5b38c631c7d1e4ea084be99149494b01bf7691b3171d234c48cc66ae00f35d86bf3e3936df0b726e444
 MISC metadata.xml 392 BLAKE2B edad382538758e66d4d140754326f0ab46bfd72901936f7620f61a0b7600f647c8d8be178f2d5c64707db588ed76e091896a8fba6fb7cdb24cce223a6a7fca51 SHA512 1958a530a5d135fbe2376d6f5437797865ea314f6c44d0c532042ebf1ae2e9bd15f90b7a598ad1d85d613ad3356c4e83e1aed1411c6f696cc7306c026ce0a6fd
diff --git a/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0-r1.ebuild b/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..87411175d04a
--- /dev/null
+++ b/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=YVES
+DIST_VERSION=0.02
+
+inherit perl-module
+
+DESCRIPTION="Tied hash with specific methods overriden by callbacks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-perl/Test-Pod )"
diff --git a/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild b/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild
deleted file mode 100644
index 3dcf96411875..000000000000
--- a/dev-perl/Tie-Hash-Method/Tie-Hash-Method-0.20.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=YVES
-MODULE_VERSION=0.02
-
-inherit perl-module
-
-DESCRIPTION="Tied hash with specific methods overriden by callbacks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-perl/Test-Pod )"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Tie-IxHash/Manifest b/dev-perl/Tie-IxHash/Manifest
index 5083786e9ded..a99c9fdfe148 100644
--- a/dev-perl/Tie-IxHash/Manifest
+++ b/dev-perl/Tie-IxHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-IxHash-1.23.tar.gz 9352 BLAKE2B 79b8305b438dc54b899e4d9bfe031e858d7a49daf4ac3249af3a12f4d46e4d535776ef77390e02c78e0a091cfec57e7a02110aaf7eb818b111151d37f191b9b9 SHA512 13e5015cf4e11e3ba828279a5090704b8e4bed26a04e1f486a9d3a63c41eaf38d54d233b20ef5d1886b56e857208c229fd145c4c676b681e3e9c1ed3c252f195
-EBUILD Tie-IxHash-1.230.0.ebuild 619 BLAKE2B 29234d2db4df4fe289660468ee3fed78163233737e157cd20c47d13cbb931d1796833ef1e030ed4d93b2caa6b0fd77e5fd5b8ba184afb6746d4819603376bd09 SHA512 74b68816d9c23c2455df1cc54536ca8e9c6989a0486850e4564f65c12e32942cd9ddf072ac02d1b021cc659ca0ceb3edd8c131b0240ed35362a75a1cb54f2e94
+EBUILD Tie-IxHash-1.230.0-r1.ebuild 564 BLAKE2B b18ec149d941d7f7c576fcd55a719d56f35bbcfb1a827d692cd08b70548160b6b1829aa8c60503b07a1152abd4017c48509d44c2b71f6825b16937aeab6f0916 SHA512 d119cafb92df60de5427dcb2b5780fd316800f4e9e6ac4dd253cbf3d2b554af10c706a3fe823fcb44c96787fdef469310929c80c560e43aceddd4514eb19d7a9
 MISC metadata.xml 393 BLAKE2B 854ac93da0dbb92dbcc791d2616d5c7862fcfff0502593750eebd1dc054f0d3f4b6cfef296f496b4be51bd84d9fe2d2d06cfdf92dbc511fd77bb2b460a7604dc SHA512 7b84ee6a42abed7e9d2dc542ef1acfe56285a5359bc70395277029945633d74567751de888fbc778b81c2db6f1c484c1df2da964d52a9199fb0694d63a14c12d
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild
new file mode 100644
index 000000000000..101548e3087e
--- /dev/null
+++ b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHORNY
+DIST_VERSION=1.23
+inherit perl-module
+
+DESCRIPTION="Ordered associative arrays 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"
+
+RDEPEND=""
+BDEPEND="
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
deleted file mode 100644
index d0b13e4957c3..000000000000
--- a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CHORNY
-MODULE_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Ordered associative arrays 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Tie-LLHash/Manifest b/dev-perl/Tie-LLHash/Manifest
index ff39a2f67cdb..e7c537287c0f 100644
--- a/dev-perl/Tie-LLHash/Manifest
+++ b/dev-perl/Tie-LLHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-LLHash-1.004.tar.gz 13897 BLAKE2B d5f0c62bcb6a84f4cef4a1b371996eeee1e678148ba7f43c8b6acea55b0ff4e09120107a3b47a22ef9bcada62a02183bf9b7942dd6061e1b308f39baf84bd730 SHA512 1fd1f6a6d5696040c27c94a07c389f8c523253fe84ccbdaf7b88e1f6908299360a321af92cc7665224aa1d9d27a3f3452a9d8761113936d11ef2564d7e8003c8
-EBUILD Tie-LLHash-1.4.0.ebuild 524 BLAKE2B 586671ed6df2f58e7e581a4141fee35a415b8eff27af4da286c43dee94431cd68e37dce12e2d0af946dea1466e7e31bdeb398375d9e4dc7f2aa039f9a6123d19 SHA512 59434820257546a1b18978c851ef513c1b19353ff1da6b617fa22e3bd47cb9658a072212352222be0d15772d3a606f462d56c3db0af93c4bcaec0f3e2537ded8
+EBUILD Tie-LLHash-1.4.0-r1.ebuild 487 BLAKE2B fc150504b9d9aaea00d404eb543cd9dcd421fdc6adc578bf1ed66dfebb21f7f5dfe74f56705772c1bf4bdc37e1a4cedd7294cc96f8f40cf8fb8b5b290761fd67 SHA512 349c67ace4808848dfb59139d19f2c233f75b4afe0435f27d254b99608eaacec1551240b4d2a397800245a02fa17b04ce2221e452c5b543895108105b32e48b0
 MISC metadata.xml 393 BLAKE2B 71386214e05ecd2d38b7ed389aa19a94dfb35962c2c28e427c7b435e404cbaddd9a35d433dcde59e19c76a94f7a6121a13707fa23b320543f460598105212f6c SHA512 ac55789f633bff633ae631404050770d5be23bc58effbb8276e9b580437e4773b6763fe5d9b66838dd30cc555f4c89af09c86a35aab03c376e395c981dd02f48
diff --git a/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0-r1.ebuild b/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..d131f16a9ff7
--- /dev/null
+++ b/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=XAERXESS
+DIST_VERSION=1.004
+inherit perl-module
+
+DESCRIPTION="Implements an ordered hash-like object"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+
+RDEPEND="virtual/perl-Carp"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+src_test() {
+	perl_rm_files t/10_changes.t t/11_kwalitee.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0.ebuild b/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0.ebuild
deleted file mode 100644
index ff4eb3222c9d..000000000000
--- a/dev-perl/Tie-LLHash/Tie-LLHash-1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=XAERXESS
-DIST_VERSION=1.004
-inherit perl-module
-
-DESCRIPTION="Implements an ordered hash-like object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-Carp"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
-src_test() {
-	perl_rm_files t/10_changes.t t/11_kwalitee.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Tie-ShadowHash/Manifest b/dev-perl/Tie-ShadowHash/Manifest
index c25959d74253..5e1217947c00 100644
--- a/dev-perl/Tie-ShadowHash/Manifest
+++ b/dev-perl/Tie-ShadowHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-ShadowHash-1.00.tar.gz 12211 BLAKE2B 656b86fc830b3c12385bce7132e403bc98094f3bef4cbca5b0f252985c6c9a75d52f4c57cc97657b3eb6c8448b30cf301d849c7e095deff2ad26523866040f40 SHA512 238998f081ad0afde4a45dd031920538ceba9152aee9be8a6c6bf3177442b7b01dd08a5330fe99eef0356fecc0b59bda69ba1f597114460f097cf031bfb3b7a8
-EBUILD Tie-ShadowHash-1.0.0-r1.ebuild 283 BLAKE2B 3a08b32fe70acaf826766ac4d1d13171ca4b58361e6ef53d90bf5871d9ade1bef60ee7ead8f92ffeda3806e750440767dceb92e9edb7419b5f978b4f98478eeb SHA512 85e050c0ada43a094184e5d86c9d40fbe1bf2cf7a675b4994f2212c89c74e4f34831887d18ebc35c3a156ea354693e44d83a2b84219087212f39bd695af76e71
+EBUILD Tie-ShadowHash-1.0.0-r2.ebuild 253 BLAKE2B 1b263903fd441900ca8598cd0df0fc3e70b9250b97fdab11de73817df877ce32dcc0b0f725773046150f2a6bfbfc2f1235ce03d45435b8e47193a26add3dbeca SHA512 752305137e877ec701678eb09ef44fcf56acebb13e101ba15259736a4e0ec1cf693e3f281162d19434487f7361dfcc4a6601704b20860a6ee72f707ac362d24e
 MISC metadata.xml 401 BLAKE2B 761183d9f992f51566ae88ad36daf8c26fd06142bee18d4f83f4847b55abd04efee8db3488a74d782e4008f561b3cf1f76acedf7cf6375ca22b72e4105c70038 SHA512 1d616fefe4e7f4fc043a8ce714c891eadd0c55c8220f82fe6f230395593ab4c257e4b135edceff6397a3c0bca62ab3ab33f5f4ba9930793b071aec749b0ff748
diff --git a/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.0-r1.ebuild b/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.0-r1.ebuild
deleted file mode 100644
index 0c5349008f65..000000000000
--- a/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.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=RRA
-MODULE_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Merge multiple data sources into a hash"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.0-r2.ebuild b/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..1fd56403b5e0
--- /dev/null
+++ b/dev-perl/Tie-ShadowHash/Tie-ShadowHash-1.0.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=RRA
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Merge multiple data sources into a hash"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-perl/Tie-Simple/Manifest b/dev-perl/Tie-Simple/Manifest
index bfc90a43e5f7..52be54850c34 100644
--- a/dev-perl/Tie-Simple/Manifest
+++ b/dev-perl/Tie-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Simple-1.04.tar.gz 13190 BLAKE2B 66a1090e76c6302f1ea2ab24ff349807db588a2f5f8837fb892cadd82ecf9c32d82f96d8caab0c95054d8763dc25d92db17e160e0f4ad93aa8b906fa29f48293 SHA512 24843a02565b525ff5ffbd362b1b746a3c576569c3e5c5fff5a0d543c2fbdbb4e1d6a6c45faeaff0a2721f2525996f21d46b7db88a40b49bc2541d0f99806ef2
-EBUILD Tie-Simple-1.40.0.ebuild 492 BLAKE2B da200ae5d728adcb34d6ad0581405f7138de00f71b32a2df0b151752d181835ed2a4d4f3504b1f5bc56580b67bc87693aea036e6c8c1ea0c1bcb4f9892d66ace SHA512 4ad24f0b32cd2945356cc0a0034bd09e93ce45cca606991cf27a8a5f46da4f792df95d4857793884e317f4f028d466610dbecde1d29b6a5c5bbfff0bf1d9778d
+EBUILD Tie-Simple-1.40.0-r1.ebuild 455 BLAKE2B b42862103a94b27ae5b3c1a0bb5ab568f2657c02436154084074aa7e33999b0d7d81a63d16d8ecf8a5297faa73f83efb44bd991ed5b5ca09721d6815137c9a96 SHA512 9d3e49323584c22043007b927c1edb2a928df9a5d0b4e81757990e2e2f74180d977b1c8ed7392b0531a3b1fa4e02d96ae15f00c4a54cefbf895f2ddbad949376
 MISC metadata.xml 718 BLAKE2B 8db90c30bb313a578c253ac4805c934f8c50bbb22dbe8abede5f78ed6c757c65557f4b3b9716cd6270176f030988b8e04d931693727a8da0a3d43a9c045568f0 SHA512 a21552775460dc3923df9c8bef181f90c5997baa255b77f7e2372d10e769c248d0fb17c1704f53d9d76a50871eda3b52e9c67886880cbbd20c3a4b4e89c22f50
diff --git a/dev-perl/Tie-Simple/Tie-Simple-1.40.0-r1.ebuild b/dev-perl/Tie-Simple/Tie-Simple-1.40.0-r1.ebuild
new file mode 100644
index 000000000000..263c6270c628
--- /dev/null
+++ b/dev-perl/Tie-Simple/Tie-Simple-1.40.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=HANENKAMP
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="Module for creating easier variable ties"
+
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/author-pod-{coverage,syntax}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Tie-Simple/Tie-Simple-1.40.0.ebuild b/dev-perl/Tie-Simple/Tie-Simple-1.40.0.ebuild
deleted file mode 100644
index 7bb0b5544a71..000000000000
--- a/dev-perl/Tie-Simple/Tie-Simple-1.40.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HANENKAMP
-DIST_VERSION=1.04
-inherit perl-module
-
-DESCRIPTION="Module for creating easier variable ties"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-src_test() {
-	perl_rm_files t/author-pod-{coverage,syntax}.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Tie-StrictHash/Manifest b/dev-perl/Tie-StrictHash/Manifest
index a065d507d3e5..de6ea3a43168 100644
--- a/dev-perl/Tie-StrictHash/Manifest
+++ b/dev-perl/Tie-StrictHash/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-StrictHash-1.0.tar.gz 4955 BLAKE2B 4f8918a0d807b269f039158762ef588ad7ba0885f8216f5c39b149b9f79d957f43abc66e4d64f36fc67b0c49a6d42394bec74a892d2c602c39eb0c54b4f9bb82 SHA512 038f089cc7a4ff8a88ae578391e54731cab1188f92d76cd5d10923b6c2092069afda599165fc637892a5cf3979fd4961092200bde8556a05db99a7d7c494f965
-EBUILD Tie-StrictHash-1.0.0-r1.ebuild 284 BLAKE2B bb6e56473dd1226d2384bfe38605374c823aa9fa490f787f0d5aee43a5ffa56ef8dfc3a9a26f8de74ff5b3a5310b7e0768c7c5ec464297fb86c25d3e4753926a SHA512 371fb21a13a77aca52f7a0ca8b4884f7420ca290ef3a343d29b25a5ef26cfdffcf8f39a45f57b4ec1a1e8dc2a7f71987ad2ed08ebcc4577f9932a6b542fb086c
+EBUILD Tie-StrictHash-1.0.0-r2.ebuild 254 BLAKE2B c7a0d0ba240f9c29c2e07b33d087a4e3a8d7ce879a2caf63c6b32d220472720727c46f3df276cdf9b7bbe78b2ce22cf4020e4082a2c86cbcb996f1547fe8e932 SHA512 e3e3f35554a91a754e5137ce0e5ea7c92b273056cb1724fca27caad2c7a3b88ffc4674d2b9d2397dae5de84558eaa8de80b24eab4b26e1ef37a4e238c3080f58
 MISC metadata.xml 401 BLAKE2B 0922f92c033df97989597d15c8d23ff8da76a8fae1dd54696f61d3327c0362782b29438277a5640eaee976d1676d1d3db3557c1d91396b5748163fd8ac5ccfb5 SHA512 fb044d8596e21830571b32e4afa9148fe12c70315b5ec25fa3c2dd89d5f805fecc4ac02c5e9d23889261f7d58ce649ef9387d7c9bed8fc3d2ba94e0ebeb5a172
diff --git a/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.0-r1.ebuild b/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.0-r1.ebuild
deleted file mode 100644
index abacdf4356ce..000000000000
--- a/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.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=KVAIL
-MODULE_VERSION=1.0
-inherit perl-module
-
-DESCRIPTION="A hash with strict-like semantics"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.0-r2.ebuild b/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..ad3dd2f80150
--- /dev/null
+++ b/dev-perl/Tie-StrictHash/Tie-StrictHash-1.0.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=KVAIL
+DIST_VERSION=1.0
+inherit perl-module
+
+DESCRIPTION="A hash with strict-like semantics"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 x86"
diff --git a/dev-perl/Tie-Sub/Manifest b/dev-perl/Tie-Sub/Manifest
index f6c6ead45c3a..60b46723953e 100644
--- a/dev-perl/Tie-Sub/Manifest
+++ b/dev-perl/Tie-Sub/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-Sub-1.001.tar.gz 8593 BLAKE2B 2979b9acaff0d0b8e6ce4f7825dbcbe4684f99c8bbdccb5d5a695b97e6fcdf85b1a94aa44e80cd8ef41f29bb3eab779fa5727338ce745427dcbbe615c0bb1fda SHA512 94d8121a6876c0a04fbdf6774c32a693e19538746a8124c75924da5ade977fcbe9adfb3ff752744be69c07cbef1bec5311a3c667e072c332dbcc9ea159d4d5b0
-EBUILD Tie-Sub-1.1.0-r1.ebuild 686 BLAKE2B da95b6796c68eb7367d1913b38d416e8c0abf4f62834f44683f597b4dcbbf8fa23800ad8f7414d892608beabaa4e57b8d429c2d50396ef7aff00295c5bffc76b SHA512 f599744086c2b3a72aabefcc6f5a4644eed5fd5a054dc143044f59078b5e7b59ae413d024bd6fd219e54ec7cad3319c863af168c264f66897f8f560cfcdf3dc5
+EBUILD Tie-Sub-1.1.0-r2.ebuild 630 BLAKE2B 7f6bd791ca554ae5305df5eccfac6b5e72d41a8e1f58ed12be37f4292a1f258066dc12128a0be945c2e6d2976bf2be62b599f7d63fbf2b0f7193653631a9bb15 SHA512 f19996e167c2050ddb137dc0d885181594b8e020172bb254a675da3328fe5d72b0bd7d31b8ed6923d29939f47a53f165fc61dbc202261737fc33ee992ed55899
 MISC metadata.xml 387 BLAKE2B 84f63eace756be92ea1cc10526a92ef102f19229dde9e44cd6f083444f4193d26832e1989cb1b07041e4d5c5bf9f9c19532203072e511055ffa5a49f8df715ac SHA512 d117d11c318e41ea9180d068b1cbb961cda674f3c56b0a1740be0dd45d126fb4f30d45d8687bef18f3afc0f26e2139e62fc6d10b9fbfc9c8b806009a646f2437
diff --git a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
deleted file mode 100644
index ac9b5da49c35..000000000000
--- a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=STEFFENW
-MODULE_VERSION=1.001
-inherit perl-module
-
-DESCRIPTION="Tying a subroutine, function or method to a hash"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Params-Validate"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-perl/Test-Differences-0.600.0
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-	)"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod.t t/pod_coverage.t t/perl_critic.t \
-		t/prereq_build.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..6879ca274be2
--- /dev/null
+++ b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=STEFFENW
+DIST_VERSION=1.001
+inherit perl-module
+
+DESCRIPTION="Tying a subroutine, function or method to a hash"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND="dev-perl/Params-Validate"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Differences-0.600.0
+		dev-perl/Test-NoWarnings
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/pod.t t/pod_coverage.t t/perl_critic.t \
+		t/prereq_build.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Tie-ToObject/Manifest b/dev-perl/Tie-ToObject/Manifest
index 5a537cc914d1..8ecfc933133a 100644
--- a/dev-perl/Tie-ToObject/Manifest
+++ b/dev-perl/Tie-ToObject/Manifest
@@ -1,3 +1,3 @@
 DIST Tie-ToObject-0.03.tar.gz 3018 BLAKE2B adb65ce5245e2a5a1bc517b5ed7420323f83e0b0b4a39e309a95a2019682c6005b0162d8c030794a8090c518112e21f4cf3f7a12a22eee35425ead5ea7eb4874 SHA512 b3d2060d35e943e9aae28159ec71c7a6f01f47aa2905f5a218fafda8b1eb9e9da52038471617effe9f513f882b02e59946ddddf522058221b9132970e78ec94f
-EBUILD Tie-ToObject-0.30.0-r1.ebuild 376 BLAKE2B 570424562fce7c126eb172ec1748fdf853f17ca1fc5317d3acb80a0e541661b84cfcd9f2979ae85c676b4574a95fc845eda0358afe35f8b46e4affa8d0bf2be2 SHA512 a33e7e3a527ddd84652064e0428c811810a99d7972a42cb0f4e9d53eaa07ad05569d5759f0f1e3ece3179ae5da48577e258da4d90ecfa7f88266e92100003002
+EBUILD Tie-ToObject-0.30.0-r2.ebuild 321 BLAKE2B c6ea446352e64da95185a07d0df72321cd5a5684c01501e93ec2edb4a31a51ef9bb39b494e760c48a2c54d9acd5d3232736e91d4d812c0aaec6db136ed47e519 SHA512 af9cfc9cfd57e8620b77717bcf0d412ac99bfc6c7334e383c9b0e2d2da6890967a73e6957df8da5b98450e3fd9572ce6a01d8407d1c400910d575eedef63996f
 MISC metadata.xml 397 BLAKE2B d72daba07203517e672e53db5398797cf2861e171c7834c5b3decd78d2a5650263b33f64e6e5c077b73fdffc45a640cb834e816e913bcfbfe810f40323d1f9c9 SHA512 1208e48a713cfd689ee98f7dcf0d1cf88fcbc75220bcedd9ffa7d9f44ef3dacff27aeb559eaad61821207f7ef951b4bc82e093fb0bb971f8f0b3de9695952b65
diff --git a/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild b/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
deleted file mode 100644
index 932beefc42c4..000000000000
--- a/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=NUFFIN
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Tie to an existing object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( >=virtual/perl-Test-Simple-1.1.10 )"
-
-SRC_TEST=do
diff --git a/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r2.ebuild b/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..62e580495107
--- /dev/null
+++ b/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NUFFIN
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Tie to an existing object"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND=""
+BDEPEND="test? ( >=virtual/perl-Test-Simple-1.1.10 )"
diff --git a/dev-perl/Time-Duration-Parse/Manifest b/dev-perl/Time-Duration-Parse/Manifest
index 0611fcc466ab..e95137323202 100644
--- a/dev-perl/Time-Duration-Parse/Manifest
+++ b/dev-perl/Time-Duration-Parse/Manifest
@@ -1,3 +1,5 @@
 DIST Time-Duration-Parse-0.13.tar.gz 11604 BLAKE2B 91b8ff89b64144c0f2723b2f5b9fa17287063e396d5e7a58a068f8171fb5a57a2717685ccd6e7229161fdeee34bf77a294cff362cee75c7bf81c4f57535de402 SHA512 2732f6053dbc672d92a4efddab6e767f81bf1386f7b232fe1d1debe551d406b27c222c2173f9771f302bb928dac96edeb1ef3dfd0fe67d46315f671c7ad1a5b4
+DIST Time-Duration-Parse-0.16.tar.gz 11810 BLAKE2B e66f31464f0a9abb5eac4e89260cf3988eead5e85bb18dde1f3dfda06357812e9fa94bc321b0257ac0741e4158b358ef8c74c5520202fb9c034e1caa09af6eda SHA512 947c7ce0a1a013c86b3c9e464e4c56bb0cc98572c3854d9b6ab33e8dac2270982b72efcd5e2601490e5a23104543ac343033f06294eb88282d0473378117faed
 EBUILD Time-Duration-Parse-0.130.0.ebuild 482 BLAKE2B 9771ccb379b6d8591c8d53d79c3e9390c8febad78b7d9b2bd76c59bc05706d6cc7bcb9ffa60b50b7a1056ebd07bb5960c8611d36abbe9b4a1f89e7b8f3898701 SHA512 0ca202561599dc3d6b96eacf619df2999477686a57d55296e6e911adf15fa7b32375c7e998760df341349467ab7e1b116552dbf2fb500377d18a2f9c31477d9b
+EBUILD Time-Duration-Parse-0.160.0.ebuild 444 BLAKE2B 0008bcf23634b4ecb409971d4395f6c466f156885c33cf9bcbb6461e86752d361d305bd3fa4fd70095c034606dcbc87188ad2ae4c456edf4768f64ae88c96ee1 SHA512 33e99fc64e69ee81e3ae07da028ddef8d853722d23543d893d53f1bc99d1143c2f37e4d7581231c4c181a50c93b30b54fa2b7c12f1968f9ace19ec96e8b67839
 MISC metadata.xml 412 BLAKE2B 949b1c6de9b8c291f639b1cd6f3f7fc74334389e0005a54dbb947a502d5869f225639466b87a909590496a0e40378ca7a0ef820e0e4a775a2af83be83492c26f SHA512 8d3f28a92bcaa365e26cb9e10b257b528bfde3c6998f1145bc25b79bd2939e775b0e0cc786ce7cc5181be6f1c73154faf978f421477a8eb91aa2fbb215d66968
diff --git a/dev-perl/Time-Duration-Parse/Time-Duration-Parse-0.160.0.ebuild b/dev-perl/Time-Duration-Parse/Time-Duration-Parse-0.160.0.ebuild
new file mode 100644
index 000000000000..a93a47e6ddaa
--- /dev/null
+++ b/dev-perl/Time-Duration-Parse/Time-Duration-Parse-0.160.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=NEILB
+DIST_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Parse string that represents time duration"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Time-Duration
+	)
+"
diff --git a/dev-perl/Time-Duration/Manifest b/dev-perl/Time-Duration/Manifest
index 982266330396..4d8d06cddc58 100644
--- a/dev-perl/Time-Duration/Manifest
+++ b/dev-perl/Time-Duration/Manifest
@@ -1,3 +1,5 @@
 DIST Time-Duration-1.20.tar.gz 15478 BLAKE2B f269d9667482712b952f5c29bc041efb9a85c0c8f93bb0ea6f0ab3cd0ced1259b41cfaaaad34146720b39863e3185c0d1f99fc3f0efe91f2a6e8db36d42ea390 SHA512 74bdcbc2b65061ad30540a95467de24f552235cea2367a7770309d9ffefeb35717f438e4f7ebf6a1d63f338cd714ffe16b3f45808514995db9753d643892d5f9
+DIST Time-Duration-1.21.tar.gz 16205 BLAKE2B a86d9bc6d2c8b8c91abb215bd28e50c1d0fe78101b554c345e4fda732e932f67bcd3d04199ce3855427d84ea1946f749aa49c599f02c9051caf733a932440093 SHA512 2d03d73096967265f16f4ebde2d9fbb83fce591e15fa01f5f4f750123f27a4571bbd01d5d93f785f78ee8810aca9d945241e6a767b65f45abb4608d321108020
 EBUILD Time-Duration-1.200.0.ebuild 585 BLAKE2B d9ee7cb3427041f3d252ced45f63dd7f14163971a4fa16d3b270bcb8b029e5cfbc9a55bcdfdaff6b887286ae5c41646e9b97e5c67909ac281e0ab96efe5099cf SHA512 e1ced896b22eb13501c9d2c4dbba1e29519f106e6bc897eb7f2e9ad323fe59eb12d7a270908beccb7e0938e247b4862979cb6d4dc67538c473aa5be9f37a4f26
+EBUILD Time-Duration-1.210.0.ebuild 557 BLAKE2B 6a2cd512badb6a71549fda9ac1561e30c617f6aa9b7619d62818c71896d3031f59eaba1a82845ea745b940f2bd089cfdd5d53813ff65f5572160899f068e358e SHA512 140e3021c5967fca70a9ff0c4bc4a0616f03e3ff6e1eae3d0502f9c2d653a54a1ee9d3f7a78e0900fcfc3a4e29a345558760ba5a951eec5ca6eecd91fa80a0af
 MISC metadata.xml 399 BLAKE2B 5564da9a45322a8807f113fdcb68aa2f91bf969ff65dca2455b946d6bd7d068e945b45873cbb45691911d4b769703d95209a27c710515d6e7f02deb365ffa258 SHA512 2c3fae970667f5e5868076caa54e9f335f08d1b9b4d7425a470d38e0e4cac5167e4dc42f11d7975b3d8d6880cc96e4a2265b80d6d779047467c2ae421d4c747a
diff --git a/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild b/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild
new file mode 100644
index 000000000000..dc85bbcb3d56
--- /dev/null
+++ b/dev-perl/Time-Duration/Time-Duration-1.210.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=NEILB
+DIST_VERSION=1.21
+inherit perl-module
+
+DESCRIPTION="Rounded or exact English expression of durations"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test )
+"
+
+src_test() {
+	perl_rm_files t/release-{02_pod,03_pod_cover}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Time-Format/Manifest b/dev-perl/Time-Format/Manifest
index 2fcd454ca815..18d110ec69e8 100644
--- a/dev-perl/Time-Format/Manifest
+++ b/dev-perl/Time-Format/Manifest
@@ -1,5 +1,7 @@
 AUX Time-Format-1.12-datetimetest.patch 3812 BLAKE2B c693ea0c8cdceb146e83117461e5eaa6c5f19132bc4a63d609c80d40e0a0dfce9388b3528eea559c8ddc422100cc40b0af28209eac0700dcaa368dbe1f9f984d SHA512 8bfbea3da6a97dd5e12a6f9286a96fe2390b01494d2cb321ee5a147b019e0308b386c16432b5578388a12c09674db249ffa5e5dad76fa85f38e7129dedce6b1f
 AUX Time-Format-1.12-nosig.patch 2507 BLAKE2B 86d417983c738e7c526ae78838a40bdf6a499a49e80c89269117014e1cb6b2e547e6a56e7c99b35fe318db55f56116f846104402c99f51ec2c2c68d5efe5cc0a SHA512 13816577ba193d143da3f5b5174f2500c4a529c042a03dda19453fb658c3f65cd12c7b53d062c8447fad58cadb60301eabaaef53c22afcf234b657b38031b662
 DIST Time-Format-1.12.tar.gz 38131 BLAKE2B 8d067752e119a8d1ade15dbb96db64ce5b66b435dd3753f5996611372c1d17cea602d92b7852a076acb8d4db16f430ce7a9463ffbef1291a5f20842bfc89fe87 SHA512 16640c5673f6a38768baf7affa8a7595dddee17a25913370cf9ed24fa6f7ad3458d0cab256e731e928ee0f40a072424e64c9c75046db85a5df6876f268f48c9d
+DIST Time-Format-1.16.tar.gz 47523 BLAKE2B ab843452a1268e0b8f82ef01b7863ff5b99bc6b5b3fe7b80c9ed6754cb914199556e0825f6fd9a020133bbb0a6213051fb8efca34fbed4bc7234dd47fef236fb SHA512 e58dbfd965c451f1fdecfe4b6b8673f76f6a313893012f6427a5dc1b585a43efc8f66aea764c71e2271a76253e8bb28043e9469d0c03fd6628896c66812bf09a
 EBUILD Time-Format-1.120.0-r1.ebuild 738 BLAKE2B f2e4d2f78c826ec09cbc11f09fa3ed272cb23226ebba9a35947bce5cc9a178ad5650b1cb4761c480051d668966b1cb3b144ed5cfe892311abc9405ebe6f46082 SHA512 2991011c1085a6a00cf7920b07b92bf26c49d7d93b8a5164e61dc5aae4dce80dba4f6199c002b0a3954df5ddfc84f9c6fea3dacd54f2269b690e857a43dd04ad
+EBUILD Time-Format-1.160.0.ebuild 607 BLAKE2B c67530243ef62623c22ece256bd8950166828a222c5627d591fb3b909d258fd47165953e543cc09a6ce898978e02b2dc70781f5a36b06ab70b1c047fbe6b4d30 SHA512 223aa74bd9fcbb21e7e925b7b53898a54958d0ab706da1f0bbf8a63b2f948361b2ced864064a8b279c24efcfe1dfcbdc4c55346244b8808b4bb9a816443b02b5
 MISC metadata.xml 467 BLAKE2B 0cba0f33ffb53660b0a959cb3d0c8b04a150b6ba46940b71e4e3c038c745b8bc8984dab9847760bf53694206725314632da5c24427831817ee9eb713bfcef894 SHA512 8a3b077260c78b3999d255029c65f0c6e49e9e2b61a787ef75e6d800b9643257e531dbbfeab8adcece9a9414c41e86745afcdb1230c454e4185842a6781b1e88
diff --git a/dev-perl/Time-Format/Time-Format-1.160.0.ebuild b/dev-perl/Time-Format/Time-Format-1.160.0.ebuild
new file mode 100644
index 000000000000..542a6e09cff5
--- /dev/null
+++ b/dev-perl/Time-Format/Time-Format-1.160.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ROODE
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Easy-to-use date/time formatting"
+LICENSE="Time-Format"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Date-Manip
+	>=virtual/perl-Time-Local-1.70.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? ( >=virtual/perl-Test-Simple-0.400.0 )
+"
+
+PERL_RM_FILES=( "t/0-signature.t" "SIGNATURE" )
+
+src_configure() {
+	export TZ=UTC # https://rt.cpan.org/Public/Bug/Display.html?id=85001
+	perl-module_src_configure
+}
diff --git a/dev-perl/Time-Moment/Manifest b/dev-perl/Time-Moment/Manifest
index 745d08723e4e..b62fa6e626e8 100644
--- a/dev-perl/Time-Moment/Manifest
+++ b/dev-perl/Time-Moment/Manifest
@@ -1,4 +1,6 @@
 AUX 0.38-makefilepl.patch 1022 BLAKE2B 4159e439a46e32d40cb3e30c120f24dca4b5810d1bbf00483b97bdad0030397292dfe55025affd870171ad1b12810b536459fa60da2f3103104639273a2a6ec7 SHA512 9fe5f80e4ef5df83c9bc3108c76cdec6ffb2f13eaaecbe5dba13628072086d3278ec4338217b7dd5316a80f3b3a63dfdfa6f23913b20d1b83aec889e658f4c28
 DIST Time-Moment-0.43.tar.gz 158585 BLAKE2B 75a80c589b1ba3c874fc3ce78a54ffa0d28558460a671182361c59d064ed249dc654b0260bda017a26bb1a36423ab61884f4dbf7a6adc9e412df231f5cfc0f54 SHA512 b7aeb132b4a6dcd6b207e2a071e66ae703763bd800047906f41dc069f27f36f095f5c7037a5cb306c8da29fab53b6f763eda114bfb0838dca260bb416f9dd6ed
+DIST Time-Moment-0.44.tar.gz 159123 BLAKE2B 6bc7d235bc2418972b2e1fca28fc46cdff806ae8a3b36869c20afb09a37a92f733c67c9d7e8b157807762dd48f1927f0ce75676d03bfa651da5cd7e0ebd9e786 SHA512 637e33f7e6874185ddaa592e309737c0871e2651efacce03213a168002908a81f18be913e1df2709d9246f2a1dcb8eb1ed445365974542b0c6bcb5082867153e
 EBUILD Time-Moment-0.430.0.ebuild 724 BLAKE2B e5ea452a2c661babc513483f738e4f99fdd5e4b869c21cf1d2e70abc3921fca7b10cbbe4fd8ef29210ae56670f912b42ab6cc007407bd365f20eddaf18ecfdc7 SHA512 1c9d347154db133f36270fae1817044865357b7da38fced2678bc24436b7f3767ece830a52386823eb0144c32bae919e8bcaede34ce86484156ddebb413d6aa6
+EBUILD Time-Moment-0.440.0.ebuild 686 BLAKE2B 5f682fe29332c8dc13b167995cfbddc9f060038474b207e58a2e5ee63de3af77dd80b981bc0d97967a43611cb11dcf727dde80abac5182879833cb153564a908 SHA512 cf85744bd8889866fd434a93473db989f1d2a6d583c5c8cfaa4d5bc0f3e26404c5c3790c00633608aeeb71bbc95f6a0ba85e9a50306ee286b2cef697d6748b32
 MISC metadata.xml 451 BLAKE2B 6d51598d7b8bcbf81366a021798a126e27cb8f41331ea6b635b0174114d81b18232568abd1d4c13bd6aa6be442e3bf276110ada4999a5c01667d7876fb7e71ce SHA512 8918fefa56f4706a6f5fcd33d2cbcc02586b276679bd889fae10b779e956bd1468aa81d660f55418daaf059ec6c0099d409d150fdbc4605a34200967a3166f9b
diff --git a/dev-perl/Time-Moment/Time-Moment-0.440.0.ebuild b/dev-perl/Time-Moment/Time-Moment-0.440.0.ebuild
new file mode 100644
index 000000000000..063302b30f3b
--- /dev/null
+++ b/dev-perl/Time-Moment/Time-Moment-0.440.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHANSEN
+DIST_VERSION=0.44
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Represents a date and time of day with an offset from UTC"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/0.38-makefilepl.patch"
+)
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Time-HiRes
+	>=virtual/perl-XSLoader-0.20.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	>=virtual/perl-ExtUtils-ParseXS-3.180.0
+	test? (
+		>=dev-perl/Test-Fatal-0.6.0
+		>=dev-perl/Test-Number-Delta-1.60.0
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Time-Monotonic/Manifest b/dev-perl/Time-Monotonic/Manifest
index e6b181ef3546..ab36a5c3a32c 100644
--- a/dev-perl/Time-Monotonic/Manifest
+++ b/dev-perl/Time-Monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Monotonic-v0.9.8.tar.gz 72024 BLAKE2B 292d244053a8b7aabc1cca775f468025f73e406bb93b8d800dd3937c904c97224417767eb9e560b1f49e7ff95e2dbe3c70f0bd3e3918f0aafcfbef2305903ad0 SHA512 5022d141e9ef7c58a5d1142ebdbe04592fd67eaa257e35a23d6e7f83386be100a0393b19863ff57a57a603da3acfb60652bf7fb9ee44fc04f1a97cf9bd6f2540
-EBUILD Time-Monotonic-0.9.8.ebuild 445 BLAKE2B 969439a79b2b90f1b65bb236e90f563e35bc16d8017e46c498b39c6481e8df27e7ff6f39a525906e962e3f7a73311bd5b050b17f317fdc6c3fc150e08f558dfd SHA512 6ed9aedb0fd74bb0ce201e4769df593ce9ec9cc575c57c2014b4a19383a4d51aefbac8f7052900ead63fae72345ddb5264829dd5bf4b4126709f2f5cc778c0bf
+EBUILD Time-Monotonic-0.9.8-r1.ebuild 407 BLAKE2B 9bb99ef7e0f44bac76702b702fcf33e50a8513828bc32a1ef0189525804f9e917d59f433f6d0dff7a96e8308c3135fbb8695690bee5ac316b92aa1b00e1ae6b0 SHA512 ca0ea5fa0df9215d8c6d8b4357e6df2736494fc2dbc1b63e934e001a9e50a2801a4eb88f69e5d14592aad4845a80197cff72ac18faba0a5772940b8eba5819ed
 MISC metadata.xml 401 BLAKE2B a5c3a807fe5da997ed4c771eb04a885944973f4e020523aaacd4b22de0a88a7cd566c4a542cb07d328cfacab21bedb53515435b1e9a95882011a90d2bb65945e SHA512 072067706b91b9e6d85ea3d7b862225e2d358ba3872106d34bba7938dd911eb4d8188aae3bd61ee0229637ca13567e6fe8305966d9a066e84fac085e361ed7c7
diff --git a/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8-r1.ebuild b/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..e8c2149728a0
--- /dev/null
+++ b/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8-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=DAVID
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="A clock source that only increments and never jumps"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.400
+	virtual/perl-ExtUtils-CBuilder
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8.ebuild b/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8.ebuild
deleted file mode 100644
index 3932193dd3dc..000000000000
--- a/dev-perl/Time-Monotonic/Time-Monotonic-0.9.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAVID
-DIST_VERSION=v${PV}
-inherit perl-module
-
-DESCRIPTION="A clock source that only increments and never jumps"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.360.400
-	virtual/perl-ExtUtils-CBuilder
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Time-Out/Manifest b/dev-perl/Time-Out/Manifest
index b90eb8bacbd9..7d139b84bdde 100644
--- a/dev-perl/Time-Out/Manifest
+++ b/dev-perl/Time-Out/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Out-0.11.tar.gz 3647 BLAKE2B a4dc5da38db1f5f42da8235e083d7b6214ed5b0e565a0cef50ff38c2ae6213ef999e50f9c97ebfcd457dcc39c6a131657cf21ea3619ca1277ab4c2a34b5238ee SHA512 707f113bf3d6c607f8e945d0bd89e9b035eebd7df79e3d8f62eea9e344bebfdce7d9165bfaf20c6267e68e3503c673077cec0823a7b2f139c24effd2e6cecd0a
-EBUILD Time-Out-0.110.0-r1.ebuild 360 BLAKE2B 58f0353326899900c8a211c4a0f2f1a3159dd2a395c031f3a2b3d43e4ffa247e523176578c72a2472bb61d4dceada2f71cb4d3a8e673fbb826fc0fd3d314c690 SHA512 87e730c3af01d4a438805e528599c3e97830f407bcd7c5fde031486a950a16e12fbeacfb64cfe2bda137efc79645d6bb27d478294895614b9fc891c7625d637e
+EBUILD Time-Out-0.110.0-r2.ebuild 284 BLAKE2B 6f41a521acffe19d93779ea387da2427c2ec0cc987a6d1d566cd1d7b4df1df9b6410674c696ccd5c30325596a2f33f05f8619f336f0ced1bacfa07755fc33846 SHA512 b86eb64504349c1969d8aa5f53511504601d536d72040462c549ca207f30be9ef33d01ce4f2a2b40404d05ba2742830b887cebec53f4169ddc4aaba97f4b829c
 MISC metadata.xml 389 BLAKE2B 889d3a25b951ad10ff041bd2277712c6a9f0579cb1ce08e4e95cbab22949f381318a2ed1fb8444a436c86502572f38401945fc987f99f20e15c0ac0dfa335671 SHA512 ef203a0737aaafea627e73b9a137aedf2f3f819c09a8f62659b290a6d1f6ee733945777f8c84bda5f6acff6dc7dc5efcb841751f075863441c89b6fbf7b3006e
diff --git a/dev-perl/Time-Out/Time-Out-0.110.0-r1.ebuild b/dev-perl/Time-Out/Time-Out-0.110.0-r1.ebuild
deleted file mode 100644
index cf8e675074cd..000000000000
--- a/dev-perl/Time-Out/Time-Out-0.110.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PATL
-DIST_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Easily timeout long running operations"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Time-Out/Time-Out-0.110.0-r2.ebuild b/dev-perl/Time-Out/Time-Out-0.110.0-r2.ebuild
new file mode 100644
index 000000000000..380070ffddca
--- /dev/null
+++ b/dev-perl/Time-Out/Time-Out-0.110.0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PATL
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Easily timeout long running operations"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Time-ParseDate/Manifest b/dev-perl/Time-ParseDate/Manifest
index 89856bcd5213..76add9e58135 100644
--- a/dev-perl/Time-ParseDate/Manifest
+++ b/dev-perl/Time-ParseDate/Manifest
@@ -1,3 +1,3 @@
 DIST Time-ParseDate-2015.103.tar.gz 26644 BLAKE2B f00a5943b9ccee87272e04cf6259f69bec4e8e422256f9fac2fde072058aad34c6c2d408f41b2ad953a2e0af40ba85030586c50ea06cd97ff8c2a6d64b0f58ac SHA512 3c5bf09198289a889e606c806fbb225e729fa1a0af6d04056b75c4c61110e6135fce0eccd8c58a2f1db364d7d624b417f4960bdfa376d2fb9b16ecf090879fd0
-EBUILD Time-ParseDate-2015.103.0.ebuild 448 BLAKE2B 7a3e459154ecafb7462383e6a35714ab84bcf4cf0897da23aa617fd149eaf90ccdd6d297e2260bfb7988af84c313cd0d724ae8fe30b71382b2ab73aa4082f3fd SHA512 5490ced3e6727db4eb09641d086ae1bdcea8ee5e890d13905d7166d6f8a92cccb3c04fc10e6778e2dcfb7d5dab170d2a295e5cd27c31e0d8d39e573a73b6c054
+EBUILD Time-ParseDate-2015.103.0-r1.ebuild 409 BLAKE2B 85f891c5e60884651f0463f85aefd223b8554325771b4d24df7e3ec1469892e912f64a8a176ab4265767f22fb3d1f824487b42c625d65f9e6b660afc596316c7 SHA512 886ee09dcada156a6b5a23008043e44cf3e963114c7fe9cbf65d10973b086d2431cd464dce68d7a271588c013e8e250d7c5cf31c3c59128c6b34c8130e40495b
 MISC metadata.xml 646 BLAKE2B b8e895049bc57205232f3cc4aaaf14ccf8df0507239cd7014d76f362103f84ae181c50759f4bacb0790a337a1b0208b4072261d2a8e2de9253bd9b00c5d00514 SHA512 ce3cc9b295bf950d06da24fe3f0339c58e9e069005ced96406d04b852ffa1195111692255ecd8cc9bbe9d7b0e4cce2349bda80cfa2205502626a059a3db882ab
diff --git a/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0-r1.ebuild b/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0-r1.ebuild
new file mode 100644
index 000000000000..49c639387554
--- /dev/null
+++ b/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MUIR
+DIST_SECTION=modules
+DIST_VERSION=2015.103
+inherit perl-module
+
+DESCRIPTION="A Date/Time Parsing Perl Module"
+
+LICENSE="Time-modules public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND=""
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Time-Piece )
+"
diff --git a/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild b/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.0.ebuild
deleted file mode 100644
index f1c3ed1370c3..000000000000
--- a/dev-perl/Time-ParseDate/Time-ParseDate-2015.103.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=MUIR
-DIST_SECTION=modules
-DIST_VERSION=2015.103
-inherit perl-module
-
-DESCRIPTION="A Date/Time Parsing Perl Module"
-
-LICENSE="Time-modules public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Time-Piece )
-"
diff --git a/dev-perl/Time-Piece-MySQL/Manifest b/dev-perl/Time-Piece-MySQL/Manifest
index 31e01f09fce9..fa6daff008bc 100644
--- a/dev-perl/Time-Piece-MySQL/Manifest
+++ b/dev-perl/Time-Piece-MySQL/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Piece-MySQL-0.06.tar.gz 3870 BLAKE2B cbb9c54a02f2bb8b3b5ff4cf8c06e4beabb5f011de5c39d57e1315121a0a49075da6e0d80280a287a6e8e8fc734a905819031966d1d9dd50aa0431d651f644c0 SHA512 8f748b50a763dbe4b0a545d6bb96f9ccffa05da48461c0fac63e89ba6029856ac60b871264217b820408aefa2dd4fdcbba036f5ad6ad9281f6699e33003f36e4
-EBUILD Time-Piece-MySQL-0.60.0-r1.ebuild 361 BLAKE2B fef48873876f5b887371d4548933bd69bed5218da98777f245b7fa0a03867a4e5efa670c79e18d8150041781a56b9ea11cd919a4ced568559b2d20f78709f508 SHA512 0886d8656c2efca02aedb8167038e6ad300f1e1fbb5450aa37b971edb682f4ff5abd6969d444b7b69bb5b60316992d98d37e92bf91cdcb20eb8c2781c19f8c72
+EBUILD Time-Piece-MySQL-0.60.0-r2.ebuild 338 BLAKE2B 91cd2c6db83e85b0e1233ff603a6a5b5b3d2bca9c9789197b12582c97ac019adf882b45fa6e4730cd49308b648c58618c8d4e797fac700673d323dba04c18eb3 SHA512 66354614d584ab386d56a769cd69c198fa05c012be50c129f6a419187e8bc0198a9e63e7b00181f169d741b0e58426825a0d7241a477af7f7ebca721fca37aef
 MISC metadata.xml 464 BLAKE2B a0464fcbf4bc24a91a693b4caeeb256d442fdcadd55b04c96c1759bd5e22084967e21cbfd0d4c849db61aa04af4ba1b77e79ed2ff9da2e6d536e3121f0687307 SHA512 ac4afe845a38f2fc86c692386b61cc1497557ab8ea563ee483176751353ac2415a76b7a80af63f23ec1199d3f27318b0b02600478a7be152a3291e2d7b8dc459
diff --git a/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.0-r1.ebuild b/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.0-r1.ebuild
deleted file mode 100644
index 50bb0e513b32..000000000000
--- a/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KASEI
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="MySQL-specific functions for Time::Piece"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/perl-Time-Piece-1.15"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.0-r2.ebuild b/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..eeb639879139
--- /dev/null
+++ b/dev-perl/Time-Piece-MySQL/Time-Piece-MySQL-0.60.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=KASEI
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="MySQL-specific functions for Time::Piece"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+
+RDEPEND="
+	>=virtual/perl-Time-Piece-1.15
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Time-Stopwatch/Manifest b/dev-perl/Time-Stopwatch/Manifest
index d4f049d9c0a5..66676b5f87bf 100644
--- a/dev-perl/Time-Stopwatch/Manifest
+++ b/dev-perl/Time-Stopwatch/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Stopwatch-1.00.tar.gz 4026 BLAKE2B 7b34684418d3d646238b57d34193dc7523799b08b9ff0c663c08f64b2f486e59bd380a682b46a4830d3ca52b1aa168e360c6a06da249168aa3e074c5d4a55c9b SHA512 e2f43f5d9b207fef8b6f868c2e9192df9dd8652f158f32b5d3fa41c52547b7bd7cded9e41206ed47bbd7e231a87015c9daf4da6226ff36775a656ab7efa9ec9d
-EBUILD Time-Stopwatch-1.0.0.ebuild 357 BLAKE2B 9e8de237f897fc33bd568b5b5cd46cd205545544e57f56e886a5643b2a262316f67ccac1a6eb7e241209f9b46a4a26934277258ab954eff223de0b5a061e9d27 SHA512 a3799082186ff5568f781006d2e4c84fcf58fa6e86a8175e4c24b5d80cee4a027f55c0e52632dce1244559068eb2ae055be6b6b2a0d5156b5e38c53d694f2506
+EBUILD Time-Stopwatch-1.0.0-r1.ebuild 296 BLAKE2B c44ad684ea67b3e6be2d910faa849ae0c93396ada04e02cf0a4e8f704b94454f3845d61bac3ae6c13a3beee4e4b67e3546ef76c1fb0197306ab059a6dcb4f8ed SHA512 0752cebb9b334256c0746dfdbb578ed83a28f4c6e2c5f5adeb722c71238e08b9105190265b508b5134229b86d9334256c3cc91c0f74a9de7d6d742d44198fa98
 MISC metadata.xml 401 BLAKE2B 17c549d57fd6ce83ac031ed5247dd437049f7c96fd0515f7674f91fc55f723b1101e83ef024df3e31638bc45f9e1fce8693663ac3a3e99a503b1f264cc2f7fa8 SHA512 5fa2fc0ebbe952fd76157ea30aff4e887b03109ba933735c650c9431ad7d8e85e568ea75bc3393b17f6a60b9cf0aaebb3f0694d5a0b3aad2cde850300759d4f9
diff --git a/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0-r1.ebuild b/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..1a6dee2531b1
--- /dev/null
+++ b/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ILTZU
+DIST_VERSION=1.00
+
+inherit perl-module
+
+DESCRIPTION="Use tied scalars as timers"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+BDEPEND="test? ( virtual/perl-Time-HiRes )"
diff --git a/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0.ebuild b/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0.ebuild
deleted file mode 100644
index 028206a72cd8..000000000000
--- a/dev-perl/Time-Stopwatch/Time-Stopwatch-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="ILTZU"
-MODULE_VERSION="1.00"
-
-inherit perl-module
-
-DESCRIPTION="Use tied scalars as timers"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( virtual/perl-Time-HiRes )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Time-TAI64/Manifest b/dev-perl/Time-TAI64/Manifest
index f56d77d2111a..013410ccb979 100644
--- a/dev-perl/Time-TAI64/Manifest
+++ b/dev-perl/Time-TAI64/Manifest
@@ -1,3 +1,3 @@
 DIST Time-TAI64-2.11.tar.gz 5881 BLAKE2B 8879fe1f324ecd849423cb20c838f89a70e7b5d4943df1e814699d22b76ca6fd6f528659c70f0e9fc661884077ce041ad967fcac6b16bf5ec61011fd5e0eedfb SHA512 da3988cc0475c90a2fbf3867b9ec354d04b7d0cd4946597b5eb482b0a8335876bd0db9d49b607dc416d12ba119e72789aceebaa127c042c0a2ff40445e0d418e
-EBUILD Time-TAI64-2.110.0-r2.ebuild 422 BLAKE2B 90cb50f2c00b69ae8b8b9836f1392bb4d0fd188a98d17dcc33c9a419f13306085c55b88bcc471b8c3bc22dc9feedeea7222bf4a1ce12de04bf62549ce68e5f1f SHA512 16f99d6522cb4a81eec12244546a4b562ca6718f2e3433f0ed676039793941b90294d47682671592d4a1dd17e82448000a4748a9613f951efd4a6a24d0d97b83
+EBUILD Time-TAI64-2.110.0-r3.ebuild 384 BLAKE2B 528d124b83df27eaad2908f1bed2865362a37e34d2e7747d222670cd27cc585d8e4b3a96c502c1848068edf2db483627d09db21d73c3a442a30b75502781f148 SHA512 5af6203fcb13a9753ac3efb80181ea2231b7034de9bfb02057fb6fd7a3c54cee38288b11465aa491a4790565286f4932fcbd901a58a504cf891263a0f8945ad1
 MISC metadata.xml 393 BLAKE2B 04b90cc94a8d790743b7ef674d97687f6468262134ec308e2ae3c5387b3c15413fc5d0de4fb8e543aca5b8b4722ed3af43017edca14b72d8b9b15f9f76ba9100 SHA512 ad12e31b657f578e8f4c6e93383f5f9963bc4f9eac6ff06ebbc550bff57ff955778d9e7a7d679a3fdf7667b3e297f52b5f4c61df4dc5af4151462e0c5e4ce3e8
diff --git a/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r2.ebuild b/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r2.ebuild
deleted file mode 100644
index ee96c5b827d5..000000000000
--- a/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JOVAL
-DIST_VERSION=2.11
-inherit perl-module
-
-DESCRIPTION="Time manipulation in the TAI64* formats"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-		virtual/perl-Time-HiRes
-	)
-"
diff --git a/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r3.ebuild b/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r3.ebuild
new file mode 100644
index 000000000000..4e235c9f4a4b
--- /dev/null
+++ b/dev-perl/Time-TAI64/Time-TAI64-2.110.0-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JOVAL
+DIST_VERSION=2.11
+inherit perl-module
+
+DESCRIPTION="Time manipulation in the TAI64* formats"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=""
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)
+"
diff --git a/dev-perl/Time-TZOffset/Manifest b/dev-perl/Time-TZOffset/Manifest
index 0197dc09ec7e..9e8e90ded05f 100644
--- a/dev-perl/Time-TZOffset/Manifest
+++ b/dev-perl/Time-TZOffset/Manifest
@@ -1,3 +1,3 @@
 DIST Time-TZOffset-0.04.tar.gz 57220 BLAKE2B 63de5f39281e93c29dc0941f937edb8b064b73e931a6d6d72e28cbf2ee39d9ecbadac3e6982b24158ea9a956e3437cc51bc08da7a96de966234deee1edff8321 SHA512 d29b073cd75188324c1b8185e5e315822fc95d5130e58e59d627e0c4c97b506beb8bacbd8eaf2d75f84954dd478f4afc31630e6ad7e8665949cca6c54a8567a7
-EBUILD Time-TZOffset-0.40.0.ebuild 463 BLAKE2B afbf0d83fb911bf6640de64698749fc7b7695fe8aad2f6603f5ad7e859285c7fa471faa41ceb6ab8b8936ba5959f93b08251559cc9852135f99ed0f7879e90f0 SHA512 c3c384363bf2684ccbd6cda575e3d9a599ba078ac545a1d59d60da90110b676f8638d5aec21b1e1b2419afe2cb3095240da8f58b27862fc617d22d4d3c1326b8
+EBUILD Time-TZOffset-0.40.0-r1.ebuild 425 BLAKE2B a1977050b95459f6177afa8f1044c33b0a1bb0d516d014d2c208b5d60f804acb563afac5642ce72040a7a43e7b619fc11ff9469e39aece9b356457199291deeb SHA512 ba2942ad9625b10bec6b401d0b8ccbfc6bcf57f24f5ae83b261e561723d2b3ba621abc9696d58ef9b4fcc565da33bc4c27f3a008b642d349eda780b628109476
 MISC metadata.xml 399 BLAKE2B 2aed939dcd5337bbc274eb36fcb43d8c45925c5108ae27adcf6fab4567f4950ffd042adbf6f5e53b045e004e0da38306bde88d6214b824f3fa9b96686e0a794d SHA512 d56f98c7ed66cdd2baed1873b68c3fea470472962962f014154e55e0ff9e10c8bb3e557c882757d98804bf8f9caafed1da5f9533feb128fea8fed8ab03346cf4
diff --git a/dev-perl/Time-TZOffset/Time-TZOffset-0.40.0-r1.ebuild b/dev-perl/Time-TZOffset/Time-TZOffset-0.40.0-r1.ebuild
new file mode 100644
index 000000000000..43d43b95971f
--- /dev/null
+++ b/dev-perl/Time-TZOffset/Time-TZOffset-0.40.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=KAZEBURO
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Show timezone offset strings like +0900"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	virtual/perl-Time-Local
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? ( >=virtual/perl-Test-Simple-0.980.0 )
+"
diff --git a/dev-perl/Time-TZOffset/Time-TZOffset-0.40.0.ebuild b/dev-perl/Time-TZOffset/Time-TZOffset-0.40.0.ebuild
deleted file mode 100644
index 02158cb006f8..000000000000
--- a/dev-perl/Time-TZOffset/Time-TZOffset-0.40.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=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Show timezone offset strings like +0900"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	test? ( >=virtual/perl-Test-Simple-0.980.0 )
-"
diff --git a/dev-perl/TimeDate/Manifest b/dev-perl/TimeDate/Manifest
index b9f0b1d9c77c..37a8cb24df33 100644
--- a/dev-perl/TimeDate/Manifest
+++ b/dev-perl/TimeDate/Manifest
@@ -1,5 +1,3 @@
-DIST TimeDate-2.30.tar.gz 31109 BLAKE2B a2e1001bfa0b531d3e6ff263c021b3d1784959e2b99a7cc31d028b8ec86971296b13bd40878b0e21f8e9bf37880ce23a864b894d80a3b7bb2f9ca0bd8e4c4830 SHA512 c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221
 DIST TimeDate-2.33.tar.gz 29997 BLAKE2B 512f104f0b8431c413412dfef44768e1ea942fe528262c1f4dc7d7eea9240d4da1a8b662a603e9d04b392d62e38e9b1d7b60cc82b013215a16ed3c97ee66ab47 SHA512 a3a20a0d9439e68bf621c66fad0598e6257345727be79c87c7cc99994b3a58eb738787fedb720beb069e9758ad1347c15313f64411806dd0f4dfbcca5061c820
-EBUILD TimeDate-2.300.0.ebuild 440 BLAKE2B 3af7aabb90c102adf83e210cb7fc1ed5b18ab1d9144d1e99bda57c75e540e0b8fe2825994dd03317ddb7108a13e6a2bec2e8ebe776494e8ecd66a201e500eb74 SHA512 776817f703d3708db2d8d9c1b48e4a3c9756f631b875ef12577d958a9a026bc90d6d4e56e3195e7c65e8df55dcc00e073c9d755cf856221d0a1dc1ff54471622
-EBUILD TimeDate-2.330.0.ebuild 425 BLAKE2B 6add064136760b08d9f402b771826787879d279824e79e3b4bef70fae2fbf533e5227779deeed1098f76b48d7ada0967c861a93ddbf8ed2ca5a279f9e9eb0399 SHA512 7ca0e8bb2b31c2918bc4cfa2103e996bdf08bc25dad1cbaf864fd4b0d183e5801be35ebd4fda146fbb8f1906b53b244f8157203c8fc40d7ea970a2e45824dd2a
+EBUILD TimeDate-2.330.0-r1.ebuild 417 BLAKE2B d9aa27b51fa6c6635b74282657a826f99c9c3fde644c91acc44cf98ab3ab84e9d6de56ea36caefd7ea4676b88be0e2bc389900ff1870d492c346643a1b2efc6e SHA512 ecdb2ba07a5291706b229122f4cb1bdd7df0f0a6d9b548c5548bebd1c470ace5f8213f37276b8f8830a44054db89a3f6bc051eb039f220eca759f907ffe57fa5
 MISC metadata.xml 2976 BLAKE2B c80b626b2d6700ced8d8b962f46e35d4222622b9c8731f69ae7d16d5ea14a9a1d9477e5311189e604e2424465a2b34fb8c83048fb55707625797c10526eda576 SHA512 de3882af76b05022bf70cffdd90b906b3f1842dd7e1bf1d75f9409612581244df0677f6f831a37277e428e2ad9afe0e525780e07e5ce2096b0857031b0317ce7
diff --git a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
deleted file mode 100644
index 0bc0de9c024d..000000000000
--- a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GBARR
-MODULE_VERSION=2.30
-inherit perl-module
-
-DESCRIPTION="A Date/Time Parsing Perl Module"
-
-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"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild b/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild
new file mode 100644
index 000000000000..78809a3123cf
--- /dev/null
+++ b/dev-perl/TimeDate/TimeDate-2.330.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=ATOOMIC
+DIST_VERSION=2.33
+inherit perl-module
+
+DESCRIPTION="A Date/Time Parsing Perl Module"
+
+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"
diff --git a/dev-perl/TimeDate/TimeDate-2.330.0.ebuild b/dev-perl/TimeDate/TimeDate-2.330.0.ebuild
deleted file mode 100644
index 4877edc57519..000000000000
--- a/dev-perl/TimeDate/TimeDate-2.330.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ATOOMIC
-DIST_VERSION=2.33
-inherit perl-module
-
-DESCRIPTION="A Date/Time Parsing Perl Module"
-
-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"
-IUSE=""
diff --git a/dev-perl/Tk-CursorControl/Manifest b/dev-perl/Tk-CursorControl/Manifest
index bf493b1968ce..f0c25fae7f59 100644
--- a/dev-perl/Tk-CursorControl/Manifest
+++ b/dev-perl/Tk-CursorControl/Manifest
@@ -1,5 +1,4 @@
 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 528 BLAKE2B 8a3ae2bae1aad08bfe1f5d7e93e15b03fd2f8d75033887f86edba5dc6019026a813c756dd758eb089e234f069bd51b3c45649f68c885a08a652d87158e6af1a1 SHA512 cb38d21fe79bd96cc37b51c18bf2f25292c8529610655881aa355932befc8ce6aed443d7922fc3e5df365c6395fbd153c334d1a16f35f2e97cb962fbfc8fa858
+EBUILD Tk-CursorControl-0.400.0-r4.ebuild 522 BLAKE2B 9e744f0ffba012d83f11566752d443d7544e09acc39f3d1f136ce4a00d5589f843f61ae8bdf692048d93c7ad684ad439bc8e599044aedbc25418788fb5c0a16e SHA512 e4b96d53ab378c5c08b6a40ba2d36eac4f5c2d3e0d64c4993864495645f930882c74ca47ad2e7c61d573969159b47cee49535e37f657e7bb324bb46a639b3373
 MISC metadata.xml 405 BLAKE2B 4a93877c86833eee28dcbdcf0ff0f3522781cfd6867c142cf060f3a0fc39a922f614234626708a1e58e4dfdf4376f0492e6cd6aa08c9a9f2aa04828dd28a394e SHA512 fff3592882d7cd061ca031c8e179a8ec4f6f97e4d60a036838c0f4776b33f72d898dcb68256cf782e257cc922c1808b1733be110cb1af1a46f4c5120124e9fe6
diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r1.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r1.ebuild
deleted file mode 100644
index e35b486b88a3..000000000000
--- a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DUNNIGANJ
-MODULE_VERSION=0.4
-inherit edos2unix perl-module
-
-DESCRIPTION="Manipulate the mouse cursor programmatically"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Tk"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/0.4-demo.patch" )
-
-src_prepare() {
-	perl-module_src_prepare
-	edos2unix "${S}"/{CursorControl.pm,demos/cursor.pl}
-}
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
deleted file mode 100644
index bc9b56b19758..000000000000
--- a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DUNNIGANJ
-DIST_VERSION=0.4
-
-inherit edos2unix perl-module virtualx
-
-DESCRIPTION="Manipulate the mouse cursor programmatically"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Tk"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/0.4-demo.patch" )
-
-src_prepare() {
-	perl-module_src_prepare
-	edos2unix "${S}"/{CursorControl.pm,demos/cursor.pl}
-}
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r4.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r4.ebuild
new file mode 100644
index 000000000000..01fd2aff8215
--- /dev/null
+++ b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r4.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=DUNNIGANJ
+DIST_VERSION=0.4
+
+inherit edos2unix perl-module virtualx
+
+DESCRIPTION="Manipulate the mouse cursor programmatically"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 sparc x86"
+
+RDEPEND="dev-perl/Tk"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/0.4-demo.patch" )
+
+src_prepare() {
+	perl-module_src_prepare
+	edos2unix "${S}"/{CursorControl.pm,demos/cursor.pl}
+}
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Tk-JPEG-Lite/Manifest b/dev-perl/Tk-JPEG-Lite/Manifest
index 6d0f510fdc9a..01d45d62080b 100644
--- a/dev-perl/Tk-JPEG-Lite/Manifest
+++ b/dev-perl/Tk-JPEG-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST Tk-JPEG-Lite-2.015.tar.gz 21406 BLAKE2B a9499ef3a8fdec43d184e385885ca18926f70f972b47bc3871b15bf7660e22cd8477ee04c9eaa66548cf435055d283428134523cfd67c33f6bfb4a3e8667635d SHA512 959586f7cdfa516fc05eac352d626367fc5cf37f452713afea1d87e017f427c15c425a722e66db66d90dc98f942831e5437a4c8a2aac3179824105481a28c1a8
-EBUILD Tk-JPEG-Lite-2.15.0.ebuild 464 BLAKE2B ccf59a66ecf595819845117856f8cd62f15a76dee79b2bd4880d81b0da4b1f773d1e244154f233bd71afdd3d27aa0e637a3c4cf79742c930599f0c42bf1cb545 SHA512 6c12c473bf0f3d1e28a62b290652801f432e89369566b5af21780df1cbb0f1f567117f19c8b9d2a4523477afc13fb5487c997379ba679fbb0b11cc35bc499766
+EBUILD Tk-JPEG-Lite-2.15.0-r1.ebuild 457 BLAKE2B 73b9d110a16a08d558bbb9f0f04b77184f0f14de81699cde520d6bbbe9ee0a4ee08a66f329c85ec5515334591530fe081380174decbb8b634cbe270da2efb4b4 SHA512 39aafaabf681289c6fd35cfea8d2fdeb89777ee4285aa1c2f3f1d5e7089032d81a0ce6d0965053dae3f5481bfdafc1163a3856077f8ee5de6a25d5786df93555
 MISC metadata.xml 398 BLAKE2B 0de6aaa334daf932bde80cb087ae224617538fc608c066a81605f9f1a77a7481ef0750b44018f224d364fa645fb1a9bde956f5c97ec13612a66d18377bd3d0e0 SHA512 ff0e2b2683664d25ff1e5e75d63120d9973cd0c014966f5ea575573a8e26b6bc8077ccb3db0b5274a83e074a8d787c3c2b77e7defdf5dca02cf8a0e1a22ae9e5
diff --git a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild
new file mode 100644
index 000000000000..b1eb9cc75510
--- /dev/null
+++ b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.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=SREZIC
+DIST_VERSION=2.015
+inherit perl-module virtualx
+
+DESCRIPTION="lite JPEG loader for Tk::Photo"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+
+RDEPEND="virtual/jpeg:0
+	>=dev-perl/Tk-800.15.0"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.580.0
+	dev-perl/Devel-CheckLib
+"
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild
deleted file mode 100644
index 78bd6e685b90..000000000000
--- a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SREZIC
-DIST_VERSION=2.015
-inherit perl-module virtualx
-
-DESCRIPTION="lite JPEG loader for Tk::Photo"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/jpeg:0
-	>=dev-perl/Tk-800.15.0"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.580.0
-	dev-perl/Devel-CheckLib
-"
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index 646aba73e31d..505f7615d60c 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,6 +1,8 @@
 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
+DIST Tk-TableMatrix-1.26.tar.gz 410559 BLAKE2B d0a5763469b5abdd6eba92a6a3de05b1b07f7d09f851f6471d3953ef93b242e65be6bcbc00a72ff61c11a9b42b0cf10678c11efbbff91ca4cb209df9317a0874 SHA512 bd45e3c72e330de3722fe365989f6bd0bd938d72fad166c1a65a3667d07f8c10bf792742bf82a8154b43d3453a79e737788b0a4a288f318c370cc0c5fe94917f
 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
+EBUILD Tk-TableMatrix-1.260.0.ebuild 681 BLAKE2B 3b98186ade4ba57d738734239aab266b2cb7aace936a90c236e6008fe1484946df11ee090107fbcfc8f5a23a37901f0d88cb0a58ae1163685298fcb81dc3f02e SHA512 5a328e8a9d2ee35b7f00bbf64672a3adde278b9da959f2e439196e13935af5e478f39b23fc72bd1c7e6767cadfea788f3ca34f809d8b9dc99b60cc8fd0584d41
 MISC metadata.xml 559 BLAKE2B 992fe97c68e40e1fa7c68c07686375917197a8ee8c63867847765970e74d5820bb2dad84a3fddc5e0e44b851f51660397ef766202767fabf159d718daaf1852b SHA512 0fa6f4decc0d30c9aeba1209615de0ddc5e81a3e839ebae9d92ca6638f297ca8298e1c949f40b65c9889ef9909a742435a9ef75519f3e12b8747c952d817a85d
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
new file mode 100644
index 000000000000..e2f907a1aa24
--- /dev/null
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ASB
+DIST_VERSION=1.26
+inherit perl-module virtualx
+
+DESCRIPTION="Create and manipulate tables in Perl + Tk"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-perl/Tk-800.22.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+
+src_install() {
+	perl-module_src_install
+
+	# Clean out stray conflicting file - its generated by perl-tk already.
+	# Bug 169294
+	rm	"${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
+}
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Tree-DAG_Node/Manifest b/dev-perl/Tree-DAG_Node/Manifest
index a920df8a6dc4..ea274b25d794 100644
--- a/dev-perl/Tree-DAG_Node/Manifest
+++ b/dev-perl/Tree-DAG_Node/Manifest
@@ -1,3 +1,5 @@
 DIST Tree-DAG_Node-1.31.tgz 57977 BLAKE2B ba3646d62acebaeda634c3ecc50c9be60e9d47c4c213ef137b28c7e877a821f7f48cc4454e85e4b67e87c4bda925425d3763a7b737c4b21c96b719fc3b5ea78a SHA512 6821a146c55887a8973a8f61512805a3d209bb855f5b2f121cbac11a5fe685073019b958837289e781d1c294212c387bdb8434499712a39ab6b74f7ca2ccaa74
+DIST Tree-DAG_Node-1.32.tgz 54680 BLAKE2B 60dd9bb16883838edce7e34c3351d1a8bdf1f1fa5a264306e9652ab4015fb80f70bda8de033991fa5c0f813e900206d2ef7b70dd86fb53e337d1981ca6b0c8a6 SHA512 3ab6b48495abd09643555cf0160d00db39dc7ce576299b24eb4bc39e799ba478d88f863d8b2ec95853dc173e97c6efc3faff14e1d7c080f5166150f6fce2f817
 EBUILD Tree-DAG_Node-1.310.0.ebuild 641 BLAKE2B c73b8748e2cef0bfccd7db5ea54d2469b85eb570b4d4a612523c3be36b3aa8f404bf4ac4aef6f780ba4d0b86cc4369a0675df5db295d1a65620c0e9913a53514 SHA512 c2814651f0d2a654b424ab4a658bc0a16db6e4c4a72d446a434a5754e329314740d143b093b9814e3b246321af12205089a345ede149e694ef261406ffe4e0d0
+EBUILD Tree-DAG_Node-1.320.0.ebuild 609 BLAKE2B 5cce27b9ec3a6f3d0251f1dc5f89396f121e034de9f82d9983cbd89dde3463deaa4e8b232d835346444b2419c0f7579fac9f4b25c801cc02a4306a17a6d76ed6 SHA512 212bb1cf76bef13bf9a5cd531766a18aedbc76bcdb6f8452b9ced41a036020efb0edfaa981e9033b0f97d9fba6d19cac5ce9c3b9f503c8cfb39406f27f781aa4
 MISC metadata.xml 399 BLAKE2B 5d0ad3adec1920794107b9884194d7667e2673b27f65c0ac61df13ccea123072a3f4bf7cfba6865d4d715ad3829065a1422e1c541e8be4d6ec68debe1784608b SHA512 b57cad1b081105cadda179d5b9955f8278dda8a9c517aafbb6a3568f50a527fc8084a562c1c37635af1c735327a3d7ed62ccbb5fc48a14b01885dee02ee757c1
diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild
new file mode 100644
index 000000000000..854ea83f86fa
--- /dev/null
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.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=RSAVAGE
+DIST_A_EXT=tgz
+DIST_VERSION=1.32
+inherit perl-module
+
+DESCRIPTION="(Super)class for representing nodes in a tree"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/File-Slurp-Tiny-0.3.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-1.1.2
+		>=virtual/perl-File-Spec-3.400.0
+		>=virtual/perl-File-Temp-0.190.0
+	)
+"
diff --git a/dev-perl/Tree-Simple/Manifest b/dev-perl/Tree-Simple/Manifest
index 92963dd375fc..bebde35cd06a 100644
--- a/dev-perl/Tree-Simple/Manifest
+++ b/dev-perl/Tree-Simple/Manifest
@@ -1,3 +1,5 @@
 DIST Tree-Simple-1.33.tgz 50385 BLAKE2B 66b858c2b61efa2ac126ebd7cd8c657a5effc618e03e76c17ed54fc09f75776c6b0ffd5380bdfbfb2a59a29b3672b4f45716ff97a65519ec24b540632a5cdf67 SHA512 bec140fa723a8fadc65d2d8dc88c73295b346bc1583bfb031f2851cf80cddaea9b3e5e38225bbd7ac2e3e29006efb5bbac95b678090ba62714dfd6a306000b25
+DIST Tree-Simple-1.34.tgz 46813 BLAKE2B c35e237450b53532fc9ff56484a73b4efc3dab205fde32d5300479fbb20d6869918398516e85227412cc04522d25017621fd4254ad95c25e48a5790579ff9fe5 SHA512 cd03bdfd283d55a097bceb0c9bf3b81bb4dd5ca9a60de59e3e70b7e88b672456fd18d370f2dee1077a2afeecc973d42e78cc31f8023344b1f7e211432ef4e3ed
 EBUILD Tree-Simple-1.330.0.ebuild 540 BLAKE2B 05e3e086cbf2c9bf19eceb25469bc92f047d0077cf82823bd3f0a57791571c09d006a9d088cb19a3c7c4841b43201749e7fd697ff65fa705d3c81b065db6295c SHA512 681f683bfa243683440fb7c48f82915f8ae196d19d232e5d3fdf2dab6d1d4be912536ea0bb4fed97b265ef23dfe1642b50d2703d3f96441d5c013a6baa91439c
+EBUILD Tree-Simple-1.340.0.ebuild 511 BLAKE2B 8d5ed2f2b849169fc635824363d4bae8078af393f329e458acc3ed86258dc713323b4888ad1b7a44c9cfc6fb29c4e6287ddd7902e562ebb10341981d9aa045a6 SHA512 0393c8d42657c0411e820a56217cf6f5029404a80abb00bbb5046b75550353ef53e29a874c813bf5e6987dcf06e13deb02c0d38abc9e2e46e5be13e0070d13c1
 MISC metadata.xml 463 BLAKE2B 0acb03d02d10a77381cc0110ee3c73a1af0c430e6e8dffd63e735bb1ca4bbe9c7f6db0bbfadb30b233b9cad8a3d14b136560691da71e6dbfb7b4c54fa5d1761d SHA512 10cffbe6d37865585ef96e163d0027dbed41c5ab7166e75f82d2db98f9b373271e7b3d88b820df5f428445373ee3a49ff4c7dc94346f1a6223f61e3744211efd
diff --git a/dev-perl/Tree-Simple/Tree-Simple-1.340.0.ebuild b/dev-perl/Tree-Simple/Tree-Simple-1.340.0.ebuild
new file mode 100644
index 000000000000..0e06a45ef363
--- /dev/null
+++ b/dev-perl/Tree-Simple/Tree-Simple-1.340.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=RSAVAGE
+DIST_VERSION=1.34
+DIST_A_EXT=tgz
+inherit perl-module
+
+DESCRIPTION="A simple tree object"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=virtual/perl-Scalar-List-Utils-1.180.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( dev-perl/Test-Memory-Cycle )
+		>=dev-perl/Test-Exception-0.150.0
+		>=virtual/perl-Test-Simple-1.1.2
+	)
+"
diff --git a/dev-perl/Try-Tiny/Manifest b/dev-perl/Try-Tiny/Manifest
index e8e2215061fc..c08a43312e22 100644
--- a/dev-perl/Try-Tiny/Manifest
+++ b/dev-perl/Try-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Try-Tiny-0.30.tar.gz 34395 BLAKE2B 5f128ec532e9091e0987bf8b0b540c38158b49d37af42f72366151f25da722e12b746626a242d8a8f7755d243ee5fe0232d1828d4f94ddac0c70ad9334b8a6d1 SHA512 f523736ab0504ca0f7150be312e62988c4b9473a9e8469b0746dc8364945e2922c64c92e95e6c2b5792c5d6399dabea3d00aa45c065155b95519d5658a07216c
-EBUILD Try-Tiny-0.300.0.ebuild 923 BLAKE2B 14a94cbcc9758266216010a6d29cd3f6523053d62c9bc6798a440c692e099815accd07efe2ca69159ddaa637d1b0aa97bd662e19b1fd629b9fa120c453d03b5a SHA512 9d7cedcc271728489986b6174a11feea235a7a68c966d7a628e3c88e5aadbc4dfc55094ec4f56bfc57caea084c09506d9e9e7050b2f77cda9eb8549779489645
+EBUILD Try-Tiny-0.300.0-r1.ebuild 892 BLAKE2B 7d2ca722203a6f49a8e5278313457355d92c5ef8b88407633b0ab909c2206e51fcf2d3057d647a2b00e618bc3f2f0ac4eebafb4bc8bcf41796342682ddcebfa6 SHA512 faf40c2bb93e7dc185ec2c6d31e251b91ce6b68bfcb176378369fe37a154dae216cbea55d5d5e80f7e8eb558bf3363a0d7f01d5ef1dab2da6e9632a7ad74ab4c
 MISC metadata.xml 389 BLAKE2B 55e0319c1ca8a0b82a38f19c55f9cf913e1a2cbbb2c646a688aa99a0485ea9234c8aeb9414722ea51da795f845cbda129764c2ea4e5b7182cfb59ec33146ea47 SHA512 bd31ceee6aebb7798b36316a58abacb4b37feb9297c058737e2cf5614a4bd01c231434db3493fda56bd6527072ed9edf8625f543bc6ac92fb7c309567d497b14
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0-r1.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0-r1.ebuild
new file mode 100644
index 000000000000..fde11c5992e3
--- /dev/null
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.300.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.30
+inherit perl-module
+
+DESCRIPTION="Minimal try/catch with proper localization of \$@"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal"
+
+RDEPEND="
+	!<=dev-perl/Try-Tiny-Except-0.10.0
+	!minimal? (
+		|| ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name )
+	)
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+			>=dev-perl/Capture-Tiny-0.120.0
+		)
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		virtual/perl-if
+	)
+"
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
deleted file mode 100644
index 527071bca29d..000000000000
--- a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.30
-inherit perl-module
-
-DESCRIPTION="Minimal try/catch with proper localization of \$@"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<=dev-perl/Try-Tiny-Except-0.10.0
-	!minimal? (
-		|| ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name )
-	)
-	virtual/perl-Carp
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-			>=dev-perl/Capture-Tiny-0.120.0
-		)
-		virtual/perl-File-Spec
-		virtual/perl-Test-Simple
-		virtual/perl-if
-	)
-"
diff --git a/dev-perl/Type-Tie/Manifest b/dev-perl/Type-Tie/Manifest
index 92c6f363a274..d484d4c7fd50 100644
--- a/dev-perl/Type-Tie/Manifest
+++ b/dev-perl/Type-Tie/Manifest
@@ -1,3 +1,5 @@
 DIST Type-Tie-0.009.tar.gz 18579 BLAKE2B dc3d8c6b2fa753f14654dc92d8f662c1fbb242f8989b5ae6e1a32b4145bd7ebdd01fd7fcb11f81b4a966f32dd340deb4de0af72ae008fa4bdb13461c0255b0b2 SHA512 2c416cd22d1d4a7ec902470d0801d479a54f312d456982e51671ba7391d127297471f0f753df5cafef4b6e01c983cd9f8f69c99f03f571aad5c89036c642a6c6
+DIST Type-Tie-0.015.tar.gz 31402 BLAKE2B bcf63c60bd2ddcb56eea2ef67f7ae1f0c18b2d7108698bc18698869df5176b3fb1f72daa3e80a434cd4ba0cc4f1ab1e166d0f9fc85f8a8bbef3bf2a26d99d3ba SHA512 3772796ef7a1f5ce0dd9153f061aebdf5097f019b701c217bc296752d304e603b9e97785c02a55a91c18c68d3794a7e2b3f8515c92e7a2022fca628bac99d342
+EBUILD Type-Tie-0.15.0.ebuild 636 BLAKE2B 6dca0103acc28972ca0a9f4c4637abf8e45f25acee58779ee82231c3359b5ea47d172e0fc91beac1796305c9506261f925bd3f1df547bb7b0428b1944897c6f6 SHA512 971220af7a740db83db5e94ceadb2fc8e573920f7019b36d4f5a5b62d51e2cd5e27dec00c113d85b70af08c2e70d26123abad16a4243bd26dfa49b34734bc6ee
 EBUILD Type-Tie-0.9.0.ebuild 662 BLAKE2B bbdfcc18033c77a1a2712c7c82d7f92ad26b3de7e73391d3f43e1a12f59d240960a9e211e1420362e3c122560054c10ca1cb359a3279d9f0b8bf4dc8b8c4e9f3 SHA512 6bffdf2e3344ae2bebe7ead5225fbfe3af1335a68e31aa3c230b345527dfb0610abd7df107841cbf5a2cfe5059a988b0d69e7a1556495c9e775a375daa5fe8fa
 MISC metadata.xml 640 BLAKE2B c0731641fad1972679d1d753bfcf8ea0520fae3a4399ff148dd7262a7de0c682bcb68a4d5feae4cb95b4dfae1c0998f480566e92daf36aefdfd46938fd7fedeb SHA512 2c08a666957142d1132f7a5d0ba50dbb4a9ceaa42080f32e402924b26e35fa050528029803590fc0fae71d3fb2a1cf65ff0e8d0b94a1134ea5d950dfbb798056
diff --git a/dev-perl/Type-Tie/Type-Tie-0.15.0.ebuild b/dev-perl/Type-Tie/Type-Tie-0.15.0.ebuild
new file mode 100644
index 000000000000..9af258dbd325
--- /dev/null
+++ b/dev-perl/Type-Tie/Type-Tie-0.15.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=TOBYINK
+DIST_VERSION=0.015
+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"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? (
+		dev-perl/Hash-FieldHash
+	)
+	>=dev-perl/Exporter-Tiny-0.26.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		dev-perl/Test-Fatal
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Type-Tiny-XS/Manifest b/dev-perl/Type-Tiny-XS/Manifest
index eaa4cc6862a9..199b1c557016 100644
--- a/dev-perl/Type-Tiny-XS/Manifest
+++ b/dev-perl/Type-Tiny-XS/Manifest
@@ -1,5 +1,3 @@
-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 606 BLAKE2B ed32195dd79ff0198c8a44081d8c9462f7fd1487c4b2ed8d7de54f470d453434baf2006f4477f2d6c1e2d944032d567fdfe7f45033f797ba4b3beabdc359bcdf SHA512 a91412a1216a70697351bf0e7a34a15051a0f46152299d5b0240f7a90e336e3a40b792b74a9faa457379d564be7dfd4bff778568358bbf367b028fdbf98acf81
 EBUILD Type-Tiny-XS-0.22.0.ebuild 614 BLAKE2B 4895c160117b8c2cc23facfbab1933338a2e8895bcacb612914d31a092bccc9f8156c9f75de830b7d954c277078d76e5c73ad1056a9aeecfc84654f7b92d8ae2 SHA512 4742528549d869e04c4610746c2cba78a4522747bde1018065970b396a23751ce8ea3051f01332a1e9f05da4f1216ddbf56755b645d4a3afc1a1aa3f51317960
 MISC metadata.xml 451 BLAKE2B 9f868c1d91975ad15328d10729feee6f0f0d010e3f2f7aa1a72c0b5df570c902421ca4badae30163ebdf29d3985fe33018f5ac43a082703ffaca37831d9ced50 SHA512 5945d96f433ca131cca0f525d0957bc661946c4dfac3cb98929f2f2f335800d289028c65f0c11f954b286809512694b08dd6323c48ca1242cc3f1cf692314148
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
deleted file mode 100644
index 4903f787e909..000000000000
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOBYINK
-DIST_VERSION=0.012
-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"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? ( dev-perl/Type-Tiny )
-"
-DEPEND="
-	${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
-	test? (
-		>=virtual/perl-Test-Simple-0.920.0
-	)
-"
diff --git a/dev-perl/Type-Tiny/Manifest b/dev-perl/Type-Tiny/Manifest
index b8d9a90c388e..f11e7231dae5 100644
--- a/dev-perl/Type-Tiny/Manifest
+++ b/dev-perl/Type-Tiny/Manifest
@@ -1,5 +1,7 @@
 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 1007 BLAKE2B 150c2ac251e9856fe5441cf315d3b80f88bd2d9c7ecbf2de9f082a47fcf6c8c48661e1d0ca86aaad82d39c428cc007c7d419edf2b59080b24cf430bc5543c999 SHA512 e28a92a6ee03dd5108fb84f551fd4d4b35067cdbd86d05695a5a47cae9643cc91be9611b422b691789640215922708b9f5716e812375ce85612a011207d370af
+DIST Type-Tiny-1.012004.tar.gz 464170 BLAKE2B fab4788680f62b975a75be7d0d5c6878a1359af0e57b5a74d54bd506553d464a7b0bcee8faba50cb7a6dcef643ffeabdd91e54775be4724c75a12036b8f9dec8 SHA512 26b861f1e9caad5717f14eb0a6c71010f0306b614292fdc5ee95041ebdd2035ac6cfd4a6a186943479de630f3ff143914671111f5cec86bc4c08842cec30d2af
+EBUILD Type-Tiny-1.12.3.ebuild 1006 BLAKE2B f9117821ec1c9845a7f542b29f69bdeb98431255fd0f3ecedd5c4b69daa8d423478c8154c572d6b0164570b699b4154a18a6edf402b534a9db508eeea2f92a08 SHA512 30b9c7fdad942da6511cbc9eefc26489d30d0b34c4c36d37f74967db8df5a3fb78764c0322c7de04661a9f063c305983ecd6f9a81df9d374a11d0ba1dbd95509
+EBUILD Type-Tiny-1.12.4.ebuild 977 BLAKE2B 95cd00aac6c1035f338b01375540f86d791981f258c360f70f45675600ab59394d30f62d62ddb1ceb505bb54712ba0e90f68a2337c3db4b3dd2777016b571ba0 SHA512 74e3f33f43a0fbad37665ccc18c672d306dffaf16907a92cd7639282813400952801bca8023d3070e265b7b4fe5d9f7a3e207b3810fd9ce314de5179f6b40883
 EBUILD Type-Tiny-1.2.1.ebuild 996 BLAKE2B ba59ba7718d3f4b1e631f667663c34adbd7f683225d028d2aea1c912404753ab86fe67019096b211bf5dd6e5409bb20f2593f7ccbd0ee8f57c692362bbbe8754 SHA512 ec8e7141d39ddfd35333fce53b4a2736a23db750a8f366d39b96b986261740c887802cbf16562b8e179cdacb4d1389155befac08f2a16c55c732740b46aef9e0
 MISC metadata.xml 2673 BLAKE2B a2a28d7c968de4a77105e522db033d487acb5ef8e3a48ef5fc980e20abfa90f2b70927de76c5e3f65fe1f55319b5312ea903d9ba2001fea019240adf9f98b036 SHA512 eeaebaa46d78eaff6ecb06ea0f154270a5ff6b5117106d8fd8df01e9d7cd498661d51a98d54c15f4c6e716254a755a9d2fd2715f36f0bf66498ec3f45335ef72
diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
index 74a3cf7d2473..136395206d00 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="tiny, yet Moo(se)-compatible 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/Type-Tiny-1.12.4.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.12.4.ebuild
new file mode 100644
index 000000000000..0b3dd23ba638
--- /dev/null
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.12.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=1.012004
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="tiny, yet Moo(se)-compatible 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"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-perl/Kavorka-0.13.0
+	!<dev-perl/Types-ReadOnly-0.1.0
+	>=dev-perl/Exporter-Tiny-1.0.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.16.0
+	)
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	>=virtual/perl-CPAN-Meta-Requirements-2.0.0
+	test? (
+		dev-perl/Test-Warnings
+	)
+"
diff --git a/dev-perl/Types-Serialiser/Manifest b/dev-perl/Types-Serialiser/Manifest
index 214b2cad431f..435c936def23 100644
--- a/dev-perl/Types-Serialiser/Manifest
+++ b/dev-perl/Types-Serialiser/Manifest
@@ -1,3 +1,5 @@
 DIST Types-Serialiser-1.0.tar.gz 6238 BLAKE2B ec0dee2f4519605b1fbbdad832bbf2eced1f27005f6b84a4ed1c2f8d6b4ca898f0c2747f1c1986de78fe92f730cad7d93aa54ac56010e6146a9d699c54a3fe88 SHA512 b786bcd3ee976a6ad948cc98a9c71d2cdcd30f485528eff059091f6d86ae7078c10ba2dc2982326fcf0184dbfbdddea84daff324c6ec6a129fe6aac01253c8fb
+DIST Types-Serialiser-1.01.tar.gz 6549 BLAKE2B 3ee467031999bf77fe69395b203c4bf07e843eddc0a43387b9c58595e507056c5fafcaad8463d8e7d5e0d40385efa93d22d0e5a8aa2d167d712a2f72c00ea805 SHA512 419b24cae85fba045de2f4593e1d17784f2016d5f9cd9ea96d23bbeaa86c1c6b866875871a787cacba1299616d371cc8806760e4c53e4f635deec4bc28fa81b5
 EBUILD Types-Serialiser-1.0.0-r1.ebuild 539 BLAKE2B 863af579a4a7dc008663aaf8b2545c39d93521c861507d61ffca0645f0b94a12b8b5989fa2ebfb1d430b13afeeb015c2f21811d2ce291d97121155b26be74ffb SHA512 43a721bc70e0917637c9e06bc8eb513611aec4308dede95d8a6118d2d0c4d5783e8554bbb88cd660ac40dc8c035da44953b707e87640fcc5e2820b29e23d2d11
+EBUILD Types-Serialiser-1.10.0.ebuild 541 BLAKE2B 48ff9e4d749a70821ec47175ade66af4e0d0f15c199baa1675c1b8e3bfdfc042a8cdc92c6dd5414a5d33423adb2d5ec730cede00d0f4de8ea5ce44e4921308bd SHA512 abce53621da4da024e717e3b1a7d6b4cf4661b823be8f7a688fdf078c7b347f8c1416af29cf9d756ea17de573dcfe88df3f2cd8c7c7f7649d2b9dcda89d41309
 MISC metadata.xml 553 BLAKE2B 9f4ba2a559fb61ab4b38a218720819970e7b54d03e751d351c8c49634a50d7729773d414466c1258315d96daa952cfec2eed68dd81c5f7d208184e62b1d37ce9 SHA512 83f92426a22f3ac1eae21d3eef72b7b410d586e776ebc76934339cc2c9b76d6e9392612b111046e69ec466c855167d2a30b49597504367d58d5320e722c95d0b
diff --git a/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild b/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild
new file mode 100644
index 000000000000..1e41a17cc2bb
--- /dev/null
+++ b/dev-perl/Types-Serialiser/Types-Serialiser-1.10.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=MLEHMANN
+DIST_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="simple data types for common serialisation formats"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-perl/common-sense
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/UltraDNS/Manifest b/dev-perl/UltraDNS/Manifest
index 5eaeb6809c2b..5c5cd51d45bd 100644
--- a/dev-perl/UltraDNS/Manifest
+++ b/dev-perl/UltraDNS/Manifest
@@ -1,5 +1,5 @@
 AUX UltraDNS-0.06-dotinc.patch 1646 BLAKE2B 60e200bd9c33d57e9f8bf21e0aec00e7fa4872244266a358eb8b9b43e6c801c3998a579169e71d690027099d0e63feffca4129e231d46dcad9b1f532c8eb2650 SHA512 f3d66e22c14fd3d8767188fe2c7f19848857c537fb4d14bd672f6e641f1332b6f6d29f64fa48a8a5660c7116d8dc91ec79c7b48a4c59a870c9d7abb9029860dc
 AUX UltraDNS-0.06-nomkmethods.patch 451 BLAKE2B 97281087368ef80c3de13fefba3d9eaf63337dd71822900c9464042b66f4dc65733829551e874e607b526599bf981c9d96af6e9164df1d7343982ced66a408a9 SHA512 56f446b7fdf044cead2828bea23b1ce02f10a848751200da93f48e2203f92240b243e03b17138b6d6864bf9a658cffaa74d36f9f298ba6099b1bb06f1d8d9c86
 DIST UltraDNS-0.06.tar.gz 20972 BLAKE2B 28c2a7abb65417236ba8e775b9f615ed3cfcc50b98b32c4e05c03d5cc69fb3c19cb8ca4d39f802d27336786f06d5733b6f9d9baa6fc675b93fc20529b3e18c77 SHA512 93f46fc1fb770dc53b454c493814589dbfbe63ece44ea0bdc76520a194387fd5a3bf4f0262c58282e5224db412d90ee93ddd23950f6cde14cf9032d05e99e30a
-EBUILD UltraDNS-0.60.0-r2.ebuild 651 BLAKE2B 5470d77b84c684bec2a6e0d7f5837b5fae6350f97c1042cada41870ce5a5ed395467a7d3545f0e9f6960b538b282f57fe30edf947560140765ebbed433ad68df SHA512 a8c73bfb60c7cdd134f325813aa7351b7bee0a5030619395e961da4d6cb5cca6fa8b299776da280d3f40d1cc581169005dab47257c694632270f2241cedaf1cd
+EBUILD UltraDNS-0.60.0-r3.ebuild 645 BLAKE2B ec93f477fdc9965e5eedc723fb390cd4a4d81fb93804d7ce1daefcc0ecff57ec8cdfd7b3c43e165e33decd23a98b7de52c8cdd89e6cba776fd1b16dce0bd1eb9 SHA512 9da528597f02a3ec97ac52360529a27cf78ffa79837c2d74f4f35f14ecf74d75051933606215005a75996feed0562307bb10653a69e1d1006dd65c5001b052cb
 MISC metadata.xml 576 BLAKE2B 605c3d8b835413216f80faa4e454e055d5ca9c8a58650b103036627443836b0e33f152321d4e71c731821ed2387311178f9aa28c7137edf4a827d78e9937181a SHA512 cb1afe638b8835fcaae80a5fbbaa9b24ddabb41cdf98d5306f144e9e57e029fd3dcbeb4f4c962fbb9329b5a602d6cadcedc06eb212f1b34bd5bac79ad5a881cb
diff --git a/dev-perl/UltraDNS/UltraDNS-0.60.0-r2.ebuild b/dev-perl/UltraDNS/UltraDNS-0.60.0-r2.ebuild
deleted file mode 100644
index 638784a3ba8b..000000000000
--- a/dev-perl/UltraDNS/UltraDNS-0.60.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TIMB
-DIST_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Client API for the NeuStar UltraDNS Transaction Protocol"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/Net-SSLeay-1.350.0
-	dev-perl/Test-Exception
-	>=dev-perl/RPC-XML-0.640.0
-	dev-perl/XML-LibXML"
-RDEPEND="${DEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-0.06-dotinc.patch"
-	"${FILESDIR}/${PN}-0.06-nomkmethods.patch"
-)
-PERL_RM_FILES=("t/perlcritic.t" "t/perlcritic" "t/pod-coverage.t" "t/pod.t")
-mydoc="NUS_API_XML.errata"
diff --git a/dev-perl/UltraDNS/UltraDNS-0.60.0-r3.ebuild b/dev-perl/UltraDNS/UltraDNS-0.60.0-r3.ebuild
new file mode 100644
index 000000000000..f908f01918ff
--- /dev/null
+++ b/dev-perl/UltraDNS/UltraDNS-0.60.0-r3.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=TIMB
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Client API for the NeuStar UltraDNS Transaction Protocol"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-perl/Net-SSLeay-1.350.0
+	dev-perl/Test-Exception
+	>=dev-perl/RPC-XML-0.640.0
+	dev-perl/XML-LibXML"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.06-dotinc.patch"
+	"${FILESDIR}/${PN}-0.06-nomkmethods.patch"
+)
+
+PERL_RM_FILES=("t/perlcritic.t" "t/perlcritic" "t/pod-coverage.t" "t/pod.t")
+
+mydoc="NUS_API_XML.errata"
diff --git a/dev-perl/Unicode-EastAsianWidth/Manifest b/dev-perl/Unicode-EastAsianWidth/Manifest
index 1ef0c8eba166..dde1df8ba071 100644
--- a/dev-perl/Unicode-EastAsianWidth/Manifest
+++ b/dev-perl/Unicode-EastAsianWidth/Manifest
@@ -1,4 +1,6 @@
 AUX no-dot-inc.patch 602 BLAKE2B 2e2070b2620fd85118f643acc73ee5a5dc02a7c6bba52f0de734db65f021d125a2ab51f656af42ce2aeac071e380c1145a35c846dce31a2ce3b674812a21828c SHA512 fdad62c560595ec49f7de0dfd6f1f700abbfdc77053a016053573bb105251684ff4fcf8cf9fb534b2a2eeb5b38c21f089380876e3433fbbc47d0eabe9d542ec0
 DIST Unicode-EastAsianWidth-1.33.tar.gz 31498 BLAKE2B 1838e1447ad341ec711008ae0c2c48f27fd192ae32def73359e485010ad7d54e0907031a000a08dca0b15538f526851f554a3ee05a62145e87363ca74250b49f SHA512 c21e988f460534b370954d0448daec5bfb0a34ec816459f8422943ebe44ff17b5acb8a423d69daba81599111d7fa4aa33a3598e0ea4614eed25a587c1f5690eb
+DIST Unicode-EastAsianWidth-12.0.tar.gz 52302 BLAKE2B 0754158580de0a442e5ff6a9f3e0cf9d3765e1e5a7cd73a2c748ad003951b571bb71b38c8d92e6badb438e0eea377df9dd2e22ac9e14f9ea8c61672d0679481c SHA512 ec11d12b86d9e3676cf612c40f8e75ce1efdd302b5a6fe5d594306cffcf94f91855b5ee979f7646762605453d08d4b6b47f556e56f01b47d8ca1da8455dc138d
 EBUILD Unicode-EastAsianWidth-1.330.0-r1.ebuild 585 BLAKE2B b40a0106165c1cf72ecb1093ea3e2f0fd8387bde17f500362bd774ad1808e0f20b249d5e203cac577a21da29f64e5b52a22ccb87f7467a31c6b4f2d4e4622ee4 SHA512 a57cc22d7c3078ab4cd01518c36130eccab6483ce15385bf0978295271ba79682aafcbcdae5bff07aad530e1095c1c9bea6676902bd57ffe06ecd31d71c98eca
+EBUILD Unicode-EastAsianWidth-12.0.0.ebuild 531 BLAKE2B 5006d0bf61090c12000a9ab43fc10331f2d87465c6195d57892e4fefc76525a29cfd3d17aaa74e38eba50d664c7d5094a796c225d388c05b7866253f09737ced SHA512 70d3369e1eafa551b662e68b714fef478f9e41612329e755b4468e27b252b42f8394034d8d8ca6e393fe08fc2504faedfdc9aa4c6df26a8db706f720e862bb2a
 MISC metadata.xml 405 BLAKE2B 79ed052f6dc16aef901ab09f9daf30233dc386a2c6e0c418a516d60b1a248dd4ed6634dc8b0dc53f285f9fcc54e7a0630f552305ea11eb611d8f9a541c631e16 SHA512 2ef6f4f8c558e0726fa5a75feb20412f349e9fd203578972bf94cb74f6bfc6f8f64996c139226b7aa644ade6fc79b3fc670e30d4ef88b440d1f3584c07fcb25a
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild
new file mode 100644
index 000000000000..9248b4acf89f
--- /dev/null
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AUDREYT
+DIST_VERSION=12.0
+inherit perl-module
+
+DESCRIPTION="East Asian Width properties"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-File-Spec
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Unicode-LineBreak/Manifest b/dev-perl/Unicode-LineBreak/Manifest
index 65e196d1809a..5fce2b589b4f 100644
--- a/dev-perl/Unicode-LineBreak/Manifest
+++ b/dev-perl/Unicode-LineBreak/Manifest
@@ -1,6 +1,4 @@
 AUX Unicode-LineBreak-2017.004-dotinc.patch 4512 BLAKE2B e86fb471d296e642aedb25472c8ed7921293bc8beb5d560132ce5dfd7abfd5db2f5c17948f3384e328f760f318cf2f9ec2d2274d18fc371ad2a4b3ca3e88cd8b SHA512 e31fc9648c637d3ece712d71f8e3e1a35b949f554aeceb52b33bbf09831acd9541b044cedcc3fbb098701f542e9df60d567d49c4d2c4ef4bebe8c6e1a646c289
-DIST Unicode-LineBreak-2017.004.tar.gz 311366 BLAKE2B 7f4ff93365c0542ae1a8f9d17e0e9e20224b95949c4965e69f241ff949f625793a19bde4a81830f9f0214abe3d18fa6c52f43f9a04860ec4d13db55169d120f7 SHA512 f372174a761f87663761dc8b0f9bf387ffe289ba267fc0fb58353ac06dfa9418d4b0ac6e4e0d7833d842feacae4f8e90e521cd677ab22db1bf32e75f10f2e727
 DIST Unicode-LineBreak-2019.001.tar.gz 312225 BLAKE2B e7bf274fcba3603acf93f520493d67b2ff113b4e098da39c8f5f5a180bcc75f403f04ede5248b8598f8b991498de9c19766c29e3ee25eea12e82aeac1241194b SHA512 2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27
-EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 514 BLAKE2B 8084c18d035d929256ad0fa1d6d77ef8adb4353631ec103c3110256e26fea80562a1f69567664ef89083a8e9bb872bc5011ff442bab7f2752873f1511292e8d0 SHA512 9c99db2b0e4846eaf8219bf558b122469e6ca29ae8a20a64b01524fbe146a1ae98d02c60a6eee1335705be4471a1c27cf2a2991c47cd2626c206a7b4284258d6
 EBUILD Unicode-LineBreak-2019.1.0.ebuild 542 BLAKE2B 3e5eaf365ad0d1b5a4a6ba1669310ac6aa4970e1492ed27f49d8fb2b950d6646b715543425c7143989ee997da205357e1d26becaa162e1bd03ad91727edcda6e SHA512 002d4d9ead476283a213436c673b0ddcf179d6ac187f7b31b52f7f8b2e987824f4096ec9192d57425a44e2ab19bd1885a3d59ffcdc682dd421dfa3f7da2a95b8
 MISC metadata.xml 532 BLAKE2B bda481e25ddacb293c915635491e245bb1a41452d8eb74afaa9a2f1924cbf1a993df75dbe13125347da18060a74cc2ca525602a465965a370614d14e1ffe794f SHA512 720516db04a3d3bbaaa5b9a20656e6ffe2a41a10c103b31d03c3bbc70f983b98a4ca2a154ca40755f6b1dea0b8c22a601c3cb544e3923855db99b2c68fb2d0aa
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
deleted file mode 100644
index c48adc8648b4..000000000000
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=NEZUMI
-DIST_VERSION=2017.004
-
-inherit perl-module
-
-DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-perl/MIME-Charset
-	virtual/perl-Encode"
-DEPEND="${RDEPEND}"
-PATCHES=("${FILESDIR}/${PN}-2017.004-dotinc.patch")
-PERL_RM_FILES=("t/pod.t")
diff --git a/dev-perl/Unicode-Map/Manifest b/dev-perl/Unicode-Map/Manifest
index 098084be3dac..444f01850f1e 100644
--- a/dev-perl/Unicode-Map/Manifest
+++ b/dev-perl/Unicode-Map/Manifest
@@ -1,4 +1,4 @@
 AUX 0.112-no-scripts.patch 443 BLAKE2B 745c20741c58dc2d3ef964bf31b612fc93d752beb585d161988162e139b0476be9b15228fad68f4ee43e2da9e169bc5db938438ddafe0b4a3b5e83165f754fea SHA512 0cf99b32d0000fb105fee4e3df1205cf5402af3ad8229b58cefbca01e2acc58f36b681e80481d7e3b1abe77b6c40a60e652a18eb9e3a960238ea10f0d9c351d7
 DIST Unicode-Map-0.112.tar.gz 476116 BLAKE2B 2f59521fbd5b31d730f440f7e6d391269cc6a93894344378d7aa2245a2bee788c468d04fa9b04c79eadfdfc67a63311e6c7ca4bba97c89c26b0a86e692339936 SHA512 f66961ee84db7316289176cf43ddb8366ecfaf614130f8b1018931a92b96d16a97f231da6fdd1d8c1bd95ddd50f4b93d82ff87affbbd1162c894b1f302f27d4f
-EBUILD Unicode-Map-0.112.0-r1.ebuild 467 BLAKE2B ce5ca03f6685cfc8ec4b69fd7f01f43b0be68395be718449904aadc4079aacf89b81c3eda47de5da10c091c86f352b6f3069e9998e0c8411352a862689a69228 SHA512 47b50c7aef5ae418a2eef862bd1ecf645cf4eb7e7ccc44b0060569c812bbb4917af6644f075c0851cc17af0b69e1dd3cf81bdd3af96513a04f6c071e3409c64f
+EBUILD Unicode-Map-0.112.0-r2.ebuild 441 BLAKE2B 05ded2023fe24545f98672707efb2711b1cd99df9bfce0760c70441df371a0b8a0d0de3f1a248d04c1b9c64a0b042d5c05a12fb9ae1b476aae328bb96d257a93 SHA512 e3123b5eb04d644cd831cfd6854d93d3fb47a623bbcf6c3f00f31acf4c6f14946945f73acdad0acca7615a54695921b118a7b0b423f5d33c9cf2e40724ba78c0
 MISC metadata.xml 395 BLAKE2B ad7fc59a658ad98336917972b43c4b18302b26b5afbf9425870447ad2fcf497569e7d0223cf5983b8241c3b3d2ed04e88ed9ae7ff8d2986415d9b2905512a04a SHA512 4831e263d0363c124b3d07949eba6f1099e1b2295c6d1780e32ca123eb4faa8c5b9fe0fd32ee92187e70f21d9a533fc77c17be82a5c2b119e29c55c54a051131
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
deleted file mode 100644
index 93653ced65b1..000000000000
--- a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MSCHWARTZ
-MODULE_VERSION=0.112
-inherit perl-module
-
-DESCRIPTION="Map charsets from and to utf16 code"
-
-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 ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
-PATCHES=( "${FILESDIR}"/0.112-no-scripts.patch )
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
new file mode 100644
index 000000000000..ee16881da03b
--- /dev/null
+++ b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSCHWARTZ
+DIST_VERSION=0.112
+inherit perl-module
+
+DESCRIPTION="Map charsets from and to utf16 code"
+
+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 ~x86-solaris"
+
+PATCHES=( "${FILESDIR}"/0.112-no-scripts.patch )
diff --git a/dev-perl/WebService-MusicBrainz/Manifest b/dev-perl/WebService-MusicBrainz/Manifest
index b8f1fcde462c..2dc8aa52fbd5 100644
--- a/dev-perl/WebService-MusicBrainz/Manifest
+++ b/dev-perl/WebService-MusicBrainz/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.2-no-network-testing.patch 1965 BLAKE2B 29ff98e11459421b6820b5423a3430b36e4d0587809eb8bf41932cb2e871857ff518fa39ea9d9880109c7f6c9b20659d46004e9e4a5bd1a7ecd3bce8acdf85a7 SHA512 7e359eefe4836a49dd19e7f3685a22450bf6fe319190fdfb3a6a63b24af2c12c930fb4e9856c68e9a34663f0c9853cb556c7598a2033fa77c97e90d7c4d85a96
 DIST WebService-MusicBrainz-1.0.4.tar.gz 9937 BLAKE2B f57dc8edf4649bd1ee69d105cb6a1e885f695065f319e2537e1aa24a44560d19b2a947b98c2ad4fde0a965b93b3b3a9a562e6f6f6139d5694599e246735556d0 SHA512 91442fe4696a4f9ac1434cc9dc8d3a16d2e3a8ccd3434f5e4ac642ffba0d56db6583175283c0a1a75365cdc65dbb4516bfa6182be568de16767fba3676f2368b
-EBUILD WebService-MusicBrainz-1.0.4.ebuild 433 BLAKE2B cb262669c52412bb37cf4afc560f76c1531238a29dca9df548855c9aecd0c98ba54754cb7c4fe0db7e35e9f0f8988af1cae9109c0c6cb35255148a4c520dbb4b SHA512 610cd0e4009af3af80d1c69f0e51f755d2a9ffd8de77b11614c6d05408aa6a8561601cac5d773715c02fcd80ee96b7ea55e8e8cfb558910d670cc541360aac04
+EBUILD WebService-MusicBrainz-1.0.4.ebuild 437 BLAKE2B a64d4f352dc1eeea5483717d82b2bd570ed7ad26b66087fc76245b94146d364c3a27ebcde41f0d38dac040fb3a747e497491b9dc0ca5113a99521e5c62ec9b79 SHA512 997531cdaf3b4f396b46674e0e684f9fe1524091bc34adbab74f896fb11e7caeda94dbb6acdbfa2036f43c61142302a2061092d6913fc0ee7eec0f8fac04a7b2
 MISC metadata.xml 616 BLAKE2B c011d9576426a66f0b04bb9dcb5bd838a356c8252c50e21d58959d395df335324ec54653fa258ff44fb86dd2cbfc2e4b456231a0a3ebc128baf4c4479fbe29b6 SHA512 47658875ff2da5ac0c27bfe60a7cdd583e0c04631a80058f8a40a3712235e693bd7946a9c08da6690ce3d2d903b8ab5e39e28ab3f259b506c6ee6381abf3fded
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
index b1465e3f95ce..7d1b87b678c6 100644
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
+++ b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Web service API to MusicBrainz database"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
 RDEPEND="
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index f5fe0ef5548d..86995091e586 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -3,5 +3,5 @@ DIST libwww-perl-6.53.tar.gz 177561 BLAKE2B 254b9c7c02baf339d9d63c00c4cca229575e
 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 2017 BLAKE2B 942ae8e2018b8d7ecb0a7186833ec364a3304556ee52c9e02000f053262a4c582854dccc2c07cf984f5b39cef7985c1c83edb6823df58f3b4f8076cf4c04437f SHA512 5f12103a313d5fb37c853f353f2a0ee79421482d59223a4eaa174b18753c935aaceac4630221990a0b088608676d905ad013f2487e7bbf5cdbc38b0a96793c1d
-EBUILD libwww-perl-6.550.0.ebuild 1986 BLAKE2B 8e76f50cfa1cee4cb0d3d58e836739ec7f3c956794ac907d5cb05c4ef8608a47c3092720b66d7259ec5cb021c0c5769b04955dc8e159074cd70da562919a6795 SHA512 0f1bdfc6e6a366a12122c6039912d01429c73e127525b11f847912831bcad50fd32cbd4068623847d2a9af68f7440a37ba3bebb8098ad0528115983d2ca059fe
+EBUILD libwww-perl-6.550.0.ebuild 1992 BLAKE2B 0445acf640ad3204f59e88d03d26e28c1090e056198be3d654d2b815192be6896151fac5ee5d3dfd084b7cd61463fa76d0949159bcd3f718eacc1fbb36a962e9 SHA512 eaede1f4cdd478b48a7cdca7720a1f0b47cede2c7bbe0ce0a75809cae0fc5c27a086d0b6b09899926ead5de517e7f7bff8eed8d06bbce269cb7984d2d6f89b67
 MISC metadata.xml 1922 BLAKE2B c1a1b2d570bb03b990ee12de3d9f894add49062c91039ef72915c54e201ba5d0d3a53327702cd7f084dd763450b991579ced8cfa9a4b6f18752aa3ee61509950 SHA512 fa6024146dd6fa9ccfa51110d00e517359221e705d2dc3cc7c87876fd50b59023571804082bc66f3596afc12cec8a1fb17306e54816700cda0f78b4bbc183c90
diff --git a/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild
index 791f63c72ad9..a2c8669ecbb3 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.550.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.550.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/tkispell/Manifest b/dev-perl/tkispell/Manifest
index fae18b8be4ae..31a6feaed6fc 100644
--- a/dev-perl/tkispell/Manifest
+++ b/dev-perl/tkispell/Manifest
@@ -1,4 +1,7 @@
 AUX tkispell-0.18-aspell.patch 1574 BLAKE2B 43027d0ff663c3d51ca82814dc0508473c9840b97c2f99239612c45e7b0e5d333ce1bc825f3d819f91eb58bd4c63bcc6a6d2cc815b533f51a03ed86ef984f573 SHA512 2da8d74a43aff400a878fe568e287d7fd3d96611f5c9303cc1514c253d9972664b391063f9665f348f9bcd4affa568d7aa96a3bf5582523b9b3bd61186eba8c1
+AUX tkispell-0.20-nowindows.patch 710 BLAKE2B 6da8a76709cad4a6665d2c665c7e6f5b3e65678c9c3c2507f8591cc06b37ee8fe4918891d6fa29acc4e543daef427b96d276d5f75d044873b8af741c2aa9e481 SHA512 6e86a5815c2b5a6a511d5e0385e733547f1a2dee217b97eeebe832ecac90fea6de371a4c57e62e75970f719d5aaa3ced88fc51006bed9ff54b49585c4f4a065f
+DIST App-tkispell-0.20.tar.gz 8835 BLAKE2B f85c9e9e4b79f7081a2190192b1c2da1cde39d1564b05a93bac49d494fddc4ce898183f4e3f52500cb8404e8fa51d173abf3a3645fd40cf925b41602cbaef5d1 SHA512 ed0f59118bbfb4c607e88220bad1a0174466f529ed0ff7aeda9e5f85bd5d73811cf47341f162f6aac88c9afaac6c941a020070e33e3ae12277b7ff07a70b04ee
 DIST tkispell-0.18.tar.gz 16067 BLAKE2B 314165e586868135e7209360aafdf908aadb93fca5d94e8fa1e05f46e7f6e31fe24b198fdab470082deadbc0deba91820604884b469adc700cff500c261f88ce SHA512 15a32367c53b36217a5c57d1b109b304c5b97e4c46b4ab64cbce66c99c46a651af5d376a8219e35c6ec909250040e7be1e4d073546a893ff25650187ca561e08
 EBUILD tkispell-0.180.0-r1.ebuild 711 BLAKE2B 4d3b5907cd70dd7f5eb2257e50c8c7f3d31f328b2bd7c179ef6b5aa5c32e383a91b7b965ebd76bc41806ac766dd18b7cd39af17fc8fe42235734156b44961698 SHA512 3fcc4406bbb8af1a9dc5b19a4207426d5029afe5c8e91e085a196991fd0478252b4749b4cb83edae5df78ac6948d2a8fe73780ae8a700d1f1ee2ef2b2e24feb3
+EBUILD tkispell-0.200.0.ebuild 437 BLAKE2B 43773ccc63d0a374598210f510b2215d013c0b81289358b2592c18178377bd5963eb8730c39eb9765808a78b85aca9e12f7a5a435e96226842f02e514f934d03 SHA512 9d6e32a333448a949b1ca7e4892b9d9f392d1b7454affdedb1908e64b79e2ec9d47928e3a3e6e239749bdc09c61ed6bc149407f86f417a4df29bee12deb7c73f
 MISC metadata.xml 400 BLAKE2B 282e6027fa852b8f69f2bd73dfe0744a9de4973e1a5da6701055ab11c0f0b537b472f8c04da1e5661a787baa026a0cb1a5e93edeeacaa3e9472ddb715eb83100 SHA512 660101d144f5b479fd15c17b15f20dc23f77904d33baaf0b7c846a9d496b109b1563681831ef43a0f78f457a9b0f478dc4a936f35ebecf85821c7e3828d0e66d
diff --git a/dev-perl/tkispell/files/tkispell-0.20-nowindows.patch b/dev-perl/tkispell/files/tkispell-0.20-nowindows.patch
new file mode 100644
index 000000000000..af05c457c7bb
--- /dev/null
+++ b/dev-perl/tkispell/files/tkispell-0.20-nowindows.patch
@@ -0,0 +1,12 @@
+diff -ruN App-tkispell-0.20.orig/Makefile.PL App-tkispell-0.20/Makefile.PL
+--- App-tkispell-0.20.orig/Makefile.PL	2020-10-13 18:20:04.000000000 +0200
++++ App-tkispell-0.20/Makefile.PL	2021-09-30 22:15:54.013859210 +0200
+@@ -27,7 +27,7 @@
+ 

+ # The first match is for Solaris which.  The second is for 

+ # Linux which. The 3rd one for Windows.

+-if( ($ispell_bin =~ /no ispell/) || (length($ispell_bin) == 0 || $ispell_bin !~ m/(?:i|a)spell.exe$/) ) {

++if( ($ispell_bin =~ /no ispell/) || (length($ispell_bin) == 0) ) {

+     print "Could not find locate ispell or aspell.\n";

+     print "Make sure that the program is installed in a directory\n";

+     print "named in the PATH environment variable.\n";  

diff --git a/dev-perl/tkispell/tkispell-0.200.0.ebuild b/dev-perl/tkispell/tkispell-0.200.0.ebuild
new file mode 100644
index 000000000000..4e780ec2a527
--- /dev/null
+++ b/dev-perl/tkispell/tkispell-0.200.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ASB
+DIST_VERSION=0.20
+DIST_NAME=App-tkispell
+inherit perl-module
+
+DESCRIPTION="Perl/Tk user interface for ispell"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/aspell
+	>=dev-perl/Tk-800.4.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PATCHES=( "${FILESDIR}/tkispell-0.20-nowindows.patch" )
diff --git a/dev-perl/txt2html/Manifest b/dev-perl/txt2html/Manifest
index ec680b9b341b..373de0e180b1 100644
--- a/dev-perl/txt2html/Manifest
+++ b/dev-perl/txt2html/Manifest
@@ -1,5 +1,5 @@
 DIST txt2html-2.5201.tar.gz 141655 BLAKE2B f136f62911345c73eaec6ab12627b98caeb5f84ba95d0640cea870de908fc621f1eac60455beddc92021047835250877117e4740339bce02f9422a183e876dc8 SHA512 bd02872871338d3a431547a4eb4d924f42a40ad48537281c1ce77e4efc65098b50f241cd93f86e9e7d84edb7cf70bd1f372e71f30f5da191d955420be0fd0cb8
 DIST txt2html-2.53.tar.gz 134419 BLAKE2B 8b8af3dbe6dcd76e7c053c69a9cbbc671452d49f0d35497ef457608bda4763cb9ef06ccf898a711b2d9efd0b9e25f6c87d1201deb36e03b71cd3c45ceac9ae65 SHA512 171c3b3056d74e491d02722f9fabaa7ea4d8a86ea6a4e302ddb7cb00639260daa33fbccc9ee97709f085b7135a4358eed4172c7be285165115183f3fdef868b2
 EBUILD txt2html-2.520.100.ebuild 423 BLAKE2B b3118e29a0a4f5d8a23969031ec63b075ebf0816b7eae905b0eaff5a05e3536e4e0f1321634955eab1fbabd3a36785986677f2a16fa9d9bc4934e2130a345932 SHA512 7ee0d4984a84a84c8e8baad0ff928f375600fc042b3fc22d4656615d89e510f2ce552787e398c57dc8727924d157a2615574effe176a337806d3c6dc80855a83
-EBUILD txt2html-2.53.ebuild 543 BLAKE2B 26522650c65e18f773aaf7bf3c9ce461fe060019d6ff81c109f3c63a3c3058dacaeecd0de4681274a1247e20dcc46ae93a21e1b3b05c93583a8e97551eefa2b3 SHA512 d687634023731703fdccd6dc529fa0bd912290d542faae22b820f09fea21f14f20e4010920450663570e65d7cf22f943c9f07444b08aa406d7cbe598ab1387ef
+EBUILD txt2html-2.530.0.ebuild 590 BLAKE2B 3afae220ab8fecb8fadb775a22fb53e4233ae5f86a8c365be16afd82ccfb8d237a012ca6f835926f1be8816e67b7a4702b5f65cbdf3675ececf38d5b60d9ac35 SHA512 fac4b7115f7e0e852dbd0fd8e810399baf08a3174126a25dfee3df3bda09c4c29e2e5a13f2fc4671c7c70eb11e194ac1bc24d55aa9dabf876cf32bcf0b906d7e
 MISC metadata.xml 473 BLAKE2B f495db86f13b49561ec7a18a8daafd966da5e003c7954aad1779d8036ef69b9eda16befe7ae7f6efcf19847de0cf3e518bcf723707e254e3a6ab3c3f24a0e9d5 SHA512 307981c465769decb16ccec4582bd0900877cbdb2ca0c8262d8bb0279a403a915ddf56a287ae65c484c746a72b14cb21dbe833be214e01b1b754395e08b40952
diff --git a/dev-perl/txt2html/txt2html-2.53.ebuild b/dev-perl/txt2html/txt2html-2.53.ebuild
deleted file mode 100644
index ce679dc52463..000000000000
--- a/dev-perl/txt2html/txt2html-2.53.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Convert a plain text file to HTML"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/txt2html"
-SRC_URI="https://github.com/resurrecting-open-source-projects/txt2html/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!dev-perl/TextToHTML
-	dev-perl/YAML-Syck
-	virtual/perl-Getopt-Long"
-
-DEPEND="
-	${RDEPEND}
-	dev-perl/Module-Build"
diff --git a/dev-perl/txt2html/txt2html-2.530.0.ebuild b/dev-perl/txt2html/txt2html-2.530.0.ebuild
new file mode 100644
index 000000000000..a9275b2bc2e5
--- /dev/null
+++ b/dev-perl/txt2html/txt2html-2.530.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_VERSION=2.53
+inherit perl-module
+
+DESCRIPTION="Convert a plain text file to HTML"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/txt2html"
+SRC_URI="https://github.com/resurrecting-open-source-projects/txt2html/archive/v${DIST_VERSION}.tar.gz -> ${PN}-${DIST_VERSION}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!dev-perl/TextToHTML
+	dev-perl/YAML-Syck
+	virtual/perl-Getopt-Long"
+
+BDEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build
+"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1c620585adf1..459d5827fe4f 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 6046009e41e2..1a77b7879ef9 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,14 +1,5 @@
-DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
 DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
-DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
-DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff
-DIST igbinary-3.2.4.tar.gz 245458 BLAKE2B f52f01ace2c24b9bc0c64b3421609ff390e10c1825e09b2bc7a294e902975988e4e9c658e87404f496d63701fc98c7aa2626ce3bb88871f429d7cda6b96092b9 SHA512 0f1d482f4615f8ec9b269d74e48f6b74b0e276b237a190e40ffc643afd6129d9e01be3375864e6e0be1b9666a75ca0e2a6a2dbf571384bfdffe497316168da78
 DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
-EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
-EBUILD igbinary-3.1.6-r1.ebuild 599 BLAKE2B 7052c71b8fb7bafc0e694c75104487c988f73cc30ecd5dbf9f0c72354a11239b4c66927522a01b2e726aa722f4892c91fbd63ca854f0452fb9d47bb896a8cca6 SHA512 d181b6f2524d497af0216da5c26b58fa2af4c6c057eeab8f9a4820d18db21b6596820fab7cf405dfd6008e4d3ee15c591f934a2f6bf92dacb0dbb1df362a317e
 EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
-EBUILD igbinary-3.2.1.ebuild 559 BLAKE2B bb66e2fb19636f4cd24c24643a629968af03f77b2444543997cef0c3576438ac2538e5880617a24ff0e57bb611a92fb797d305441877ebde4753ba144740e1de SHA512 65ae0c5964423f647d9b31515bf6377187352c6a77490eda0937a97771023d76cad304544dc7898003040bec6322484004f52a2c1ef20f85ef533c6144218df2
-EBUILD igbinary-3.2.2.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
-EBUILD igbinary-3.2.4.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 EBUILD igbinary-3.2.6.ebuild 557 BLAKE2B 3a7bd3392bbf62629034acd9332ac298b3691d6b851c6a94ddbb21b64e35d794a15020ceae5d0b8cf23e50bdc8630f2456d0728e0601830d9eb21269e99c6a38 SHA512 d05640228b1a43058c6068bf470abc9bdd8e8078c7a3bcad56009cb8dc86ad5f1e71bfe8b284a8ee243aff711e9119a0877d628e9ef01ab8bb073edd1fb241ab
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.1.5.ebuild b/dev-php/igbinary/igbinary-3.1.5.ebuild
deleted file mode 100644
index e56a7b7ca346..000000000000
--- a/dev-php/igbinary/igbinary-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
deleted file mode 100644
index 49b4f02bfb38..000000000000
--- a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild
deleted file mode 100644
index 8dbeefb1a06f..000000000000
--- a/dev-php/igbinary/igbinary-3.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/igbinary/igbinary-3.2.2.ebuild b/dev-php/igbinary/igbinary-3.2.2.ebuild
deleted file mode 100644
index a4b536d340b9..000000000000
--- a/dev-php/igbinary/igbinary-3.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/igbinary/igbinary-3.2.4.ebuild b/dev-php/igbinary/igbinary-3.2.4.ebuild
deleted file mode 100644
index a4b536d340b9..000000000000
--- a/dev-php/igbinary/igbinary-3.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index b375223fd406..afea08292127 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,5 @@
+DIST MaxMind-DB-Reader-php-1.10.1.tar.gz 23083 BLAKE2B f6684b07a184c4db7feebd9bf6b9afdc34c3de3b62bed59b2d01e1751eb996442d769576fbaa48e2bfa0572e80b2e0491d16d1cd9d89d35ca329e6dc17f74765 SHA512 841a03cf043ee0557e2157daee50d7f73211f5e665436eca8be6067d5357205093e40bb0402248fd6881d0d330feac96b298ec18763b8cb7d6d6392d54c59265
 DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
+EBUILD maxmind-db-reader-1.10.1.ebuild 2218 BLAKE2B 53715ff00f7ecec725b560307356dc21fd4a129e4627395d2287b8d81bf9ac5d2c298bc677c05229c8fb12eaa4de5b6c4d18521457fdc176a1a6bdeb32258f85 SHA512 b0c330ccbd69d88f84629efa93d89400518d550a91b1e0b3dca55e9946d047943c7a3de023287a08e4e038d678d9577aa15269d1d448aa2918d9629078b97976
 EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
 MISC metadata.xml 586 BLAKE2B 69b8c42dc80e3b164f2287e0c65732ad0d5bc53ab1062e651dd85e21d5fdfb6a1e9990cd4d78077f2dcf73e2c8689e7be6a34c11cfd3ed8690a41a8a737e6246 SHA512 5604ac300486eaeb0bfd52d5a95438843b031eef15162438374e6126ace92327a64cb692a549d301f245fd6622856e973c9dbde60d2dcd398c667a9f8fa1fd5b
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
new file mode 100644
index 000000000000..509cad6088ee
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+RESTRICT="!test? ( test )"
+
+DEPEND="extension? ( dev-libs/libmaxminddb )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# We need to call eapply_user ourselves, because it may be skipped
+	# if either the "extension" USE flag is not set, or if the user's
+	# PHP_TARGETS is essentially empty. In the latter case, the eclass
+	# src_prepare does nothing. We only call the eclass phase conditionally
+	# because the correct version of e.g. "phpize" may not be there
+	# unless USE=extension is set.
+	if use extension ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	# The eclass phase will try to run the ./configure script even if it
+	# doesn't exist (in contrast to the default src_configure), so we
+	# need to skip it if the eclass src_prepare (that creates said
+	# script) is not run.
+	use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	# Avoids the same problem as in src_configure.
+	use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md
+	insinto /usr/share/php
+	doins -r src/MaxMind
+	insinto /usr/share/php/MaxMind/Db
+	doins autoload.php
+
+	use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+	# The PHP API has its own set of tests that isn't shipped with the
+	# release tarballs at the moment (github issues 55).
+	use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+	elog "and then most of the examples in the documentation should"
+	elog "work without further modification."
+}
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 5d858307a2b6..be99011fd3da 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,4 +1,4 @@
-AUX pecl-http-3.2.4-curl-cookies.patch 502 BLAKE2B b2ac97150edc35e649bcf5674be59401753413bef6d920beee1f50b3a9f9519545fc3ceb5ed030ce28acf4469ab69323a96bc07cdc7a3993b0033f039964d9ca SHA512 19c24fe2701ec6bf360a9e780a3573ea5ce2aad519412d66c18b9c331083c50e4dbbc453d04e931c7df0b9016a4407f316646ab00537a538bb5fdc9d84a97e54
+AUX pecl-http-3.2.4-curl-cookies.patch 7806 BLAKE2B 96bd439d3ccb16bc7a67e062dfe9ad66bdcd193553764e087dd938e3f76c05796bb09571d934658a8b5d6c22bf2db03c213731ab2f35d03a20902c24897625c6 SHA512 cbbb215f3f0c5527f318283db4984a63b830727727081834f3a3383576d581359cfc7865e35a3b0b6ea4693c7c91ff93570c3c8964a8cd7e5d593095b16f0d4a
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
diff --git a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
index 3c124b4624a6..2f3a7c73a240 100644
--- a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
+++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
@@ -1,11 +1,242 @@
---- a/src/php_http_client_curl.c	2021-01-13 10:34:34.000000000 -0500
-+++ b/src/php_http_client_curl.c	2021-09-22 10:38:58.854615743 -0400
-@@ -834,7 +834,7 @@
+diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
+index f8916e2..575f635 100644
+--- a/autoconf/pecl/libbrotli.m4
++++ b/autoconf/pecl/libbrotli.m4
+@@ -1,5 +1,11 @@
+ 
+ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
++	dnl config.m4 calls PECL_CHECK_DONE once more
++	PECL_COUNT_CHECKS([+1])
++	PECL_SAVE_ENV([CPPFLAGS], [libbrotli])
++	PECL_SAVE_ENV([LDFLAGS], [libbrotli])
++	PECL_SAVE_ENV([LIBS], [libbrotli])
++
+ 	PECL_CHECK_LIBBROTLI_COMMON([$1], [$2])
+ 	PECL_CHECK_DONE(libbrotlicommon, [$PECL_VAR([HAVE_LIBBROTLI_COMMON])])
+ 	PECL_CHECK_LIBBROTLI_DEC([$1], [$2])
+diff --git a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
+index 4d99207..8de9499 100644
+--- a/autoconf/pecl/libcurl.m4
++++ b/autoconf/pecl/libcurl.m4
+@@ -160,6 +160,26 @@ AC_DEFUN([PECL_HAVE_LIBCURL_SSL], [dnl
+ 				fi
+ 			fi
+ 		])
++
++		PECL_HAVE_CONST([curl/curl.h], [CURL_LOCK_DATA_SSL_SESSION], int, [
++			AC_CACHE_CHECK([whether curl_share accepts CURL_LOCK_DATA_SSL_SESSION], PECL_CACHE_VAR([LIBCURL_SHARE_SSL]), [
++				PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=
++				AC_TRY_RUN([
++					#include <curl/curl.h>
++					int main(int argc, char *argv[]) {
++						CURLSH *ch = curl_share_init();
++						return curl_share_setopt(ch, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
++					}
++				], [
++					PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=yes
++				], [
++					PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=no
++				])
++			])
++			if test "$PECL_CACHE_VAR([LIBCURL_SHARE_SSL])" = yes; then
++				PECL_DEFINE([HAVE_LIBCURL_SHARE_SSL], [1])
++			fi
++		])
+ 	])
+ ])
+ dnl
+diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
+index ffa45ac..d8735b0 100644
+--- a/autoconf/pecl/pecl.m4
++++ b/autoconf/pecl/pecl.m4
+@@ -70,6 +70,12 @@ AC_DEFUN([PECL_RESTORE_ENV], [
+ 	$1=$PECL_SAVE_VAR([$2_$1])
+ ])
+ dnl
++dnl PECL_COUNT_CHECKS(incdec)
++dnl
++AC_DEFUN([PECL_COUNT_CHECKS], [
++	PECL_VAR([_checks])=$(($PECL_VAR([_checks])$1))
++])
++dnl
+ dnl PECL_EVAL_LIBLINE(libline)
+ dnl
+ AC_DEFUN([PECL_EVAL_LIBLINE], [
+@@ -244,6 +250,7 @@ dnl
+ dnl PECL_CHECK_CUSTOM(name, path, header, lib, version)
+ dnl
+ AC_DEFUN([PECL_CHECK_CUSTOM], [
++	PECL_COUNT_CHECKS([+1])
+ 	PECL_SAVE_ENV([CPPFLAGS], [$1])
+ 	PECL_SAVE_ENV([LDFLAGS], [$1])
+ 	PECL_SAVE_ENV([LIBS], [$1])
+@@ -260,10 +267,10 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
+ 		done
+ 	])
+ 	if test -n "$PECL_CACHE_VAR([$1_prefix])"; then
+-		CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
+-		LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
+-		LIBS="-l$4"
+-		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++		CPPFLAGS="$CPPFLAGS -I$PECL_CACHE_VAR([$1_prefix])/include"
++		LDFLAGS="$LDFLAGS -L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
++		LIBS="$LIBS -l$4"
++		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+ 		
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
+ 			pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
+@@ -288,11 +295,11 @@ dnl
+ dnl PECL_CHECK_CONFIG(name, prog-config, version-flag, cppflags-flag, ldflags-flag, libs-flag)
+ dnl
+ AC_DEFUN([PECL_CHECK_CONFIG], [
++	PECL_COUNT_CHECKS([+1])
+ 	PECL_SAVE_ENV([CPPFLAGS], [$1])
+ 	PECL_SAVE_ENV([LDFLAGS], [$1])
+ 	PECL_SAVE_ENV([LIBS], [$1])
+ 
+-
+ 	AC_MSG_CHECKING([for $1])
+ 	ifelse($2, [$PKG_CONFIG $1], [
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_exists]), [
+@@ -311,20 +318,22 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_cppflags]), [
+ 			PECL_CACHE_VAR([$1_cppflags])=$($2 $4)
+ 		])
+-		CPPFLAGS=$PECL_CACHE_VAR([$1_cppflags])
++		CPPFLAGS="$CPPFLAGS $PECL_CACHE_VAR([$1_cppflags])"
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_ldflags]), [
+ 			PECL_CACHE_VAR([$1_ldflags])=$($2 $5)
+ 		])
+-		LDFLAGS=$PECL_CACHE_VAR([$1_ldflags])
++		LDFLAGS="$LDFLAGS $PECL_CACHE_VAR([$1_ldflags])"
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_libs]), [
+ 			PECL_CACHE_VAR([$1_libs])=$($2 $6)
+ 		])
+-		LIBS=$PECL_CACHE_VAR([$1_libs])
+-		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++		LIBS="$LIBS $PECL_CACHE_VAR([$1_libs])"
++		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+ 	ifelse($2, [$PKG_CONFIG $1], [
+ 		fi
+ 	])
+ 
++	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
++
+ 	if test -n "$PECL_CHECKED_VERSION([$1])"; then
+ 		PECL_VAR([HAVE_$1])=true
+ 		PECL_DEFINE([HAVE_$1])
+@@ -332,8 +341,6 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ 	else
+ 		PECL_VAR([HAVE_$1])=false
+ 	fi
+-
+-	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
+ ])
+ dnl
+ dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
+@@ -355,9 +362,25 @@ dnl
+ dnl PECL_CHECK_DONE(name, success[, incline, libline])
+ dnl
+ AC_DEFUN([PECL_CHECK_DONE], [
+-	if $2; then
+-		incline=$CPPFLAGS
+-		libline="$LDFLAGS $LIBS"
++	PECL_COUNT_CHECKS([-1])
++	success=$2
++	if $success && test -n "$LDFLAGS$LIBS"; then
++		AC_MSG_CHECKING([whether $1 can be linked])
++		AC_TRY_LINK([], [], [success=yes], [success=no])
++		AC_MSG_RESULT([$success])
++		if ! $success; then
++			AC_MSG_WARN([$1 was found, but fails to link with:])
++			AC_MSG_WARN([    LDFLAGS='$LDFLAGS'])
++			AC_MSG_WARN([    LIBS='$LIBS'])
++			AC_MSG_WARN([Missing or updated library paths?])
++		fi
++	fi
++	if $success; then
++		_cppflags=$PECL_SAVE_VAR([$1_CPPFLAGS])
++		_ldflags=$PECL_SAVE_VAR([$1_LDFLAGS])
++		_libs=$PECL_SAVE_VAR([$1_LIBS])
++		incline=${CPPFLAGS:${#_cppflags}}
++		libline=["${LDFLAGS:${#_ldflags}} ${LIBS:${#_libs}}"]
+ 		PECL_DEFINE([HAVE_$1])
+ 	else
+ 		incline=$3
+diff --git a/config9.m4 b/config9.m4
+index ef7d33e..695701b 100644
+--- a/config9.m4
++++ b/config9.m4
+@@ -24,6 +24,8 @@ if test "$PHP_HTTP" != "no"; then
+ 		AC_CHECK_LIB(nsl, getdomainname)
+ 	])
+ 	AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
++
++	CFLAGS="$CFLAGS -Wno-strict-prototypes"
+ 
+ 	dnl ZLIB
+ 	PHP_ARG_WITH([http-zlib-dir], [whether/where to check for zlib],
+diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
+index 0e79f19..8898b5d 100644
+--- a/src/php_http_client_curl.c
++++ b/src/php_http_client_curl.c
+@@ -17,6 +17,8 @@
+ 
+ #if PHP_HTTP_HAVE_LIBCURL
+ 
++#define DEBUG_COOKIES 0
++
+ #if PHP_HTTP_HAVE_LIBCURL_OPENSSL
+ #	include <openssl/ssl.h>
+ #endif
+@@ -834,6 +836,9 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiesession(php_http_option_
+ 		return FAILURE;
+ 	}
+ 	if (Z_TYPE_P(val) == IS_TRUE) {
++#if DEBUG_COOKIES
++		fprintf(stderr, "CURLOPT_COOKIELIST: SESS\n");
++#endif
+ 		if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIELIST, "SESS")) {
+ 			return FAILURE;
+ 		}
+@@ -856,9 +861,19 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t
  	} else {
  		storage->cookiestore = NULL;
  	}
 -	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
-+	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")
- 		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
- 	) {
+-		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+-	) {
++
++#if DEBUG_COOKIES
++	fprintf(stderr, "CURLOPT_COOKIEFILE: %s\n", cookiestore);
++#endif
++	// does NOT enable ch->data.cookies until transfer; adds to ch->stsate.cookielist
++	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")) {
++		return FAILURE;
++	}
++#if DEBUG_COOKIES
++	fprintf(stderr, "CURLOPT_COOKIEJAR: %s\n", cookiestore);
++#endif
++	// enables ch->data.cookies
++	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)) {
  		return FAILURE;
+ 	}
+ 
+@@ -1919,7 +1934,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_
+ 	return SUCCESS;
+ }
+ 
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
+ {
+ 	php_http_client_t *client = userdata;
+@@ -1994,7 +2009,7 @@ static void php_http_curlm_options_init(php_http_options_t *registry)
+ 		opt->setter = php_http_curlm_option_set_share_cookies;
+ 		ZVAL_TRUE(&opt->defval);
+ 	}
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ 	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, _IS_BOOL))) {
+ 		opt->setter = php_http_curlm_option_set_share_ssl;
+ 		ZVAL_TRUE(&opt->defval);
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index 53fbed64a4c4..deaf43c3fac5 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,3 +1,6 @@
+AUX ps-1.4.4-fix-gd-detection.patch 230 BLAKE2B b052d4dbb6e802c9d25620dd2516b03492a7493518af5d26a97b58b7a2990c558ec64cc3a6eb36aa62d93829e040980c11e56b3133bb345eb8cb7795e71a1f6c SHA512 b9ed97bf9fe8b841b4d25870db036b95f1a744f5d9fc0d59b89f43f76e23dd27d2cca877086b7e66b8dfddbd0fc0fbdf34ba490c9546c54087772d9e0eeb1537
 DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
+DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b
 EBUILD pecl-ps-1.4.1-r1.ebuild 482 BLAKE2B d468f58e4169eb1902b75bc28061a9a4b2a0500fe1e8ae51b678c49a9624a1a3e0bdc36f4ff96e5436425e1c04141f57ad66b4b17659fac12a9a9bb59ec61340 SHA512 9d793f9bbb0d353602a1ba53f7e9e5f280f5bb9d7dc940ebea46710ec7480e481086cc028e6b05cd018476672e20efceb30e3c68350c8a0fc4f90f8b850eaffa
+EBUILD pecl-ps-1.4.4.ebuild 676 BLAKE2B c175b7b5b67fcbcd4b9e00f32f0df068d10733c66cc56f7486731056a7e97cce06da33f6ecbd59651e98dbeabc6379c146ca32f3b3571191c29a4cf9be2a6522 SHA512 74a4d60b775e6160786cc3d06b7f5812c1d2b1fbe5449f0b1b8b7d9138f344e45324604150864a8c84070cbc96a98a003d5b8c898660162135d1ee95d65bd288
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
new file mode 100644
index 000000000000..282bc7a34106
--- /dev/null
+++ b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -38,7 +38,7 @@
+ PHP_ARG_ENABLE([gd],
+   [for GD support],
+   [AS_HELP_STRING([--enable-gd],
+-    [Include GD support])])
++    [Include GD support])], no, no)
+ 
+ if test "$PHP_GD" != "no"; then
+ 
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
new file mode 100644
index 000000000000..e010eda79f51
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ps"
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_NEEDED_USE="gd(-)?"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples gd"
+
+DEPEND="dev-libs/pslib gd? ( media-libs/gd:2= )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/ps-1.4.4-fix-gd-detection.patch" )
+
+src_configure() {
+	PHP_EXT_ECONF_ARGS=( $(use_enable gd) )
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	# tests/004.phpt depends on set numeric format
+	LC_ALL=C php-ext-pecl-r3_src_test
+}
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index b8ab8b3318f7..fd3b8669855e 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,3 +1,5 @@
 DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
+DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0
 EBUILD pecl-uploadprogress-1.1.3-r1.ebuild 465 BLAKE2B 106c1056a3e4351751eb813c6b15f859c66c2b32ee285ac5d6e8fa256418ec7a4bbfa4d4d1793e6998f9ad7d862e36e23ffc3d95965370e7b7e47ef821cff822 SHA512 11ce4c9bde42e1357f11cc2f9fa5e8bf405944ea755c8f09ceb8a3898440c5381b89374ea63298842113bc90ef1837c72bd7fde2f874f46060c2870d67a24a7f
-MISC metadata.xml 668 BLAKE2B 17c5fb43d503899adf2c878fd275d6fd597816395493a81198861f9d451cb1fffb7b9d456e2eee2899dd78297f41097ce63efae005ac3c2bb84bff8bf18d1790 SHA512 45813ee640897cc867eee595ff72c162e8564f172502a9f8c882346a5503a570bc3c7332f83bc5791316e6d1b59263affbeee4581c2406f7290ae2516b5a6aca
+EBUILD pecl-uploadprogress-2.0.1.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
+MISC metadata.xml 709 BLAKE2B a3e91fd98c74c0f7b7286cd7d3070a495eab7c585f4d9981bedc90734665ba60d1db391a641aa9dfb60fcdb3c5748c9f65016ddf5cd9756c7e5caf021a65e3ff SHA512 eab0d79c1f912399fe60a673e6378f61cd5c4c0842d496c59fd300e2a037bfa1e0cbee0d9c330b81200c52944595d95fcc23c21c171172687330d21a8ff53a33
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index ed31cf5f5236..bde040ec7af5 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -11,8 +11,8 @@
   </maintainer>
   <longdescription lang="en">
     An extension to track the progress of a file upload. See
-    http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for
-    an example. It is only known to work on apache with mod_php; other
-    SAPI implementations unfortunately still have issues.
+    https://github.com/php/pecl-php-uploadprogress/tree/master/examples for
+    examples. It is known to work on apache with mod_php and, beginning with 2.0,
+    php-fpm with apache and nginx; other servers and SAPIs are not known to work.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+	php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+	php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
index dce4e8cb3808..9360dcb68916 100644
--- a/dev-php/swoole-async/Manifest
+++ b/dev-php/swoole-async/Manifest
@@ -1,5 +1,5 @@
 DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143
 DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546
-EBUILD swoole-async-4.4.12.ebuild 1057 BLAKE2B d27170880db3dd533f0bf66b08e2656bc4694a4ed38a3e45b7aad1db5ed94b205633ce4041486c87697a29eed857c930d77f208fca94d5e29ee29de51c5e57a7 SHA512 edb52f3826228bd5a20d316f62467bef487792ed081934d9dd71d02a411bfc7ddc61fc696e4f70d3cf99f2a182b6033e8242f9553ed2b365a009f121b8a2686d
-EBUILD swoole-async-4.4.16.ebuild 1057 BLAKE2B 8688cb941e2f0acd5ca924d4adbe8d563770e3ad6df48619999858c33bdb0e301f18af277485d9adf56624330b608ada599a30a87d0ea29e002d7975021c7be1 SHA512 65ae560828a28c0e4f0780a4492d3b4749b2a5056492e91bbe91d27afd5ae67c905be4c7cd93a42ffc382f72a95c6a1d53a8aebf35b2b0cd7fa1ce1508c5369b
+EBUILD swoole-async-4.4.12-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
+EBUILD swoole-async-4.4.16-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
 MISC metadata.xml 248 BLAKE2B 23d890183d0685ae23ea7d370f1ba3fdc379ffdf11239eb61bcda5104dda906654f7dc238ecb01d345cbf790df9fb41ff32b4bef16ed2c26f468aee8f2c6b7b5 SHA512 f75afe21947c53da964b12c9917864186a17dab1c34e68f28cf50549c52c24477bcf57c569d0ff5a7558cd1fc10afd52677da658e6c903ff95d83de7b807936b
diff --git a/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
new file mode 100644
index 000000000000..aa4fbdf97a3a
--- /dev/null
+++ b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole_async"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ext-async-${PV}"
+PHP_EXT_S="${S}"
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An extension of Swoole, including the async callback style API"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests will require pre-configured endpoint
+RESTRICT="test"
+
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole_async
+		$(use_enable debug)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/swoole-async/swoole-async-4.4.12.ebuild b/dev-php/swoole-async/swoole-async-4.4.12.ebuild
deleted file mode 100644
index 845bfc568cc0..000000000000
--- a/dev-php/swoole-async/swoole-async-4.4.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole_async"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ext-async-${PV}"
-PHP_EXT_S="${S}"
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="An extension of Swoole, including the async callback style API"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests will require pre-configured endpoint
-RESTRICT="test"
-
-DEPEND=">=dev-php/swoole-4.3"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole_async
-		$(use_enable debug)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
new file mode 100644
index 000000000000..aa4fbdf97a3a
--- /dev/null
+++ b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole_async"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ext-async-${PV}"
+PHP_EXT_S="${S}"
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An extension of Swoole, including the async callback style API"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests will require pre-configured endpoint
+RESTRICT="test"
+
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole_async
+		$(use_enable debug)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/swoole-async/swoole-async-4.4.16.ebuild b/dev-php/swoole-async/swoole-async-4.4.16.ebuild
deleted file mode 100644
index 09b9d48a22e1..000000000000
--- a/dev-php/swoole-async/swoole-async-4.4.16.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole_async"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ext-async-${PV}"
-PHP_EXT_S="${S}"
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="An extension of Swoole, including the async callback style API"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests will require pre-configured endpoint
-RESTRICT="test"
-
-DEPEND=">=dev-php/swoole-4.3"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole_async
-		$(use_enable debug)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
index f970cd76b892..e744c8f7c5dc 100644
--- a/dev-python/Babel/Babel-2.9.1.ebuild
+++ b/dev-python/Babel/Babel-2.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 382e5fb1ac92..939c4bd7daf9 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,3 @@
 DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
-EBUILD Babel-2.9.1.ebuild 1011 BLAKE2B ed713601810f9ff6c5dad9578cded1185667fbb1afe4f8cffb1a2a9486a0f876b4b0589cea3a054f693da76d7380a2f245fd4180ee9f49fb23d361dd4c3851c1 SHA512 bca79e19871901ef9d595e101de8cc6419e2b94f8b3e2369aa9821cee8ab7cd3cd9a12d478b4412e777705c4eec41f679de08140b3994df03282a2ea43071b20
+EBUILD Babel-2.9.1.ebuild 1017 BLAKE2B ea916f8a3ef0cb404f545df9753695782324c6422ff965d9c1731b9d1d4f4401d17ac3b2136a09d93147cba2745b2d82dd0f0bc723b4525d2d30567e800c35bb SHA512 ea6a023230117ed50356e31603ee1d8eaa0da7c5d1ed054aaedec76a0fcd753158e6dc6d892db058e7b581ab6d7693dc461c2e9a413633084c0214372b01b669
 MISC metadata.xml 840 BLAKE2B b0f46186ca0a319d3e4e1a658007b2cc59fe3a3ea9ede567af5084593f907e88dbe714d2b70c6a882ec95a5f90d4c0e3620ea0a939ad6e52650e770de88a45ba SHA512 621b66293259fd20c94a62ecf64673f7afcd714c18f054c8c0afe2d14e6e98c8abbdf6b4c5cc0043b5d30e513acab292d85c5587a02a9ae99ca007a28720c921
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ad990d3445b5..8d1e4f486274 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 729fa8e5d815..54f93a71be49 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,5 @@
-DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 DIST aesara-rel-2.2.1.tar.gz 8166022 BLAKE2B af3c17029dacb3d365bf49eb01d4d03b5a4f770f66d3e5eba2c4576ef156056bc1aca3571442c1cb7352c358978b47faa7af70ca0da2a2168d8c9bfd47b17138 SHA512 f7bab8ca80e8d13ef7698c1efa56ff37c561786330bf756c7a00c54ae1f131810d68bfd6e328b0705d45788759bd984d42306d2c545d2de6b9a3592b5c021ad8
 DIST aesara-rel-2.2.2.tar.gz 8174668 BLAKE2B c95347e8b74f6600c3570177f86b7ebd7511899ed0ceb24a2d79a03a44ee498a8062b92fb79867f59b609f66315704ee92e28e12a5ab600d54d0d35ef799b66b SHA512 d5f62e42c36100b2fd25eba492590eb306b1394aa01bf2e90d43e84ac67701e5b756be6bc08d0e6b82fb1f37689dbbba1d7ef67c8525555a700a634d742056bb
-EBUILD aesara-2.1.3.ebuild 2111 BLAKE2B 938cf355ddd1157d3a085651bbd1c5766a395da540066341eb1c7c8d8f0559d934e1e5e5c285c2a4ccad7ea1a42e1bcc14619ac2ebc9d71a0b8d10bd6c87a160 SHA512 04edb20862110c8e25ee9c95b52207a904bc8333f8d0de06436e577654fa25eb2d01ca8b258cbe5ed32b3a96ef0611964df3315d7fc1c63e654295460f09372d
-EBUILD aesara-2.2.1.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
-EBUILD aesara-2.2.2.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
+EBUILD aesara-2.2.1.ebuild 2127 BLAKE2B 4da0582395b1de9bf9db5731b799b71a39eca5ea9b770f9a71d9835e0da1d2db4ad763d07fe9c7db4c503eeaf45002a69cb120a1a4d519cb06f63d8501bf0b3a SHA512 6aa5f0807a576eb4ac60097b3ac878ff991c4632d01104f209e3d66464de481241c3c7b64e2db49819711c15bdf05d720cfdcff338156070e94325c21248044c
+EBUILD aesara-2.2.2.ebuild 2129 BLAKE2B adcfc9b383b59507aec8e5620147b75dad1b4809db96e5ee1ea2f0fc4af542c5f97d9af1328995cf2a1f26db9d9cad195f0835aaed51bbcda471e71b6bf7edc8 SHA512 0ba992285cdce523bcf6fdb3a63e1904c29b6d69c3905b5e06715ad777f0e5a69afdc6f8518358da742ed92cc7594e7d277fb8574322b0ac0d15ca954cbd1d4a
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.1.3.ebuild b/dev-python/aesara/aesara-2.1.3.ebuild
deleted file mode 100644
index 99157397bfef..000000000000
--- a/dev-python/aesara/aesara-2.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/aesara-devs/aesara"
-SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-
-	distutils_install_for_testing
-	# we do not package numba
-	epytest ${exclude[@]/#/--deselect } \
-		--ignore tests/link/test_numba.py \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.2.1.ebuild b/dev-python/aesara/aesara-2.2.1.ebuild
index 3148f85f3cf9..3618da94f435 100644
--- a/dev-python/aesara/aesara-2.2.1.ebuild
+++ b/dev-python/aesara/aesara-2.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 MY_P=aesara-rel-${PV}
 DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.2.2.ebuild b/dev-python/aesara/aesara-2.2.2.ebuild
index 3148f85f3cf9..86721797fe0f 100644
--- a/dev-python/aesara/aesara-2.2.2.ebuild
+++ b/dev-python/aesara/aesara-2.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 MY_P=aesara-rel-${PV}
 DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 1f6410691736..281656ed7b9c 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,8 +1,3 @@
-AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
-DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
 DIST apipkg-2.0.0.gh.tar.gz 11724 BLAKE2B 3ad0ab8915bef0632b522de662c9c2424e0ba9c13c0d9bb415d66112ccd0621a226b546c9d248939e83f16311069fbe8170224b8e2e373f194df8d6654671347 SHA512 d1c336f835d28a11640904a6ae63b15a01c3bde2e100eb2ed31877fc7037e538e0fe1d107556d48fb288c3b72a53586122c4ec17e089179aadc222ae80938c53
-DIST apipkg-2.0.0rc1.gh.tar.gz 11737 BLAKE2B 5c2c109dcab512f4154f275fb0bac42c626d753ca0b9f7c5bec91a0f7d0048c4ddadb8ea580626e51a2a879ac487ea9fcb06109d271a0b214dea3c5a1758126a SHA512 2bdfda86bb8d3a5d57868adf5e44de895f95d37b1928f4e24796bdde3a02eb9f8c51a017060c8b9c4a918c85d5d2d8348c634fc11f5eea9a9e333c14cabb1c23
-EBUILD apipkg-1.5-r1.ebuild 618 BLAKE2B 8e338e8165372297627850cd0e2cf02db600d2ecb336ecf6dcf2eb7b9f121f739e397cbc85deaa4a5dc94a0fe1e17cd59cf1e91a02732cc69953add572fe400f SHA512 9c9a07460a0282395802d5b6c1b6edef9d70042331c3916c22f710eeaa2a388e9f5f50518cbc1b43b8baee9b27dc8bc00b553c060d7a5d9fae86078b539c1671
-EBUILD apipkg-2.0.0.ebuild 663 BLAKE2B cb07cff0677a3cf0ed13bed0d610d7c1322e3dfc13abdf7bbe5226662bbd47cb48922597e148ceee8dc666ac5e66c99207ab7e8d0cd6c3d7644a7785a7e0cf32 SHA512 b8364b4957acad127efd8f180c0615775abe6bf0ebc71d59edaf18792d9abb6058f51bbcbee875354f26d0e97d063bd277717f1942b114ef7d3eaa1635e155a9
-EBUILD apipkg-2.0.0_rc1.ebuild 663 BLAKE2B 1807763151e977e3dc34bce13fb38358eb475b63d92eef52e9e434cbcb110fe5a29ca595b266a4514bf180a2f4cc9e9d93e2b46a7180ce95e96921bd01f3d764 SHA512 40c8981d4f05a7521f22516c4f653cba5111938ba49b196b8d0a3207412be6cec676b7083cdc6324ce0580f7c1cd34e3e68c9bca6f38418ca6532bcd769413ab
+EBUILD apipkg-2.0.0.ebuild 655 BLAKE2B 90893a142083e3b483f15c8f4de5edfee1bf393d9153085fa103e91394194c7f909cd74af8edd2e911ad2f1413dafc780a5bb48b64b6a49cd874e84fb229a2c6 SHA512 e097ef51e0c9249b8d4bdd8af4a3deea23ebdb69a4dad9567d2f91e367ac1daf41731b5701a41784b7dea98f47b839975dfe6798fc3d6ae53f78aec7af349ebc
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-1.5-r1.ebuild b/dev-python/apipkg/apipkg-1.5-r1.ebuild
deleted file mode 100644
index a32262c3cb97..000000000000
--- a/dev-python/apipkg/apipkg-1.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-4.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/apipkg/apipkg-2.0.0.ebuild b/dev-python/apipkg/apipkg-2.0.0.ebuild
index 521b20593649..206dfdab2e08 100644
--- a/dev-python/apipkg/apipkg-2.0.0.ebuild
+++ b/dev-python/apipkg/apipkg-2.0.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild b/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
deleted file mode 100644
index 76108e8d3a41..000000000000
--- a/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
deleted file mode 100644
index 0053e7078e2b..000000000000
--- a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 81dc0f46754afd44358b8c97ea832030436ac7cb Mon Sep 17 00:00:00 2001
-From: Andy Postnikov <apostnikov@gmail.com>
-Date: Sun, 27 Jan 2019 03:27:18 +0200
-Subject: [PATCH] testing/py-apipkg: fix tests
-
-https://github.com/pytest-dev/apipkg/issues/14
----
- testing/py-apipkg/14.patch | 11 +++++++++++
- testing/py-apipkg/APKBUILD |  7 ++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
- create mode 100644 testing/py-apipkg/14.patch
-
-[inner patch extracted for Gentoo use]
-
---- a/test_apipkg.py
-+++ b/test_apipkg.py
-@@ -13,7 +13,7 @@
- class TestRealModule:
- 
-     def setup_class(cls):
--        cls.tmpdir = py.test.ensuretemp('test_apipkg')
-+        cls.tmpdir = py.path.local('test_apipkg')
-         sys.path = [str(cls.tmpdir)] + sys.path
-         pkgdir = cls.tmpdir.ensure('realtest', dir=1)
- 
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index b660c0126b6d..e31ae86ed20a 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,17 +1,5 @@
-DIST apispec-4.4.1.tar.gz 64424 BLAKE2B b46390659334f5ce5aa83fd15207f5d1ad6d0e9c530f9e7d2b1a0f6a787498aad065153cde9237ce1ab408256e5cd698bbc674dc0316eb4ed16b874ce34611c4 SHA512 fea0787598ca93711eaa231675f97623eb3d6eb224e11c40e66857b95f48724618bf7a9bfda476b56c1c96fe70bb61675966b1f3fb073fe3f7e4da91e78d3d90
-DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e1771186eb8ea35f469d7c65b8d5bd6319af0ee32539de96ce5ff1889a15d74ac764d7bb9d0b415648af87d28db SHA512 8f8070ec1a084e5c5dda02d30103ff25a2fe096839aa2b1a75858297377e312e29a2d1cf4d373a53b7bffcbe9108489c2a2516e0e053c2de12ef90044b6b7e17
-DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934b9293c501b5305b4a6ccbd22e8b12a163e20e5e02d571a8177adb6d5b3196ffa46ae68f2931b6c3ced2b4d0c SHA512 0abb186182513a6d7e4aeeeb80cd8976eebe7c40932ca7c53cd8be149e65a768235436382bab2006a79bcdf345cde55fd69eb3f28f8d14cde5fe064f7c7a76ad
-DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
-DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
-DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
-DIST apispec-5.0.0.gh.tar.gz 68795 BLAKE2B 42b4ea7d825fc94c6ca904df56a900b52ecd3fda78b3079103370c6cb362cea6338251d344c970c0ad0380d8b39931f6fc38f3e71dc4c31ace0763c6e9721f73 SHA512 1e3d4c06713081d90d5d8650e7aeedd12248ef9a43ced6681be4e9dbf4563b7390cabf3423ea2c1bfda6900cd193efa4e2cacdac77350fcf2e83cfc30580c98e
 DIST apispec-5.1.0.gh.tar.gz 69990 BLAKE2B 0fc488abae9657c9996775c460b97b66a782b82012bf3c1bb6a1623600b03c71bc80eb556d60720e00b07551a5c3b44b40f709bffbb05b10603485af9122cd6b SHA512 ebcb6ddc71be541c152f18eaf2462f09c5860b689d34581723dc8f70f4da59966c34ea6f1282be2ea38cb4524af224a96bcfe974f5fcc62bf4939c644aa6df48
-EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
-EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
-EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
-EBUILD apispec-4.6.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
-EBUILD apispec-4.7.0.ebuild 996 BLAKE2B f35028913e1ba896a4cd0047275b1c2a639f1c6339b6d44c3ef1584e20b653da5a63de8e8a3b3da7f2d0698f7588cc5092febe49f0273ef4a84a90fca0ca8d25 SHA512 b74e4a525fb9ea2ef1cf55cb180593e837833e8de81e480ba0bd4dddac08798b77d01befdc3abd1d6e8b4471c79c0bc97ff1fb1d1527681b16d72db9d94ec04e
-EBUILD apispec-4.7.1.ebuild 995 BLAKE2B d4317c8d7e04455f0755d2dbc1ec18f92eb708d072b13c34b956102fad5f4c212c29520d9af88503fdbbe344d7ab9529d470f0538b7bd5acc0956815d8ee132f SHA512 28f4b6701769f20a43eab803af1481d06108d3cc25c9e03cbcdef254168cbc39290e28a4ce92d866cc5b8ade49e286f0332db36f5e7bf82095394b7a4bf985b8
-EBUILD apispec-5.0.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
+DIST apispec-5.1.1.gh.tar.gz 70296 BLAKE2B 339706890d23c796ea73c23735c5655694315a8a8017eba8f69574ed4e85ddf9a65c3a26482a78f08a118afd19e3c9bbcc9d264bb770941d7affbf7cf85eb925 SHA512 4e0e2959699c735c5242aa1a954392d97ea4809aafbd8d091f608baf7397a31964852588c474acb84e8755a62849837d741eb1e5fdf1cd5304f46c852e346d03
 EBUILD apispec-5.1.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
+EBUILD apispec-5.1.1.ebuild 953 BLAKE2B e626574e30ee3443015a95589efe57e9e37b8d26327c828590c56d394e82f97945bd2c3f929284bf1b569bdc4223efac9e9b90f316f7dff6d2715e3a4e4bc486 SHA512 524fb3f50ef48f0167b23fb492ebe1a8d8a4cb3cafbae97a697565485b96a90d5df2b80a40537b4dccfdf38af3598fbcb1e7bec7c48733b3e73364977e4be091
 MISC metadata.xml 504 BLAKE2B d55ae521520ba60a139e83f23aacbb3df76c4c120a54f1b65b185018647c1f363bc88f354abc1810b7a9d9f3cfa264e0303d46cd23b8091dbb365bd84cc04815 SHA512 e0297e941c3c544cbb14044f02451c26cfdec81b2bd49cf225dc9f32d1ccb207e630d838d8928d28ccb35a3cf01493a87ceb2633cc5ede36b62a6d81f164ea32
diff --git a/dev-python/apispec/apispec-4.4.1.ebuild b/dev-python/apispec/apispec-4.4.1.ebuild
deleted file mode 100644
index 411599826ebf..000000000000
--- a/dev-python/apispec/apispec-4.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.4.2.ebuild b/dev-python/apispec/apispec-4.4.2.ebuild
deleted file mode 100644
index 411599826ebf..000000000000
--- a/dev-python/apispec/apispec-4.4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.5.0.ebuild b/dev-python/apispec/apispec-4.5.0.ebuild
deleted file mode 100644
index 3db198fe80a0..000000000000
--- a/dev-python/apispec/apispec-4.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.6.0.ebuild b/dev-python/apispec/apispec-4.6.0.ebuild
deleted file mode 100644
index 3db198fe80a0..000000000000
--- a/dev-python/apispec/apispec-4.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.7.0.ebuild b/dev-python/apispec/apispec-4.7.0.ebuild
deleted file mode 100644
index f2d86714d340..000000000000
--- a/dev-python/apispec/apispec-4.7.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.7.1.ebuild b/dev-python/apispec/apispec-4.7.1.ebuild
deleted file mode 100644
index 33a1c08135a1..000000000000
--- a/dev-python/apispec/apispec-4.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-5.0.0.ebuild b/dev-python/apispec/apispec-5.0.0.ebuild
deleted file mode 100644
index 9965d2dcdf04..000000000000
--- a/dev-python/apispec/apispec-5.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="
-	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-5.1.1.ebuild b/dev-python/apispec/apispec-5.1.1.ebuild
new file mode 100644
index 000000000000..990b59d0c9d9
--- /dev/null
+++ b/dev-python/apispec/apispec-5.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# requires unpackaged prance
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+)
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 4c301e64fcc5..8da157b8cc73 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,3 @@
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
-EBUILD arrow-1.1.1.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
+EBUILD arrow-1.1.1.ebuild 790 BLAKE2B 612ba06d20f3d7b7d77c450a700fc1b00d1a164ae6714b571a8fa8882ba724d8e7d551fbe7779d2bab7e88dc2836a1e18ae6fac31e1f07eaa72f80286e773f6e SHA512 d70cd7567fd752c99dbc5c4ad58e90a1a4844de911930765c9505576e8952a21588c98b8f6b8b2231b12ba2af9b8f67d6e42466e854b292374df9c1d82001de4
 MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 2a7c7c5050b3..768a457ac45f 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
+	' pypy3)"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 9c821ff62cfd..eb0b211131b7 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,7 @@
 DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
-DIST astroid-2.7.2.tar.gz 374584 BLAKE2B 09f0f70bd0caa8e4971611d2190ccfbc06a8f871abe1e47313ff574bf4680eb26ec67c0a89fc0a434a15535b2c31d005036a0780b62495ac9d6b69e7f04419d3 SHA512 c14841265b2d50a76a5f4ff9c9f19fcdab9e1de8d726e1d40185e517bd3e9c7e1c131e23e0160102f842d7233884eb66d7db7d2443e2609db87d6ec88ed7d5b6
 DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
 DIST astroid-2.8.0.tar.gz 384821 BLAKE2B 74150d67fd883b2bd4356c49c9c1b148a5e98b4d219405e745474c536691276d029bf8a0bb9275ab9df3d09a9b3492a147c67676ab1f80c9c7d3ad10f240bec4 SHA512 0f14f094a6dc753f0171b462f856fb1bfb1b979a8853f76da14beb04a5b02662f6b4e63c3241ce2c9a37f63490a86300152cbe9509c43e0209d5ef536d693b08
 EBUILD astroid-2.6.6.ebuild 1230 BLAKE2B 31bd5783bba20a5c1851a2961a8ef2dc8485d24745dd3129b7138380d623a7a65447d6c84a60fc14911efb7b3731e38f266083d08661e1e032034ed9311feb86 SHA512 dfcfc505644d4049757ba68d4921214271ccacbfd4dd52d1321c8c4792fa4e1ac8f5552f412ab1495657bffcd8e0e47f1d376d2d2300b8cb9e03b39b06b0a9ef
-EBUILD astroid-2.7.2.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
-EBUILD astroid-2.7.3.ebuild 1243 BLAKE2B 3b2bbef11912391d9d190ffbf9b83bafef40aa4d71dc3857cefeb8b5115fccd0da20a26965e3659c45e4b16a441125f737272574b825003bacaec787b2e2907c SHA512 f73bd172d417849a4321facc465170f36e3a01879010d4ce3ffff7529194f17e223113e790236f98d4e7825f2ade7a8faa96698dca23316a86bb55c5697881b0
+EBUILD astroid-2.7.3.ebuild 1236 BLAKE2B 27aa5cc29d38dbb2e24b244313d813705584113732c03010fe5af060ba83044d1245d97febcdc9515e70ab4353d545ff0d2e19cc2e336bb26fe5299066f2fde7 SHA512 df717fbd058beb502048bf26e51c40794ffb9d8b93996391d8180c4b7520a1368e1e453b01e3cdd424e17eae1aa345d60a417158acb833bffe5fa7aee45c2363
 EBUILD astroid-2.8.0.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.7.2.ebuild b/dev-python/astroid/astroid-2.7.2.ebuild
deleted file mode 100644
index cda705df7b1d..000000000000
--- a/dev-python/astroid/astroid-2.7.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.7.3.ebuild b/dev-python/astroid/astroid-2.7.3.ebuild
index 5e2be6d04fe7..ebceef0b5bca 100644
--- a/dev-python/astroid/astroid-2.7.3.ebuild
+++ b/dev-python/astroid/astroid-2.7.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 4b566127cad7..a955d0bc851e 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,5 @@
 DIST aws-sam-translator-1.38.0.tar.gz 895012 BLAKE2B e3beae1af8b9fa510f3f21f4f637b0816084c206d49009106097c3b58ef8755b51041b6908fcd04c28b18e512b782570f84f5acfc7de5c6cab239a70e5bd114e SHA512 d76ef3e95bf5e4db1cfbfd1df9928d8f62dd1245f6629ab5078c4f3761e1d5e4ac372d698aa8fba1f4f77a38826c2e9c9f4899518dccacf56ffba2f89ddea801
+DIST aws-sam-translator-1.39.0.tar.gz 974687 BLAKE2B 1cde943fe187bb4d2fcf64a8417fc7d2f0c8226e2cd3a583ed14569e0ef39dfb6a718971552b577cbb4858272c33054a04a76cfc61c0dfcde303e6578a2fe534 SHA512 010461ecc2ec7131af1a9f078abbc36594e8358307ffc397c2c1daf433becea9d9c5a5afd8e47e62c6c618a700ca957f559401e02f7c772271f70a7bc2311b8a
 EBUILD aws-sam-translator-1.38.0.ebuild 1214 BLAKE2B 8602089fd21a2ad8444c03cd012a4ea75c034854f372c47ae6399a3ffbdff1e1e524a9e6addb5a1fb77f28c2599188c0003aada351bf1f31c37301ca7f0d65a8 SHA512 ed50b6ed6735de2ecd9ed965d5a578a125219d01914162de0998507d394494e129cfea64bcf5ecf846e4c1ba162a0dab42f869903be4ee31479f75b1d1c8faeb
+EBUILD aws-sam-translator-1.39.0.ebuild 1217 BLAKE2B f581c177cd22fc9811790dcd5dfb7629f0acb3239104fe33270de6db118d7c3ab85139572f2a4c7604ac60acba34df9a1a1a812f00230b4aaa3e95c8a8889888 SHA512 8c70326fe228c0d687f3dbff1932bfa1d5bbf75d6bdb0dfbdd51e8c257139736fc1ab4384b4a123b89ded8c898b2a137eaf9efb1ab8b09cdda3d8808dfbef26d
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild
new file mode 100644
index 000000000000..b148711fb25a
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 733f1c6a98fa..23873e0d03e4 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.2.0.ebuild 508 BLAKE2B 2c8478948d30576da7e7c796507dca6f776b5f75a1ca48bf7337251c58f3ccb942925f526ee6517ec9c4d8f79bf24fc999cc4f5a3d206f7950bd2fc0d281f8a6 SHA512 a6703c2271178c38f9c98d98f91d4d2ef948f8b314595ca41e045bdef781f73f9f5336c169f6efd7bba32f43368601e48b27e9b4e2cae916b587c21adabb6fb9
+EBUILD backcall-0.2.0.ebuild 507 BLAKE2B 87311455a2b16263ecd901ec7a0766bf6f4f1b6649c751efaf8198aba21c8b494ec0dc1c5353b26937ed33d130bab171b900f3d7acd19d0c8b230e207d308188 SHA512 cd24b666cb2b6236f0cb80aef41aacee810f079d97b7eb20398a2f01fe9ab4721ebd665f15ca52914f33e13b9f9713326b6e737020a9e47e1d58e1402555d25c
 MISC metadata.xml 336 BLAKE2B 68a24b9019b03bc28ae1ba63aa540019a73e1ecfaa894b047b527e91022888c4ec12473e99db840a877f919c2141b5de86c565b087a9341d8ef105e527f709d7 SHA512 7c5c1fa30436195a17bcc2f3b972db4a92a89585a4f2f73ba25c15143d283e7e7708c6f0ba579703ed1011f48052fd4ea0fe78d68eda46cd6e0303025ef5b99a
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index a8617f3d1a9d..d449fcdeade5 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/backports-zoneinfo/Manifest b/dev-python/backports-zoneinfo/Manifest
index 40fef9dc0e25..bff23593e410 100644
--- a/dev-python/backports-zoneinfo/Manifest
+++ b/dev-python/backports-zoneinfo/Manifest
@@ -1,4 +1,4 @@
 AUX backports-zoneinfo-0.2.1-py38.patch 700 BLAKE2B c3bfc78001da6cfcd9e4b2ffae55f010e5237e68cce04bdadca40db95b5b2c2ef4e218cee884cba0e63ee182b817964ed5e9a7ef3b1992b0da041c0847d31b16 SHA512 d4210cf591a5c2a0266a3dc2f8b74b5ba5bde31923097aeb2044eea2c2934fa5946cafb747bb5e022a1af9a771049a4c6027acaf6886fcd0cc16db0c87a0a3ed
 DIST zoneinfo-0.2.1.tar.gz 85385 BLAKE2B a6382560dbe8c4207c5a53971431497126a3bad7374580f4a67ffd1ffe5940701f13a09bc3a5ba4b729ab8d2484516ea2dc71131b7276f5339b1f60fc39c4ab1 SHA512 1f17ce34eef489dcd263665d58780ab54cf8aa83a601d31148bb4316e600f94d0af1d0baa1d6554d069c0801af906e21b9d5535db2bf76de32333820c61e2364
-EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1703 BLAKE2B 5af78eba2338d0270e8c3be1cf7573719f5ae56678fd4588460e53e6ce21b3fd2dbd68812d0afad5843eb50dc7bb749ea46bbc092359c08947a21b8af4275471 SHA512 c65b8bc8784daa95673c52fb12b6566858e246e5dbd8b15f636a2a8072d5d2b044a17625cb18d8dfd02d68f2287291b702e21784c872b72e37374f6fd0a20ca5
+EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1709 BLAKE2B c88e7026c36a1e90be3af47fcb1707f070c9d33ff99ca5559265015624f84d7130fc00958245aae8f7c67747d02f51af3e87a41343b4289629d2d57448ec48b7 SHA512 e764540253a713a538f5f58e8ad34c6aef1cfbd5ff0169a152955f910151ccfb0777cd27074c29d0a3f5aad0575ad401ef6baf0c8e832667372d42537f363c49
 MISC metadata.xml 300 BLAKE2B f2bb2263089c9cbc374c3b8cad9888dfaa3a02d8881e1e19e6596e23c562822dd911e3448bd5bcd960b976949057f4b2d49bcefc6afd8ecd9c377b11d6f0ed3c SHA512 18ebb3d5f06be61b3d8261c28bdb0a0ef1f4fb69e80119728b144ed4d56cc6342fec22cf0c9cbe5e273dcd4102e5cc6b694bab1101a900a2c0b24a49d9e75598
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index 031ef01a7191..4299c97079a0 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index 7a3463750a16..5cb865a6cb9d 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,5 +1,5 @@
 DIST beautifulsoup4-4.10.0.tar.gz 399890 BLAKE2B 61f044064a81e94b64a72fd49cca164faa05442bc76f897c8a7fa4481acca039bcb9e4f7a1853a7155504fa25e56c518806d8af016369bc37316ecb95b59d7d3 SHA512 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18
 DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup4-4.10.0.ebuild 703 BLAKE2B e884b319e983243d2c453e33ee518ce9a7b0d86e0e937f21b01871d51fdd5b4f0841d248315c722a466a366beb453f088f0bb80f5157096516ea781b6ec9b6a3 SHA512 d2ee8d00edd2813a55ab26983bea741390489d026ee0f4bb26e6810ce2b173b5277d556b76d5ab4c8775898030a2ab80050a5b2214d9c609ab8b15f871d591b1
+EBUILD beautifulsoup4-4.10.0.ebuild 709 BLAKE2B f568c7298eea04839013371db077b3a5228f3e70d60ed51fbb14f82004fd7b61af53735fe2fbc2e3b710fb7d045fe6d8795fbc7e4802dfe72c3e45b99dedbe55 SHA512 73163c2ce55768887057b4f6b0a11646f23b551a26faddb260f57bc3298107737f08a9f586b5daf6f471ed96ab82f73c1ca58c8a8971797bf906c660a0f60886
 EBUILD beautifulsoup4-4.9.3.ebuild 847 BLAKE2B efd71a4c1d8cb5229f7ae59dbc17b54b1e10a4a5a922a1544c8a97b5baa6a9df3c4b6f795b36cb48593e7b2ceaf0ec52e84a5d2f8f3311852acf75dca37c47bf SHA512 46c54efec8bead03640391dc71e58812dd5e5ae91ed63cb3f30f91e8853e3eb8f91528f2b41ebbea1bb0f08694b4e1a53383003bae7bc4840510088249b6ed3f
 MISC metadata.xml 745 BLAKE2B 16e44221decda568bcfd7fc64384f3c10d6150801bd099fbee3abb0273fa53bc83494cd9a56d43b125e9b2d773f9e1dcd35820bcc26a28048beea287a9fc3e23 SHA512 b332203a23fbeef550ce75c70afcf6eb9decf4e3e0409899d556e4e12449608100e1e6af81f163a879937bea2726195524559aa1151f917cc9facdf2bde559e0
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
index 975d9e35d6bd..fb82ea6ed378 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
@@ -12,7 +12,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 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index af76c560439c..4dc537c8428a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,10 @@ DIST boto3-1.18.45.tar.gz 419575 BLAKE2B 27896cfc3bd11c13d21bc272b2648917e1f99be
 DIST boto3-1.18.46.tar.gz 420373 BLAKE2B 9e354e4ba7b7361734dbfd0ef6296fa2f0c2deae9c42312ae2c6860b09e26acb338a5e06c342622b8384b1b49ff1518975723c6e1a3c988d42611f22f4daec24 SHA512 4bfa76936e7b1f7ddab3d9e4ff16dd59144f0c7acf2d595a3ccc6a186c52ce154f790e11f8c6bed72d0ea14f9c706d1af56a865ad6519e4fea7670f2f3176601
 DIST boto3-1.18.47.tar.gz 420701 BLAKE2B e58f528d876a29cd992a414e84a807a4fefdeb14b37e0c520f677d61270acd2bd534bd49ccb571d21f41a210946a1897f324a1c41a7e5fd9fe86a8689bc835da SHA512 67075c3d25a99bb3bda44f5108004a672b7f52f00f945f7643063d8c435854d14ffdc98d88d48e80caef850e4d765a7a9a894410398c56518a5cd30e32a7e481
 DIST boto3-1.18.48.tar.gz 420028 BLAKE2B d6bbf60141f2806519bdd0f4f364698ac7ab6e8a3987771df184ecfa69a43b235a9a21fb128d8f39d2015065d69ecd1e86978465223b220464044640f50d11ad SHA512 f0ef373396ad44e28f8707455ea16951bc4df23958734123ffcdca3efc1e668816b093d0a361a27286f19f129d02390fa36f196c5df0f589c05dc8b839d157bc
+DIST boto3-1.18.49.tar.gz 420662 BLAKE2B 92995cd06f19e26200ea51e6d171914ddbb20b860b286b34cf97ffc6c9ee4f29b59073d84cc7d99b2cd5349bbaff03ac004431ae2cf65af571044c6c52634f55 SHA512 4d94e11b974857709dc7907bd31a3eab087eafff3938286803d4d1bc850d90e4dd82be747a3a9c4725bb15e3670a12c8bd239a98df23198c498519d196279dc0
+DIST boto3-1.18.50.tar.gz 420875 BLAKE2B 22bfcf6ffb6ae87bf45a907f50998f8a04555fccf5e327037c4127f31ea097bf497ad63d08875f10de91a19e9bc53a022caf37af6badf00c424f4e84882fa35c SHA512 25d524e7a96e6f9020dab689536b012a3c708fd03898240e8186df1c89dd049bb627488706abb687173e4d692c85d5258468c903319614f0854d3a4cfab5ac2e
+DIST boto3-1.18.51.tar.gz 421143 BLAKE2B f3a943a2b8d91602017b70a0a4f9233a1c3d0bcd189594ba3b70db3d4a8b5f61758e0b7e5bc1658601b6fd58e47eb5ebf7d329a78ebd014b30d7047065b9c806 SHA512 88c6753bf12aff9c161276802be8936209197698065fb47a6ebf2d9de2b7cab7be9eef0779d612f9327cb444604baf1ca4527de60e7cd396c0a12e2495e6e838
+DIST boto3-1.18.52.tar.gz 421808 BLAKE2B f81c00ee211d3e9402d4b266030696fe40773364b145184cdcb57feee6f7011cbb16345177a4bd2fe74325b133c7e1690a95345a40cccaf14c48de1232dba4f0 SHA512 1ea23881c0a06fe1ad9b30b612b25d7a0b92fbd373483f0e0a604168cca77442fd963ac9363a8ce9cf4a412471e4a4951e7c4428b550c29571dcac3b1d041f8d
 EBUILD boto3-1.18.28.ebuild 1338 BLAKE2B a69e92de424ab1fa0084c97696548757d540cce9caf96a613b072b1932cf1420aafea0b870d1c09fbc597c804fd19faba2079ad018337658663bff714acef154 SHA512 6471431e033a9d8e2f88394b59444503d8c726f31fa550295f6954a5ac4a6ee69e967b6b07216e468c24a518e0f01d7244f9e99ad4ebed010979dec3199e2043
 EBUILD boto3-1.18.40.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.41.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
@@ -18,5 +22,9 @@ EBUILD boto3-1.18.45.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f
 EBUILD boto3-1.18.46.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.47.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.48.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.49.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.50.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.51.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.52.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-MISC metadata.xml 606 BLAKE2B 27dc89cb64cdbf3c994d9e8ec642ddc46f978199ed30dfafffe58ed37db4e5b8fa0da6666b5a9b55155867460dd1c3e30e4ef2862b782bcb2535a00b8d592fae SHA512 8f7ba8ae60177483c949f35e7e100aeb6006de9f1f86bd2535aa96a9fae4e0bd4b894f27af511530612a10f25203ea98a62c6c2ed740bb42e2320cf1f7590733
+MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.18.49.ebuild b/dev-python/boto3/boto3-1.18.49.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.49.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.18.50.ebuild b/dev-python/boto3/boto3-1.18.50.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.50.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.18.51.ebuild b/dev-python/boto3/boto3-1.18.51.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.51.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.18.52.ebuild b/dev-python/boto3/boto3-1.18.52.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.52.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index 1b260d5124ed..486c7a84e5f0 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -5,10 +5,6 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c1da8be07e8b..480c485ccdc9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,10 @@ DIST botocore-1.21.45.tar.gz 8170610 BLAKE2B e55cc819188ae61c1427a3a7e3ff008d85c
 DIST botocore-1.21.46.tar.gz 8175719 BLAKE2B 8c171e07e5c68b1d3721c0d5052b09d2c5522f0ed899453441e72c744e117f7479995ff2fde222c2c1fdcfe382464b9bc0898367a3d79b1e53dbfc60d855e10c SHA512 3ec64d160ec682d287fc1cadeb5ef4ed50a3157f98cd18514d75ec9e60ea73b4dde5a419e7a07c490216d8d67c29d214b88ff9fa1ef3a8b0bf176f11fb9cfcab
 DIST botocore-1.21.47.tar.gz 8183951 BLAKE2B 930fdccd5d45fb1fb88fec2370e65bff5eb7241ea3a666f1f0bfeb11ee3e1e5bb715d658ac1f340c0565f16bbba48fa57c7460aef0e0595486303f62f79df244 SHA512 705fa363bdd4663f774e349e448666d7bfd47c77b57689d6cc12039419c8a4f820d7edd01de9689cd56fee3d59138ea9bd803b4402c8b5fac95cd2de76fb1558
 DIST botocore-1.21.48.tar.gz 8180642 BLAKE2B 9efa407e69caebd7a8c8f058c356b024ac5f7ad1675c099bef1f593b391aab5901853e4c0b0a9989ac190bdbc8e869a2f0dd2670ce483f14f1f2b993971c4652 SHA512 1319679897ec3ed07a489a52d0d3e6a9abc529bb1c1aa458f1b51d1035d7e8bc203ba830fef2354fd07f058b3bb4ba140af34cb1616b509ecda08f5a18b2ed49
+DIST botocore-1.21.49.tar.gz 8202118 BLAKE2B cdda23ddbd1d9540c8dc1e53763bfccf9984a8df65683f1bb9e7541beca866beba75fd76a983c14c953224cdc19749b0e0af7e17529b4bd41869b5a2bfa49d0a SHA512 4a85a0bef518b57942b57fe01b10c588c3cceb1d8c7fa14e4bdc2e0c53fd3bf5b19947659870ce4af57bdabc4036d9a8c15b53530b7ec312e33b5bb91a784781
+DIST botocore-1.21.50.tar.gz 8204209 BLAKE2B a2db3a93696d6be68268265a7dbd1809edcaf9a3039974d55d718a86a3f9c8a08342f54ec9a491cdb0d32b6bb5505bc17e21d43fa8be2a93b34cc8305fb06b55 SHA512 b487a0463159d6e9109f8d195a567c0c086f705406b52554f2f18ccd57aff6e116e9176716a79f5d24066a43a8193ec088fdd4671df69d6c23102537b59c4f7d
+DIST botocore-1.21.51.tar.gz 8204164 BLAKE2B cf9a74b509ee721d19dc3c2f3e6c1ed5f571ea35ab813402d13d285c5f465f8146b1fe3ca99b863e4eb48574034ccadca6dfd0cc118f267ea917d4822f1bfa73 SHA512 4835bfcceb14a46315afdd74ee8015d51c951c4dd8e8b49fbbd9c02bbfd2958925b52661a65a9a26be6c386e2d251bea4322a8f9c3749d4815f2efdb97e403f8
+DIST botocore-1.21.52.tar.gz 8219147 BLAKE2B 2f60387b57cae96f288d08f71a68c6135c3e13008a31f4e9fd7dc19b9a98a90b20de92d7b3aa2e0a793524cf3944b5a707202e201214eb3fd84a8da47486473e SHA512 9b773e6852ab2b5f7f96383b6dc2d0d7d85d45d2124cc896e216cea576f82be8a642bdc8664b3478901dc154898211b9a3ef5cc0501cdf0f9cc75a6eb170cba7
 EBUILD botocore-1.21.28.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.21.40.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.41.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
@@ -19,5 +23,9 @@ EBUILD botocore-1.21.45.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a
 EBUILD botocore-1.21.46.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
 EBUILD botocore-1.21.47.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
 EBUILD botocore-1.21.48.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
-EBUILD botocore-9999.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
-MISC metadata.xml 612 BLAKE2B d63e3fc062deebe8e730b008f42f98fe05a6fcc8bc5631498b9c51838f922bd2b955490a65dd48ad969325583c661f6dc970cccc7a727aedacbc79ca213f7f63 SHA512 b8697f2375bb8bfe4dbe1cca24d2664a41a84dcf346e83c70471c53f1a57a1363babb75436a327cfb081269a4d519078a6f48940f21152ee1641481bd382081f
+EBUILD botocore-1.21.49.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.50.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.51.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.52.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.21.49.ebuild b/dev-python/botocore/botocore-1.21.49.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.49.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} )
+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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.50.ebuild b/dev-python/botocore/botocore-1.21.50.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.50.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} )
+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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.51.ebuild b/dev-python/botocore/botocore-1.21.51.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.51.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} )
+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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.52.ebuild b/dev-python/botocore/botocore-1.21.52.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.52.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} )
+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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index cb37cb422ac5..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -37,22 +37,14 @@ PATCHES=(
 
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 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}"
+	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index 4c77da0dff8a..ab45dc6dcc4a 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -5,10 +5,6 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index d76a0a89c2fa..bb2b8d5593ae 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,3 +1,7 @@
 DIST cachetools-4.2.2.tar.gz 23682 BLAKE2B 7c1163d216fed3a5258ecb1c6306468d0ace8c629275cfb4f3aa3c4e6d9e2560683ac5504b0ee3439901f1e53b7428e27a78c909f6629d3b006610ec8ef35e98 SHA512 b3aa68cecbd9f20e0ff482c497c5011f4d1bfe4ed106914433c6bcaa203fb29592e056807767efdcea0cf7dbd3a08f3edc9c0ea8b328a1442792f9be2049c860
+DIST cachetools-4.2.3.tar.gz 24587 BLAKE2B 2a4d52e11604de0ce9e8a112bce7990d02553216425ff33279f0f898737f3cc39254349b50199bf17c5285de834248737ce3d5ae3610f64ebb925c0dd3e555a0 SHA512 ceab0ed27c8059e777fa2800c988735bdd2101a6191c20688cebcb7b5ba717eb799b506f6030d39a17fa744863da6b5eecc608d855a67fec0e9bbb0ac005c7af
+DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
 EBUILD cachetools-4.2.2.ebuild 420 BLAKE2B 03a38bdb288c65d3173e58149163fedbf711d64ea77aaaa3399dbbf14d869e4f1188731c0dca39bd930cac1de4b96e954798bdfe3ddf8c5361fcacdc86bed365 SHA512 ed72ed6904d4e4543dca1cb13141a0796d9444c5eecd94ceb39028b1a9cd1b22ceea7516c25d410f829de5a2ae47ba941efdaac252c2653ddcd349b968761147
+EBUILD cachetools-4.2.3.ebuild 421 BLAKE2B 625353846453d1f92fae2ec8e321ead827ba360335233cb60cce6203f98ee37fb23c889a12d8babda6d23c779d0b3ff0c336164ea9bb13bae91593905cbeeba2 SHA512 8c466263fac9abdee42ab30cd440d86e8d263310af9be2db31b7aa3be027ed8ad8871f4aace9e1050c2e4fdc65721c706c8a335876bff0154bd96832cc2bdf1e
+EBUILD cachetools-4.2.4.ebuild 421 BLAKE2B 625353846453d1f92fae2ec8e321ead827ba360335233cb60cce6203f98ee37fb23c889a12d8babda6d23c779d0b3ff0c336164ea9bb13bae91593905cbeeba2 SHA512 8c466263fac9abdee42ab30cd440d86e8d263310af9be2db31b7aa3be027ed8ad8871f4aace9e1050c2e4fdc65721c706c8a335876bff0154bd96832cc2bdf1e
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-4.2.3.ebuild b/dev-python/cachetools/cachetools-4.2.3.ebuild
new file mode 100644
index 000000000000..a18634292857
--- /dev/null
+++ b/dev-python/cachetools/cachetools-4.2.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-4.2.4.ebuild b/dev-python/cachetools/cachetools-4.2.4.ebuild
new file mode 100644
index 000000000000..a18634292857
--- /dev/null
+++ b/dev-python/cachetools/cachetools-4.2.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 0b8c6005bd9e..5a7b7adb6bfb 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
-EBUILD clang-python-13.0.0_rc2.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
-EBUILD clang-python-13.0.0_rc3.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
-EBUILD clang-python-13.0.0_rc4.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-13.0.0.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-13.0.0.ebuild b/dev-python/clang-python/clang-python-13.0.0.ebuild
new file mode 100644
index 000000000000..5999d3c28201
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.0.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="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+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/clang-python/clang-python-13.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc2.ebuild
deleted file mode 100644
index 921f7735340a..000000000000
--- a/dev-python/clang-python/clang-python-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/clang-python/clang-python-13.0.0_rc3.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc3.ebuild
deleted file mode 100644
index 921f7735340a..000000000000
--- a/dev-python/clang-python/clang-python-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/clang-python/clang-python-13.0.0_rc4.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc4.ebuild
deleted file mode 100644
index 921f7735340a..000000000000
--- a/dev-python/clang-python/clang-python-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/click/Manifest b/dev-python/click/Manifest
index 133d2f01700f..45f31ff6cd7f 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,5 +1,5 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22
-EBUILD click-8.0.1.ebuild 939 BLAKE2B af16fe80f3184a3be54ef68bbde6fb6ce8c9b9b1874e15c70dac74df39c3e4a0d6b96d0ab431046983660f497b82e14986a4fe2e231a00e1f83188d7518924e5 SHA512 51ddc054c5bb96b99e282f5db6d448fc30d371d5e7c9fbf20d51ef0248370bbb8b7118291cc77f7a0c72c5e0d16f821fb8516a40c84c52027ce977b9ea5d5d01
+EBUILD click-8.0.1.ebuild 945 BLAKE2B 002ee3d4fe2d6d5398c23e4abdc3ec659ac22b403874f670381c1307a19de4bac5a4da326b5ed1705b9f4b9407b735b8903454ab8d288361f375c843556ba419 SHA512 2caa744ad49905a92362c5e4b0728861899379630eca22999e524c714ffdd17c695a0047413c1098d2b4399ef59f31cd0b00fcd2c91490e8bfde03d59adcfacb
 MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/click-8.0.1.ebuild b/dev-python/click/click-8.0.1.ebuild
index b71014ee0cbb..16d8927c4248 100644
--- a/dev-python/click/click-8.0.1.ebuild
+++ b/dev-python/click/click-8.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 3af0f87a952e..70572d6f6374 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
 DIST cliff-3.9.0.tar.gz 82687 BLAKE2B d49840831e55a205e809abeb54a6c9d45e807a622dc9b02a104311b8a5ddda43415b504f7fd62075cc4cdf89a1b61605ecf32590fbca3d720c07da83d58890a2 SHA512 04b33e14c3b29a02dc04855044184f934919ff92dbc09003f620083e5815597f8dee7201fa33019dd58a3e701d4c3f9966be1f4d23e019a881fee9a9bc1f0dbd
 EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
-EBUILD cliff-3.9.0.ebuild 1144 BLAKE2B 678f8ede930cacbdf4af73eeb19c99999c9e56087744c2db4d40793d8d754e4316e46aae8a3d2eb9cb5358adc1f5c275c6ef540aedc65d56f6fdcb20866ff18b SHA512 45e53756957600ab30cf4db192cab2bba26b8c0c21c3bc130a2dde8f151dc95596b04ecad7818370851356219d537382e1c9133cb1d3f543237608c46c40c0c3
+EBUILD cliff-3.9.0.ebuild 1120 BLAKE2B c4d52e40123966406403558b7d99e6aef423b9c8b82b6d136936a524bf870c42c91e819125af00a146c5952bfe10214651797fd7edcce2655e103c544ce0ea62 SHA512 60ef6400fb795ea0d9254a625a5298cc55d2e1c95be0f3c6c280cb5b5fd010feb0d74971ed7b1729ca431d90cfecea490fc34ad8d8ad303104e45663f9b7524b
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.9.0.ebuild b/dev-python/cliff/cliff-3.9.0.ebuild
index 814c8e563629..46f2548c2527 100644
--- a/dev-python/cliff/cliff-3.9.0.ebuild
+++ b/dev-python/cliff/cliff-3.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # TODO: revert to rdepend once this is merged
 # https://github.com/openstack/cliff/pull/3
 DISTUTILS_USE_SETUPTOOLS=manual
@@ -28,8 +28,7 @@ RDEPEND="
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 861fa2b643d9..150ec20e88d8 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,5 +1,3 @@
-DIST colorlog-5.0.1.tar.gz 29356 BLAKE2B 12795172417fd833a3a90175e4b169fee6299728921ed84c1eb9b96f18b22ce043809637744ba136299e59049fe5ccc21d5c9d35b0e402c0bfb982e8aa69ac0a SHA512 53cce2f97ee36d8429fa5917ce6d143c17d4f258aab5ab30e999472ff4401b8cf2bf9d6152a003f02e11a3c05ee42fa9562728853557b41ff17cf2a5112c748d
 DIST colorlog-6.4.1.tar.gz 30609 BLAKE2B 3171d18992ba6525ab63d6edab224f35cc4cd896e725dcb8b774b46ebe7e54457c27475aa3852ffa8bfda01dca9085becfdd67f2cb79c29fabba1f559c6ed6b9 SHA512 72b50175b4f762961f5d73399e62f8caac2f4edff361a7b3d33fba01de477bd7292345f7e4326191e770c8cff2317c481faa67bfeca2c2706d2f89a802cf28cc
-EBUILD colorlog-5.0.1.ebuild 437 BLAKE2B 0e8aaa539be3e192e632616c39bd7f490a7b354cc14f6459cd4000370376d203a5c0858854ac66787a00193b688b0f8e34123bb798fe277f5ff876dce5397439 SHA512 b0460a2a2c505854ab363e3df3bde7013ccf9e4ccfae221d69d484a1602a6bec6d627d38d9eeb6f216a7f8f1e89d43af97873f30a7cc7b0f7695820cd4679bb2
-EBUILD colorlog-6.4.1.ebuild 438 BLAKE2B 52af83e8d8d37ddd15243e52a181d2cbd4eb7123f4d1119e5607eb799b55499a9c30d61daae0959c7e8775a0e206e269021a406380597d6ac2dc59d0e457492e SHA512 5d4144acb965b148136fc7bc5aa40ea2b589dd59f4f59ee9ab837e785f28df75c654fd376864a9aa4e1abf31e807b4e65097f38327e7f6ad6bd1344914c10588
+EBUILD colorlog-6.4.1.ebuild 436 BLAKE2B 787585840156b562fc210971411f40ae5dda1c71f7e0df47a84cfe1ab0d552f5a84387f9972988c778de1bea7b7a974daa0cc624d3d056509028748fef3feeda SHA512 e0e292901c647f69e91339eecc7d78ad5b0dc3806ba4de264fc029df5de933ac8ad9fe7b5fb7e46407cab7cdedd88238cdc938265379b18fd16218cd021b7d9f
 MISC metadata.xml 415 BLAKE2B 4b7aecb1bfde4142a6d3f090e5aa93245e98a5ad63238e141666d1b4ea621a8cde4a9b642b44ff8792fa3bea6d50107b084bf07f9eeb41074f34746be934c0f0 SHA512 66bb051d87b620dc5f04dfacb5abc9a67b87bc28f9cb60f99ace58731c8e23576d061bc16a84942d4c69eb04563a3effa7a21f10392e58256bc73e3414ae798d
diff --git a/dev-python/colorlog/colorlog-5.0.1.ebuild b/dev-python/colorlog/colorlog-5.0.1.ebuild
deleted file mode 100644
index 2ec6c6f445b3..000000000000
--- a/dev-python/colorlog/colorlog-5.0.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=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/colorlog/colorlog-6.4.1.ebuild b/dev-python/colorlog/colorlog-6.4.1.ebuild
index 484dc6371839..e6358805f6b7 100644
--- a/dev-python/colorlog/colorlog-6.4.1.ebuild
+++ b/dev-python/colorlog/colorlog-6.4.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index bc81f3fc80de..33c74ec5f4bd 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,7 +1,9 @@
 DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1fe2fffd90b0ce1c87821b5540048b45644bfff1a8420007cf2a705d388965daa20034bb8f846085dd92b49186 SHA512 f436a400b9b84db1a20409c70d64fdde44903ffba6c3618917fd297e04ecf3dda806e315972f7cf1f786c93639b10b0652a622a579a2cfa47703386a43433c8d
 DIST confuse-1.4.0.tar.gz 36020 BLAKE2B a11becf564c84177f919b4c6936dc9452a2821d9dec190167d8eefc141c424323a2cf1934e608028ac07c7290eb4e139a9051904b13fc4ea00594185db10ec2c SHA512 4a06568f3369d08f177e9f639f59511c565961b15b6a8bc3a7fd244396b47c19c163aa05abab96cce5078b962a98763fc0c5739ff8bbd98a5976696ad6240c2d
 DIST confuse-1.5.0.tar.gz 44193 BLAKE2B 8af065c061c786cf1389a81e10263fe999523e038e41e4403f49a1eeb5ba138c76da745a9be3290f7b8e82d6ec88d18920904c979b5be5dcb4a0bb02f32387c7 SHA512 aed651c7980b0df75f211d9a498b56473c3d23b316569bfafc3008aebb77f86de38912e41a2c073c99c752bfd46092e7ea06ff31281fb79ed3c20c59f5dbcc9c
+DIST confuse-1.6.0.tar.gz 44438 BLAKE2B 0a528cfa2a83cb8ffc47017d61571770a9486585308f5e42531ba1f6356f76b385517a4f3319d3365cd5df41ca49578559fb1ba47edd936d6114fc00a816c736 SHA512 e756771dd93987f9c4ba900a2d95b5d87e99b97789810f2f70aec1fe68a919bd11aff815ca0967b8073ad034ed9b927e55599f5fac590822a7897161869da89b
 EBUILD confuse-1.0.0.ebuild 947 BLAKE2B 7646728aa4896f5b02de27f5e306d7b6abf7a3ad2e498b2873bcaea4bf38aa990da5bd0af75fcc30a56c13502c22fffe95f3adbdd07b72ede9986073274c1e30 SHA512 2dd66790b600af49ceb0c817f305cd57cb31b940fe9ace76abb0665336444f3e7d7eae7162f2db3166a26483ec0199d7aea633a8d798c5b3879c0546452b3bd2
 EBUILD confuse-1.4.0.ebuild 710 BLAKE2B ebab635705b36a72e14154e960ce881be1a3a080c9e694d4a4dcc52ac052c0dfe4588b205f4d4d17c9d21ecc0d48f5899ebba0cb918ba8513e38835b5cdb5647 SHA512 7d89f06d6b4a2890860dc2b8856ef49c137b320afad37694b4a058928a15385a2473ad2fa362547afc2130fd95fde77d3876bbab2591f484a6db9e193a5782c8
 EBUILD confuse-1.5.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
+EBUILD confuse-1.6.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
 MISC metadata.xml 878 BLAKE2B 2c3a52104c43764bd91ab68c7706013373ab30fa0fdb447bd5401f986ac242b1935268ced5fb70657d44ae2539758b81f8956eddcb0656c7dee70be292e240f8 SHA512 64f959d0ce18e4fb412f482712101117f8f824f333c0befce184e736b52897dd105a0d9d71d65eea57bb21d724e2b69661f9efcaffa36536c61d9c6ae2d2a522
diff --git a/dev-python/confuse/confuse-1.6.0.ebuild b/dev-python/confuse/confuse-1.6.0.ebuild
new file mode 100644
index 000000000000..b55f3d873523
--- /dev/null
+++ b/dev-python/confuse/confuse-1.6.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=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
+HOMEPAGE="https://github.com/beetbox/confuse"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 783dfb474c53..34cc026b4a45 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,3 +1,7 @@
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
+DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
+DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
 EBUILD curtsies-0.3.5.ebuild 592 BLAKE2B e32fd9a8bc11511b0056655bd5ac531ffd4ce8fc14cda8e784689c78c685b1faa3b4ebae4a0eaa913f8777516aadf5f094233e2760b8aa23afb6cbf60fdb60aa SHA512 a01cc46b45aad273aa6daf5d455e11ec8e5c9b004045d3e6e42408d1d3fc1beec7b8329a83a19b4bc2fe909ba0dbe14fe450e11354392c5808464126acd389be
+EBUILD curtsies-0.3.6.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
+EBUILD curtsies-0.3.7.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.3.6.ebuild b/dev-python/curtsies/curtsies-0.3.6.ebuild
new file mode 100644
index 000000000000..c29551cdcc4a
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/curtsies/curtsies-0.3.7.ebuild b/dev-python/curtsies/curtsies-0.3.7.ebuild
new file mode 100644
index 000000000000..c29551cdcc4a
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 19744e7930c6..fb82274c4139 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,6 +1,6 @@
 AUX dbus-python-1.2.16-py39.patch 948 BLAKE2B df88f38be549b81b404f3e5e7f0d4c09f7c43bc9ee91b0534059fbb3edbbe675e7ecd467d5d57f365aa59d510f06c41c9ae4970a5e5e8d2fad109bf55cfb507d SHA512 ce5f419736dea09de8a58e372c7587afbd270d806bdcc0eb3b7bd5fa830be00453152ea7ea44a32a06d860ca3174282f62ef44d5f8c9d43de7d8724c69f2ab37
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 DIST dbus-python-1.2.18.tar.gz 578204 BLAKE2B 932a06f4b0145f7a47cf1ab6ea33c14eb4e36570ef548e7557d4aa5b780e49f2d284cdb51f0ec2d8a1cb286097fb9eabb2193d7cbeb387eaf43cbe209b7f11fa SHA512 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
-EBUILD dbus-python-1.2.16-r1.ebuild 1859 BLAKE2B 86db78f539efdbb43116b63a1ab2bb7f3794d98b19dd4e4c5612f272f2ca0f27d320219ad4ef2fc25bf1111eb7df54720e3d0698d0928c6b8f096e174191eefe SHA512 0d1d9eef3a8ae2caf49d620d308acb821d3a19b9a822ec857c66eb57cac990e2f4d9a726be92886bf759b3b8516a6cba1844fc90ef52418992dab12787a14922
-EBUILD dbus-python-1.2.18.ebuild 1824 BLAKE2B 8ffa7ce9b9c8af5369986e6f1ca60245e6786bc66bfea1a6d28e828a4b1d238e90a3a5f122a703fd051c3633c502188d4764f21c4d2d790450c0ce05da788fd9 SHA512 736ad634ad4732fdd8d430dfdde196055d507ec0a448c2e7a0b19de79ad3c85047918f102113d705fbbafd9a81e29d67c0dcdd1c5ab69feb88e056f7c0d5cfb4
+EBUILD dbus-python-1.2.16-r1.ebuild 1968 BLAKE2B c79c05bdac499e9977e535d0826dbea8c9e64489c956eea677b1befef2faf598d2175e2ae480d81eb19cd746c6613d7181c66dd849d59a1b0a519fffd1cba3cd SHA512 992fe10d9396420c3d949c97f8758e8c97058fea89498f123c497433fa08d857e95770e5cd4faaaf1854722d0f8d9b8a5a8b878df3ee393061ea841e81cae9d5
+EBUILD dbus-python-1.2.18.ebuild 1933 BLAKE2B 9cd9fccb7dde75e4ef774a30847cfe8cfaad47c48b805f82e17a77fe6e730fc2eeb6c6c8da278cda6febcf014507042e98cb95d4497f631b6b58df74e14bae6f SHA512 7688b5c14741c7e30c4e2ecdbb659467ae873835fb503d76bb9a32a6161d3764cb819bacf9813a7794eae193b2e8e4c7245ed2d2ca3416aa2a8a384ae6c9fcec
 MISC metadata.xml 404 BLAKE2B 14fb120b562c66c35e57d6686f87d2515d6e7a33e4a3027e2edde743ca533d8be63c8c3c4596de913c86091b2d768c997a1c25282efa657cab08131090cec588 SHA512 7a22b8fccd4715f6d817d528eadff1eaf126158f02113b318a4cf99b5a9bf7a05e67ad0ef1258399a937599bec23cb52f8fb42652948313fb8c8ba63bc5d22b6
diff --git a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
index dc7eb8eeea93..7fc1389c49ca 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
@@ -57,6 +57,10 @@ src_configure() {
 	configuring() {
 		local myconf=(
 			--disable-documentation
+
+			# Work around broken AX_PYTHON_DEVEL macro.
+			# https://bugs.gentoo.org/815136
+			PYTHON_EXTRA_LIBS=' '
 		)
 		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
 			myconf+=( --enable-documentation )
diff --git a/dev-python/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
index 819005012383..e7cd6a6c984d 100644
--- a/dev-python/dbus-python/dbus-python-1.2.18.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -55,6 +55,10 @@ src_configure() {
 	configuring() {
 		local myconf=(
 			--disable-documentation
+
+			# Work around broken AX_PYTHON_DEVEL macro.
+			# https://bugs.gentoo.org/815136
+			PYTHON_EXTRA_LIBS=' '
 		)
 		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
 			myconf+=( --enable-documentation )
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 9eead8660757..4deddef75772 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,5 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
+DIST ddt-1.4.3.tar.gz 17862 BLAKE2B f19bbf282180614e1c8e3967a6af4e4696e1a9fce90c07a4438c7b2415ff1e85caf9c113ef3b4d89c11b2afd5ebb66b23c58b18e91a6416bfc1fc85851e75861 SHA512 ac66dd0d20c49df6fae6e86dfa1dce6d4326f985f17ad955ec2c7bdb2e411bf633baf2d3b244cd49ac45eb91e976a33460e73e4d155e17fbf90418062c6ca187
 EBUILD ddt-1.4.2.ebuild 631 BLAKE2B c361cc9f54311a3f19c5dfc132c03504205f0dfdd414ea83cee13da91ad0c9e3b8746aba17eeab617df649855df953038e71ad8442ff65c64f39f7b789b5f9ef SHA512 5983870725993973e85cad65c92c81fea7dbf663fc38b7029c55e93d2093db74561ef18aa5cb81e1e73f94da73db570adfa79bf417317bb7ea9d30c630131319
+EBUILD ddt-1.4.3.ebuild 634 BLAKE2B c2a2b844302c26db0c4779588cf25a16d38f0088b051cb85fd6c4865cb64cfaa64d0accfb71ad376192ee934c13910d8fdce1e3e95f1e8452e89b59713997ab0 SHA512 160ec0845b726136e961ee820cc1cab4340f5b7cbed93336190360ee57b74803f13e1f8d2207d211acbd5b948664de7dbe1e7bd147ccab1fb9c2a9e5fa476936
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.3.ebuild b/dev-python/ddt/ddt-1.4.3.ebuild
new file mode 100644
index 000000000000..2af68433163f
--- /dev/null
+++ b/dev-python/ddt/ddt-1.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 4a68c5959dce..307f7bbb12fb 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,5 @@
 DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
+DIST debtcollector-2.3.0.tar.gz 31537 BLAKE2B 6c4993edf08dd72e8378bd82e4578a491f0540d35165e3c67e918ef5a659de06e4fd83d2737458cddd27ef08dfd01a38679b940e80a4b460e145ab20789940e5 SHA512 d8a9a65ec33bf6bc777d6766842cd6351c265752f552bda3bfd1db86a08c8c89c3f871c6eff15648a8c1a79d7820368711256d404934fd826ee6cb0c7c53f77a
 EBUILD debtcollector-2.2.0.ebuild 606 BLAKE2B aa4f1af4a65de10cf4e9c7da5f56381a3204fa7f5fd2808806cae1255558c3854c3be63dfabfd8a3be45cea10a23568b19b4d25803eef0c99f2979dccc8bf024 SHA512 3e260e296d0ecbcdab668e769a3feb5303ad6cd5da9e90ed73ad186561429884ed38b61f6bbba5501b00c4241ac785b4b4a8e67e104928acf29cd8e8dcee35d9
-MISC metadata.xml 355 BLAKE2B bec5538b09fa634ce244bd544eadcd6e9c16d99c99d87da705d4645f709346f8561bee231a0e112a883afae18f35392c2031e4ae742ed5edfd9d2b07d5eb38c7 SHA512 f7ef53de9570c1972a7662161ca9c09ceaa6943ee89c08da9728de19560a5375a7ff73e6ede3c0bad8207672a445fb7965cf48c6d4753578a625310491435f78
+EBUILD debtcollector-2.3.0.ebuild 769 BLAKE2B 3b4bc7513da7b2b6689a4132d51cd6f94310c22c70b8f1887bb11f01271f2067c320b559187a49273642af86d620779f5cb3cd0ac3ea5173bfb1acdd82a11fb3 SHA512 19ba27b8dee5c012323e20c9379a2c943031676cb9c8606007a5f914fa169c820aed4869d98b6c8d5c9d72cbf06120dc212679c2b3adec4c2e438eccda469bcf
+MISC metadata.xml 418 BLAKE2B 1f3466117ea254c0f63a9281e3051dd933446a82203153ab31427575948501914f9aa6a14e87331d21f1994079935d6ecf3238099e9cab7368bc0c2d44fe3350 SHA512 6bc03c4667e05f99c140707098339dd590da95fc36f2c0634cf4374b714bde1508558f9e0f5b6a98f05d2950ddc2df78d0732f84f2be47bc317a086ed29581b2
diff --git a/dev-python/debtcollector/debtcollector-2.3.0.ebuild b/dev-python/debtcollector/debtcollector-2.3.0.ebuild
new file mode 100644
index 000000000000..96fd0363c2ff
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="https://www.openstack.org/"
+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/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
index ffd011760b37..d4aa3f95b190 100644
--- a/dev-python/debtcollector/metadata.xml
+++ b/dev-python/debtcollector/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">debtcollector</remote-id>
+		<remote-id type="github">openstack/debtcollector</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 843bf3936b37..4c7419fb5c80 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,5 +1,4 @@
 AUX dicttoxml-1.7.4-py3.10.patch 2064 BLAKE2B 3cf7ba808fe4f0a74281f29dd120304ff1b69e39d1a8cfaac930297fdc801acb11f13903ce3806ba823968ff1df6c5493a4e2672c37c4bb385e806c624c5bece SHA512 8813bdbe353eb54087946aba4cb6bad7893ad1ca9b92b449d2298fe6e4e4ec6881f712ffe2eb42154c6ddfce37e6fef3f7a6949a792e148c330dac5f9d99383c
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r1.ebuild 485 BLAKE2B c0e650f38e955b2aeeb7fc967836a109504962d2c471cef833e615bb7149f9309e1553ce19ac6ed0d7e4c51512e5264a212521acd18176b83589bb0b92007dc4 SHA512 5ac813ec429c7bcea6b43498c053bbf4a30f17c2deb663bf294911eaa8ff2633597722d79d0624225d5d9d6c027a1a616b0484544b313373c0a59deed4ccab6a
-EBUILD dicttoxml-1.7.4-r2.ebuild 596 BLAKE2B 81240c4fc242e115a395b9ca514a48f63d36105f19d6334e7097d256c0df9b97e92832e370120dd5cbfd967c5675c1754d4609655f626010e5c15090e52e79f3 SHA512 62a6903808755bda8896eaa6e3901b7f82663a5e62b2253b9cdb3341b81603eecdac79ddbe388651e2f6878fada61f843f806f51aaa56b73509e178d31ef6461
+EBUILD dicttoxml-1.7.4-r2.ebuild 594 BLAKE2B c062ec1b4934d7b31acc6f4d4e04e287e0fc1f65b8914cf45c7e94b3f75adab6a23257662f3bd54c1325f8163af1950493ecaa3db4814037b274a3f420b6dfef SHA512 289cf65294f21ad56dd16397f49509acf5c359c511fe4151cec53063da80b1c04dcd30df75a619553151584c9ef106b996529f4a86c3a93b9196477b4a0d3771
 MISC metadata.xml 504 BLAKE2B 6596fbda8c3aeb0fc67514f93601bed1656a524de30f11597cee76c57c1057af33c33374ff059c610455cf0119a3fd7d45252c857815e80470046d16dd82fcb1 SHA512 0dfbcd2dd5a764c4521fe390b4c32fbbc6547c47d0b7af4474a35160153cf6ba56d83e97ec9992f13d001f8e570216c2fab2af174342180ada7d55a2b3b52f49
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
deleted file mode 100644
index 528b6d92c7d7..000000000000
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-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
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
index a6882bd19034..d5a2d0fdd11a 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 PATCHES=(
 	# https://github.com/quandyfactory/dicttoxml/pull/73/files
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index 782732643522..75a9417623f2 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1,3 +1,5 @@
 DIST django-appconf-1.0.4.tar.gz 18733 BLAKE2B 21af3c3913aafe6a7670256bb10e80d0ac286fdeea646f91e8696470be3c1dcfb0b6d04e626f80784de02693583bf0b7a16da658175f8a1d81200a5c837831ee SHA512 0d0a206d43d4c6d7f3dbe5fb6423f5f012dae42bae7459f3ee06501f9c126e73f69a30da5c34c84014e582a7b42f253ebd37ece8b8477963cb5d2357ca095639
+DIST django-appconf-1.0.5.tar.gz 15891 BLAKE2B 4d031a229ab11d55d85887346cf208cbe1136e48b78a4c096ba6d67017d80031d634cbeef82783713e4e005fe8a19f1f8e12193450b04e968b8ea5a94290f2bc SHA512 9d1b01e3f8dac5a9a7f6f4f5c0e9fcf4a2a0177e7702e5f932f238379bd2bb065a698c86d27c2dbab7ba6480abdc25595c8a4f7c6f0524517aeb1c0e34f09864
 EBUILD django-appconf-1.0.4.ebuild 452 BLAKE2B 56c1e10aba88145fae58eed61b8fa559d4e88843e14fe133445d5cc45086979e750eafdd1ac301bbca36765b60fcc6c39e24ef5c3404eba00645a0bf15fa1fac SHA512 f2db9a0b230b3f276026523bf7df60409654d99a4d4da98269ebe7345d7479083dd7c65063de84f7afe4dbdc4ec0eebf91be1ef7caa0445af476c9cc2e992a6e
-MISC metadata.xml 294 BLAKE2B 30b1786f8726e71d2fbb02a073837dd8b15a0cd9b3750ed3ea8d78b0c1e2166a83a8bfbc04fb1c9f4d6bd28b370ab31c673f44cba6b0fa88779a2b5dbfac869e SHA512 3fdf6f42de6ed54dcc549344c4f02cb88489a379f3bc4958b881dc58cea5811555b2e967ad31aae60e1516750eaeb8735ce09fb622381ec5b9a04a390c6916c8
+EBUILD django-appconf-1.0.5.ebuild 585 BLAKE2B e7f5dbbdffbdf6106043ee67f473e6f80a4227722c78b1dbc617c6079ec5f3643c72db7394058be04f4ea0a3045d50e5f27e37b03c19e0ef4a21ec3669d1fa33 SHA512 5b02128526becc84c0815d2ca14139fea79203972d81aab30c716baa7b2502b91aaf01b0eaa075281e680ae8584907487f858031eb5e5ab705f04a0e6d3c5157
+MISC metadata.xml 390 BLAKE2B eea8508115e3bb1010b73aa9d49c6cd540aab86396314a1ccb7cc084641c017ce57f096c506d1770b5373de438273cfae7a9c3d9c7ca11e75365d6e3b6ca36f8 SHA512 d1a01c208b9af608e3773ac9a1bd3c2a2d97ccd4af95438dc3f0f155fb713b44571c6f3e390f1a6ff31b6a10a8ca65b3725a365b513dcedfe898b1b25e16e2d8
diff --git a/dev-python/django-appconf/django-appconf-1.0.5.ebuild b/dev-python/django-appconf/django-appconf-1.0.5.ebuild
new file mode 100644
index 000000000000..fbf31651a6fd
--- /dev/null
+++ b/dev-python/django-appconf/django-appconf-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# 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 helper class for handling configuration defaults of packaged apps gracefully."
+HOMEPAGE="https://django-appconf.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.test_settings
+	local -x PYTHONPATH="${S}"
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
index 10e013d9e4df..bc7f6d21ffba 100644
--- a/dev-python/django-appconf/metadata.xml
+++ b/dev-python/django-appconf/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-appconf</remote-id>
+		<remote-id type="github">django-compressor/django-appconf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index a5f9fb8df54b..af88cb58099a 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,7 @@
 DIST django-cors-headers-3.7.0.tar.gz 88367 BLAKE2B d8a41a605d4823852cce65ffa8005d1e82598cdd81702d1ecef304c2a117dc553447c0cc7e9c31641165f0ba6975b757365733b349c0f5b1f4e9964095b918c2 SHA512 e1dc9695f99108f0908d8d348d284f1fd4a8ccbb84b3c748c9ae8d81d6f32ac8ef3417b612710e64ea4c63d464d97ac31a199292ebcdaaec3f3e37ad025ed0de
 DIST django-cors-headers-3.8.0.gh.tar.gz 27602 BLAKE2B a6ad81288b57e731f784fa0a5dda396415d6a4bd8166844f8f2f51752af2825b8d8c1241d5fc645b1bc4f963f852c508b8f29993bf1a6567c07b0ba0f1d90025 SHA512 633269faa1e1606607420ebc400d52105fde5beea46b37238658b5a40a25ad96101648c909f6efb6931d9fe138c5e192026797fc5146acecf791f1d82d4aa2ba
+DIST django-cors-headers-3.9.0.gh.tar.gz 28921 BLAKE2B 8ff5ab2035f938652753920f632d73488b568ccc3278d60ff6a7030ca1c6a7bbc36b29749f450ad312cf3e8c12f80c85f9e9841b3b4a26fb84cd06e0cf9f8255 SHA512 b7797c5ae4a9b8f12dadbf4b794da196c89a336469acb541d159f5ab3bff000825ab687f9e49996d3955c5700194eb62e72513efde8ae1ad4f4b84ceacd26a38
 EBUILD django-cors-headers-3.7.0.ebuild 572 BLAKE2B a1068113db9527f8a9c28657fe2c444930081efd361d6a6dd55cf890c5d2a3e77d7c60aabc4b9313bd6faf10fa06292694772f45d0db1bc7bfbb072ebda45b85 SHA512 eb1cb24debf50e6e6c8b6d8aabdaa3c6630ed8cd027f5ff4694f3455d5670f962be982b74c3f3258b1169e95651a9f82f09a336261286bef04e77711569a43af
 EBUILD django-cors-headers-3.8.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
+EBUILD django-cors-headers-3.9.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
 MISC metadata.xml 320 BLAKE2B f087ea8018f5302f24a73d32a3621ca22637f94810eb40914deb6a2de38a9522ae48be6485ff65d31c1b860b870120a95ff47e82fb53f5de3c7dd6bd067b1257 SHA512 e36e854a4af0bb40e3105826db61df2589783c03556a1d7f9854a7c920d448e2edf6d00a7a631ee688f6fad4ec672bf0a29d605816f4939a324ec7a1567b5d89
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild
new file mode 100644
index 000000000000..441ad19af723
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
+SRC_URI="
+	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index 12817c3bc170..ef4bd99e156e 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,12 +1,5 @@
-AUX django-mptt-0.13-test-install.patch 606 BLAKE2B 06e54fa6c93c2efda52f73d6cf0cf02fb07cda7ccf5a131664143852862a220d77d49ff39c0f0bb63ad47811f356c347be19dc78a3f6cfe24f20ffff32639686 SHA512 01836b1c45be264f24ee584c7736502f3f31982321f3a5c77481eb7214ab7505427c346392cc3f8a79fd0f74e45853d64708e03a1df9fd47ac5721a13ae8419d
-DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
-DIST django-mptt-0.13.1.gh.tar.gz 302287 BLAKE2B 915e3066862be4d0883ba540cf584d917994ecbf83182726f5d39a40b61850e4ef1fade2c12325237f2c345de14ca6e54362712eb7bdbdf553eb6ebbf321075f SHA512 bc64d24f8d889109a054f270802f8ce6308c12bf3b9ebe1ba818d42e6c1f9d8904b8cad996e71e03c7f77ed80d912a7d8bb920cccc0e2fff170e754816367f40
-DIST django-mptt-0.13.2.gh.tar.gz 303658 BLAKE2B 8b9e968091be35d1b20816874f8a27cef065c11a25d5ac08192d01909be5a748ab96f0377a09b8a86ded5881d8ce075530bdd3a46c92065dd2f66d734853c27a SHA512 52e8631af11006a0ef1739d1f9c22d34fe39fd790dd45edb6bcde5f4ad875d6f2f0087aa4928d5e5b391b69728e67c2d8b6d10976714735eafe7b3b48e20d123
 DIST django-mptt-0.13.3.gh.tar.gz 303670 BLAKE2B 0185ecf3576ab7fe48ec4d7b2259e7cd88f2c5e3a8c96aa1ee555b7f0adabed4b787db84bcc4b2831746b410f0f58364df8fab9ce1768f1e1b9d1ff8a2869730 SHA512 602f45d4353dca80ec2285366c87eb60ff6a39a09990a041236f737371715166e9a8e360a83b4419c0ded7a206f73e4754de602aabef18f89e7db85ce8c651ea
-DIST django-mptt-0.13.gh.tar.gz 302525 BLAKE2B 21b2fde5c81d83321bf7569d2064db87aec3c184f27cf3fc3bd34421be04212188e15f79a575b08aabb3a7b95d116bf3e5f0fb57c56cadf9ad2ac166e8e77845 SHA512 63dbb61dab59d42b5e747f35370a0840d40ed465979d1f93e66561cf4c0726635cae774f87e39cc1ac480847f3ccf0eb65dc8593759a0860d586e334fdd37256
-EBUILD django-mptt-0.11.0.ebuild 530 BLAKE2B 6ec476ce4451ae16c49a0896992047fcb22177a3d54eb0e38aedca6814e0af90531285aa9a2e28e08dc1cc4c321ca2e196d5acd31bb21d591b2d4a30d559e6bb SHA512 6fc8d461af1f778e8d240bfaed4378d4b7b6993f28b209a2c74a158ee8ba12add77684063df6e1b1e09082eaee2f1d2ae343e1692445e14ff12aded46944f3e7
-EBUILD django-mptt-0.13.1.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
-EBUILD django-mptt-0.13.2.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
+DIST django-mptt-0.13.4.gh.tar.gz 303688 BLAKE2B 66ae7a0e15a7ff281af2154f216970a6a9b249a713b3ae987f0fbdb60b95129fdfc96c05924c0285da33f11c59baf6e069830c3079c64164d838d9d34231a4a9 SHA512 86786763db060227b41e2e340df5d52062fb6e8c54f832611bc90d01102411d45dc217e8d84eece84ebbe4fc9727d06e7c368ae15c253aaf02117705dbae8c47
 EBUILD django-mptt-0.13.3.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
-EBUILD django-mptt-0.13.ebuild 709 BLAKE2B 84b11240e817eb37b07a58acb6e7e5a2ced2e52f78505025ea6a3e49a22cdc78e4ec35847008066614fe449ee8780b6152e8743459d2dcc4e06fb7701a2d30d0 SHA512 8b71c5828c81212452be273b75de55d35f12725520aa88c372511cada83307f6771505095320d5daf0ac16ae08f6b0980bac12d908847b3a88ef65f8d1e81aa1
+EBUILD django-mptt-0.13.4.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
 MISC metadata.xml 242 BLAKE2B fec2ed386ce9cd0b12aa9a319095a55d6744a61c9dfc0fac4a6369267a4b288d9636764eb625a2a23c97967f883b40b31ba9b27baea4f5e4937d19ab1c0d672d SHA512 ed57e316f0dc73592de3ad6e07bb4997ad443bb0fe710279df889039e026ec2d5296f62a531e12eecced9b8cecbb54b07f96296335ab4997013d88f49f932715
diff --git a/dev-python/django-mptt/django-mptt-0.11.0.ebuild b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
deleted file mode 100644
index d25ee9a3ab3f..000000000000
--- a/dev-python/django-mptt/django-mptt-0.11.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/django-mptt/django-mptt-0.13.2.ebuild b/dev-python/django-mptt/django-mptt-0.13.2.ebuild
deleted file mode 100644
index 10262c58b326..000000000000
--- a/dev-python/django-mptt/django-mptt-0.13.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="
-	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" tests/manage.py test -v2 myapp ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-mptt/django-mptt-0.13.1.ebuild b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
index 10262c58b326..10262c58b326 100644
--- a/dev-python/django-mptt/django-mptt-0.13.1.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
diff --git a/dev-python/django-mptt/django-mptt-0.13.ebuild b/dev-python/django-mptt/django-mptt-0.13.ebuild
deleted file mode 100644
index 584beed17861..000000000000
--- a/dev-python/django-mptt/django-mptt-0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="
-	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-install.patch
-)
-
-python_test() {
-	"${EPYTHON}" tests/manage.py test -v2 myapp ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch b/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch
deleted file mode 100644
index 886d5c6e4ebd..000000000000
--- a/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6bc5860575d491e8cf1edbabee7b07f1c072bdba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 Aug 2021 09:45:45 +0200
-Subject: [PATCH] Do not install tests.myapp
-
-Fix options.packages.find.exclude to cover subpackages of "tests"
-recursively.  Otherwise, tests.myapp is installed.
----
- setup.cfg | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index b4094dc..b8ebee3 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -44,6 +44,7 @@ tests =
- [options.packages.find]
- exclude =
-     tests
-+    tests.*
-     myapp
- 
- [flake8]
--- 
-2.33.0
-
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index bb1c2972098c..19a09b1aa710 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,3 +1,5 @@
 DIST django-sortedm2m-3.0.2.gh.tar.gz 44296 BLAKE2B 41dd4a7bc654fef638f7a387b1307ee32ca2d8733f4ba6b9fffc92a9ab4c6af7d64159cd5a24f4305483502609a1730fe12a3072f493251840ba840b98155877 SHA512 4e58ff37cdd798d88c47a8efee2bc783ad7109b30e023127345b6d12b176e452d6125fbcaba5392fc11660df3e8b66be4b23d5ff7ab90020f946cfedc80276a7
+DIST django-sortedm2m-3.1.1.gh.tar.gz 45888 BLAKE2B 878a23d5f5dad114b0b6ef9bd687d4e23620c823a8ad33a66b7c6c1e598db15e5328a46373dd6d7fd9449b4ba533e21664db716cde40150af2451a74f2f28fda SHA512 440c049a1fbe54c0db8edb0a5a737b5d84553afb7305d21a64c2dbac02f143e6f17e7e0499a4d3e687b13f292558d7818c030d78d8cc9443048a95ae6b50204f
 EBUILD django-sortedm2m-3.0.2.ebuild 831 BLAKE2B 5171bee1ec53f3792c3b78ed93290eecfdeacfaaafa09317eaa9b9054607838cbae1e22721d868ea8b2d41ca4b3c9793e049064afbdb56ef39dce6bf1955cb61 SHA512 712eb4730a47e2d95f4c147328f69c43a93928c48adbc52477f89332e06ed5a432b7e6e50f982e438029b4b0f083bc251d356f081bea8bd1a6e35c5963ba14b7
+EBUILD django-sortedm2m-3.1.1.ebuild 888 BLAKE2B 788400d715295fef60ed3bd7411937ada614024c88de29b43c92b69a272ee1db5297904dbef7bb92a674d3e75a51cbced0f6b8b2fbaf33953254e312995b7e56 SHA512 ce336522af4c6da3352e26f896410cc079a8c91ac3985c8880305ca4751fabea8f2e4427102f58765ffd02dbcfdac8036dd727afdda9c4fcbda256660cf7961c
 MISC metadata.xml 385 BLAKE2B be4400699a7c6efbd3ad0a115416e7fa7e7da396e8d5b5c24da131866a747c6b225c753e0a092082a4c0bdf6b067a070a204cbc66f2d573fe075b42013537ef0 SHA512 735bd3eae6c3083743b9ddf5af2a567bbf7a76f5a4c2d44b1bba74017ac9dfd2ed41ad86e448d851533c95cbf49b25d8ca13c7245ff0fd049d949083211d8ace
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild
new file mode 100644
index 000000000000..462523bd30b5
--- /dev/null
+++ b/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.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="Drop-in replacement for django's many to many field with sorted relations"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m/
+	https://github.com/jazzband/django-sortedm2m"
+SRC_URI="
+	https://github.com/jazzband/django-sortedm2m/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test_project:${PYTHONPATH}
+	local -x DB_ENGINE=sqlite3
+	local -x DB_NAME=":memory:"
+	django-admin test -v 2 --settings=settings --noinput sortedm2m_tests ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 942a59c46906..888832788f6e 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,5 +1,7 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
 DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
+DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
 EBUILD doc8-0.6.0.ebuild 863 BLAKE2B 7ffbb2689708c46229de6ec69695fc0ea466eee173e23a3b38183ca1af8e0948ed0e9459f23ec551b5f61b2c3bef60141c8ce4e732aaa79fdab029d6ec8973bd SHA512 ed9a8c5ddb1727ccccba2982b4e34b58dca4c64cda05e7474aed7d07379ab20823b48a448c8d20a9e3fdc6952bf97b0477b36d8d88f3f6bd5c2c896443cfe2ab
-EBUILD doc8-0.9.0.ebuild 959 BLAKE2B d0399a298bd7a9b80f0180d1db0c5fcc42bed563b073f96fcf4a78af5a7f9b1973bfb41e77a5a7d32f445c3db5e43f605ffad95544a39560146e7864ad184915 SHA512 2fa37711347cc9743a2f847363e02898409f79aaac96d7d4947db0e8d58057641738cfc54982cd3fe9008654ba731e17943857756ef5aff3e7b094fdd15138b3
+EBUILD doc8-0.9.0.ebuild 957 BLAKE2B 8d8e4cbdf749e4dbb9b79711ff9757a5b8b42a8399810641f4a47984dc8b202ce7501f442ef6619ec03f7e6e601c762a7aa57d0fff64842b206ed5d9fa45c170 SHA512 66b66f995c149f4c4bac211d9fb1da1e1579758b3bcc985ee43e423e41ccba62cb1c6d570bad0c72987daef8229d0a01c706b48424c347eedbdef5bbb26ee403
+EBUILD doc8-0.9.1.ebuild 959 BLAKE2B d0399a298bd7a9b80f0180d1db0c5fcc42bed563b073f96fcf4a78af5a7f9b1973bfb41e77a5a7d32f445c3db5e43f605ffad95544a39560146e7864ad184915 SHA512 2fa37711347cc9743a2f847363e02898409f79aaac96d7d4947db0e8d58057641738cfc54982cd3fe9008654ba731e17943857756ef5aff3e7b094fdd15138b3
 MISC metadata.xml 322 BLAKE2B 0dc9c91cdb78ef3c143f7e45ac3ee3754643c676c249a685fdc73ee8f7468e19eecd6463fcb873b4a242789aa6c8f65ef92c45a1a5dc61c21bb070ae055f6553 SHA512 a417cd533ae3ef3b64cd170caa7e84fdf761be3b9b35178357134bcd5ca487fd5d4286cdff4718b345afef06cd63d5e9511431483ff7ba3ce5b5aca4ebe8ef41
diff --git a/dev-python/doc8/doc8-0.9.0.ebuild b/dev-python/doc8/doc8-0.9.0.ebuild
index e7f37e7f4c45..ac2608f9c97c 100644
--- a/dev-python/doc8/doc8-0.9.0.ebuild
+++ b/dev-python/doc8/doc8-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/doc8/doc8-0.9.1.ebuild b/dev-python/doc8/doc8-0.9.1.ebuild
new file mode 100644
index 000000000000..e7f37e7f4c45
--- /dev/null
+++ b/dev-python/doc8/doc8-0.9.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+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/pbr[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/restructuredtext-lint[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "checking pyproject.toml projects" dev-python/toml
+}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index f4a930341b92..ff62c85ac23f 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,3 @@
 DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
-EBUILD fastjsonschema-2.15.1.ebuild 618 BLAKE2B 17c0c3a42f4c21010c50f32715c32ff215a64c37576d88555c21c2c26c3bc49f1ee7e5c5f9db2f3e10e92a6ef5de60957fef8f4aefcd5dc8fe6402ba2bb6c5b3 SHA512 f0dc5a226d793a6aa2698128648c72b5641bae1a13ea2948a64a91ea467fee69364bfb0e7ad449e4ecd60851a77d2b18500c92a45902fa5e787b4d8a4df1c8f2
+EBUILD fastjsonschema-2.15.1.ebuild 617 BLAKE2B fccecb2a65aa651b7057fc618154988307d8708c00bfb8b2ae7d08bb2dc9865ea28989b6e4ba31b534b85f449ae04d009d351c233620b0635d2f5602f3b8706e SHA512 ce02ffd5c95bba63b129ea6b627ee885d34ccbe5af0d00b6eef84789b257f5360537c99ff7e01698bc71cab24bfefb5a74d40849a445912ab55e2be9142edb70
 MISC metadata.xml 320 BLAKE2B 6a243ee36316e1c8db01ec6da04593ee4edb8cf479e829291e74c5672b5dd419cf9a3528c13dbd540342377186130a49be652e3f8c1cf78feafd310dbbd3bc88 SHA512 0c0dff7e564b1c1176e05a49c0c028ce181497bd734a1c19e24d8af7169c16d8b5dccc73cc31379c28ce0e58d1eb142d131969719b1c8fe6df3b76c59b4f3a3e
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
index 445f00c328d3..7536e754b01d 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index bba0f89daa98..ca914af8fddb 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,5 @@
 DIST feedgenerator-1.9.2.tar.gz 28076 BLAKE2B 18c1db7de23efa79aae7b1d92aeda4d41921e673da7be883099b3c00f54aa4602370caebb02913607644b8cf1d887e8141b8fc71ecd52e4720bb23c645ec5242 SHA512 3f9799a8008cf456635bacce87699c3fa00ac990ed675a92dbdccf898fd189c8908109a27bb393e9f25bda7f880c66c40fc3d1179d09e579be8125c70bf1b7a9
+DIST feedgenerator-2.0.0.tar.gz 23093 BLAKE2B 9f8a597028303f86eaebc0e8e34454dda135a5d62000c4ff6b30fc5baf872b924c3bbf9a76d07817742255305d9a681a25693838992170068e4cd6af540840fb SHA512 1f53077e4c757059947a487a1aa7ca8cf28545bc86f1bf3c8fbe515615f83ac4c48de5c22dd020f28c21ec6549d7f9971513f3de450bad7d4efbe0a0e444b0fe
 EBUILD feedgenerator-1.9.2.ebuild 501 BLAKE2B a45541308ef2bbe6e27412140d52c1756371b3759a9082a415ce3cf5fe791159310aef8366f63821e75179ee2bb8e5ebe7ad36ac7b9cc1b3dcbe725240ff4669 SHA512 8c3fdfafdcc8511315684ed2210b5a8142f54f75151b1b12aec3656ecbb0036a40bd01bd176aaaf31c1ac73d2627e58753cc03b62414b14678cb9b334c7ec06b
+EBUILD feedgenerator-2.0.0.ebuild 507 BLAKE2B f61a80b0aea41d295b4f4652d865ce832e6fec1adb314672d58703d6ad6855113cf2e4656252630618c388c277e42003c43a080e9fdd83bc5433cba2f298517e SHA512 01388cb18ece81d8125a00baf65ad0854d797e1934b9f6ec51a64635a518d565def13e4c852a417b01bff6d13eb96941206760ec90be355d8b5887d00fde8568
 MISC metadata.xml 477 BLAKE2B d167790f82aef2a2aec5ef6d351ef3e003d0c5db5e69a2ae78aa108ae4c8ec006f0983eda0d6855ccb11b91218b2dbe7abeebd1bc2428b8a79464eb96c9ba5d8 SHA512 2fa5b9046cb30943e4c511c220a302250355bd60b0285be7de6342cc7bd271df824e3fa73a62efa2998ee9cbbd08e45b2071214e56de053bd583f6d85c41460e
diff --git a/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild b/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
new file mode 100644
index 000000000000..ec6874d7e2db
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 4d2bc4be4d5c..59b7ce0d103a 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,7 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
+DIST py-filelock-3.1.0.tar.gz 584958 BLAKE2B 29ce6c14ece7a45104ceda46bbb261730f7bf3e7df9d20be783a8e8324ca350e8b02a099f4273aff953281e10d305772c3572a72377f1039d0763c3d87173289 SHA512 cffca48f9e7b39a750bcecdbd4a1c8fd2a57c0eddd41fb735930ecb954550620ab89994cc159b6f0ada2cc0961a097e5e2c2ac380de424b59b111a3290682b86
+DIST py-filelock-3.2.0.tar.gz 584871 BLAKE2B 67c5d85dd030007c12f549e772eac8d028c9f0ee9abac4b5106bbcae91e5447e7c6394938877b718630c22323c53ebc28a8bff8b2e323401f027807f7447017b SHA512 8c2f3980090b798ca0103158731a816443bf461a40d79f337e1c102aee50b3885d2b30113d509a8457df20a2cef196e70b2313fbe3f5b44557b817e5a6154d80
 EBUILD filelock-3.0.12-r1.ebuild 640 BLAKE2B 798ef67b1ee71b99c065b48a8d5b54f9407a32d742a02a8d86e0c5f978662b2370afdc72617af1ec7712882bba3a92afbece905631265c1491a83f28db8971a3 SHA512 027590809537070c19811c080177863b21233728fa8db3c590763600a695898744e777d2a7f3a6a3cd48b04c2d1e6817e44ff59721ba7d254e05d5b90620d922
+EBUILD filelock-3.1.0.ebuild 682 BLAKE2B 15dcf39ee226422f1c84059de265aa5ce6c7a8904dba2eeee5cd935533dec4075984daacc37724c78010f90b03683f59ac3b40cd4ddf0ef74f1e0d9526a9b3d0 SHA512 c823957d1340e507ec6c29a034f43f4c613e8af0b4a557a6f60df297c18b71db76cc81db9868122a5044b131f97f2e28ca87eddf507e1282702c976040378f21
+EBUILD filelock-3.2.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
 MISC metadata.xml 381 BLAKE2B 2a49a48af3a92fe1cdf2c124d1358793a3a54f77c81b1548e06ea4ecc98a8043570ed24786af5d750bd6146f79d5ea75b477c6465d12f1d4a29754002de5bdc0 SHA512 252752e2bf29b3530576ab1e8de05cebffd1ed36ea7b473cb6e51a99c9763f8caeb9851a432dc4e84ce96fa653ac08d087f7f275c89bd8e66f8b91348856bdef
diff --git a/dev-python/filelock/filelock-3.1.0.ebuild b/dev-python/filelock/filelock-3.1.0.ebuild
new file mode 100644
index 000000000000..ec08c0f21c42
--- /dev/null
+++ b/dev-python/filelock/filelock-3.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="https://github.com/benediktschmitt/py-filelock
+	https://pypi.org/project/filelock/"
+SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.2.0.ebuild b/dev-python/filelock/filelock-3.2.0.ebuild
new file mode 100644
index 000000000000..5e3fcb6a7949
--- /dev/null
+++ b/dev-python/filelock/filelock-3.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="https://github.com/benediktschmitt/py-filelock
+	https://pypi.org/project/filelock/"
+SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 1bc49686eaca..a6dd3a08b0a9 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,12 +1,5 @@
-AUX flexmock-0.10.6-fix-with_args-sys.stdout.write.patch 2707 BLAKE2B 9848593b70aca7e118c4a787c2e153e15982eb5f403b1883d484bdd2d22efd8b6d9ff2d9e1bb3e4699215e9c15cb0d5cff8ac2b571e6d87aa0186fa416981cd9 SHA512 3ba7f4ae532670e9576e9e060e0e4a1d0530ae7ab4f0e40e6e20e103e64030d2e5a0900e412d3006e7864e6d67976ee22f2067af7611f21f9400dd7c421b0ebb
 DIST flexmock-0.10.10.tar.gz 49201 BLAKE2B f5d77398ac14a002f78790d4e03f93bcd00c016e6a5eb0be45ce3b59a223159656ab694a1dd1124cbac351680fef25084d69e9533d668177ea73b9e458df5b6f SHA512 211939bf40ecb25981a70d5bfe897ef8127ef38d5adf6a48b086c4b6f49b05e1a04f09afb73f428e3eb21a8090ba33ca86e605c2c1ac70d9fc269fdd640ccb73
-DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-DIST flexmock-0.10.6.tar.gz 46740 BLAKE2B b5c8083694e8787e85ff0f41265ad9f716a4c82d274ca5c793b6d93bf8bf28f3e57afd33f7ba59149e75f7bffbebd3843901dfa75caaefc6f76f3eef0c603314 SHA512 2ebaed78926f01bd4d886a509d978d0de04629f7d96c48f846b8ccf7906bb2303e7cbeab8226c6eb98d058f940434144cc2d6300d6aa2533f1f217788211490e
-DIST flexmock-0.10.8.tar.gz 46905 BLAKE2B d5f28e012edf9678fd5f72ec1d99e4e98b00dbb36536877cb393c16563097e0e3f18ab24243f7090bfa306f8be194243d201d9aaf5d64491bb594cff82b60e1e SHA512 cac327b3e3c4c6ccbcd6c7f71863b67fdd5454c13bbd5403b3ba521e3ae945ba453152df623eef08b2b60210ba626447a9e6bad76c2215281d43ae0f42ebf1a9
 DIST flexmock-0.10.9.tar.gz 48466 BLAKE2B b6c73fdb6d281870806db7b34d43d8f116c29ff28a3753e7873868e66df9a34f8f4cfa0c1a7f1fd620a58a46b4376538a8a64994ed82d500a850f86c24fe54d2 SHA512 6e39e5a88b1d744d348f834f4664fc477412f6f09dd2500ef35a52126ce14f9e8d24a04c1ceb16c24b31bc40c3d8276f2efa75a701ecf284bb2cb5388513a75f
 EBUILD flexmock-0.10.10.ebuild 533 BLAKE2B 6b4cb39684e9e1b6d384edb5387b8d31412867ed389a15fc5ef793e1764001ab08aed4b82b2ad647f9b9d94940a416940d3e8db09f333d01fe5f39049ed33122 SHA512 0495922974681c9690532746384032c30779299b37538ad32f125a6d71a00ff154c5a1294faeb3863285263f3d7a07e920f58e4624a82e9ba437787e9b3d41dc
-EBUILD flexmock-0.10.4.ebuild 489 BLAKE2B f22dc9131f02343a598a8b61546184bee128d54de48acd2de913f6ef48121438323a0c7c169ad9c8761628f44923147403761e46c59bc5f302c48ec32ddb1be9 SHA512 e389dd36a35931b8d2a7354b32ab3155e3475f92332aee2040576ade042cf9b30310292e0d0925e61cc647993ab857d3e4ad7ccc12198c080f95e11cf2f1a217
-EBUILD flexmock-0.10.6.ebuild 600 BLAKE2B a7e911d052d43c11540d8abfbc90f9d1b5099455bb4efdfb28652d7c017163730d4a282f7af7a824dd9d961b4defb7bc27a77fbf147ff4bc96d01dc5f38944f7 SHA512 df9f8c7b191d71c69978c19e40d300505c8d4d43712db7af15d3ac9dd12f0b76c83e84ce89112492ae78544fa3c4aa914c1701f7a1515869f4e68b77ca44af70
-EBUILD flexmock-0.10.8.ebuild 530 BLAKE2B bea43bb268613fc8d5f415a867f832173edaca8b14241171db7f2fe9f83678e07fbdffa9d045eac859691a83d0bfa355cae22cb7de9bf57c452054364b737f62 SHA512 e280d71065576bf12e5148cec79257a4c5d8b09ad1449f0cea15243772186288aabd8d14d37f928acda25eaea7b0e03576846967c1f1778563cbf5e232cd1f3e
-EBUILD flexmock-0.10.9.ebuild 534 BLAKE2B 086ab543993378bcee8b681b153d1b986d4b0457d384ab482ebbf104e3dd48f7456ba9b0a0f9735a192d5ce349ba3abc89dd66de43cbf4430f9696b34648f42e SHA512 1786d6f08a97852f51b2d102ec552ba91830c9893cb37a8c53c6959c4169c97b8bc4ec40439c6008a16e0f3e678bb018ca8880c35cadf417bd1d08b2b2a56aa4
+EBUILD flexmock-0.10.9.ebuild 533 BLAKE2B e97351a6ee65337b3a6032e428bada4fa77e017e71f9d9aa77f16177c6365a926336f9ae29833aa009986a68d5ad3335e97801da8f630dbcdb3e2dae70dc17d1 SHA512 e1a15900ae680c915a03a8bc511d49a3661a3fbe94cf0f614dad5302bd42575d8da8e7b7891caa9504899e1198fcadda37db64fcaecf3808a5fd3e791b3a51e6
 MISC metadata.xml 397 BLAKE2B d876f426fea0e14ea3518dcf7cf685ec697bfaa09c83b93ad7bf4ecf97dff87cf1ef491e91d759625ee9c8d7f64c4be8419024ad087acac4779a69c283dfde12 SHA512 f8694424c9fe17611fd882f205df6dbe6085b8214a4f1c26e4d5c216e3e018971f85e643a473efd330d61a7759ab9464f9a7fe6e04e2c0d7e02b1e3ce37aab19
diff --git a/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch b/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch
deleted file mode 100644
index 0c3988e41788..000000000000
--- a/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020ebef66523e9496f8042beb9384f3f770a6412 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gentoo.org>
-Date: Thu, 19 Aug 2021 20:39:04 +0300
-Subject: [PATCH] Fix with_args not working with sys.stdout.write
-
-https://github.com/flexmock/flexmock/commit/513265e731fc4daceeb19123a4e71d652b990a1a
-
-Backported to 0.10.6 by Arthur Zamarin <arthurzam@gentoo.org>
-
---- a/flexmock.py
-+++ b/flexmock.py
-@@ -254,13 +254,13 @@ class Expectation(object):
-         #  - it's not a static method
-         #  - the mocked object is a module - module "methods" are in fact plain functions;
-         #    unless they're classes, which means they still have __init__
--        is_method = ((inspect.ismethod(self.original) or inspect.isfunction(self.original)
--                      or _isclass(self.original)) and
--                     self.method_type is not staticmethod and
--                     (not isinstance(self._mock, types.ModuleType) or
--                      _isclass(self.original)))
-+        is_builtin_method = isinstance(self.original, types.BuiltinMethodType)
-+        is_method = inspect.ismethod(self.original) and self.method_type is not staticmethod
-+        is_class = inspect.isclass(self.original)
-+        is_class_method = (inspect.isfunction(self.original) and inspect.isclass(self.mock)
-+                           and self.method_type is not staticmethod)
-         args_len = len(allowed.args)
--        if is_method:
-+        if is_builtin_method or is_method or is_class or is_class_method:
-             args_len -= 1
-         minimum = args_len - (allowed.defaults and len(allowed.defaults) or 0)
-         maximum = None
---- a/tests/flexmock_test.py
-+++ b/tests/flexmock_test.py
-@@ -17,6 +17,7 @@ from flexmock import ReturnValue
- from flexmock import flexmock_teardown
- from flexmock import _format_args
- from flexmock import _isproperty
-+import random
- import flexmock
- import re
- import sys
-@@ -308,6 +309,15 @@ class RegularClass(object):
-         assertEqual('got an int', mock.method_foo(23))
-         assertRaises(MethodSignatureError, mock.method_foo, 2.0)
- 
-+    def test_with_args_should_work_with_builtin_c_functions_and_methods(self):
-+        flexmock(sys.stdout).should_call("write")  # set fall-through
-+        flexmock(sys.stdout).should_receive("write").with_args("flexmock_builtin_test").once()
-+        sys.stdout.write("flexmock_builtin_test")
-+
-+    def test_with_args_should_work_with_builtin_python_methods(self):
-+        flexmock(random).should_receive("randint").with_args(1, 10).once()
-+        random.randint(1, 10)
-+
-     def test_flexmock_should_match_expectations_against_user_defined_classes(self):
-         mock = flexmock(name='temp')
- 
--- 
-2.33.0
-
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
deleted file mode 100644
index 5be99a9dfb3e..000000000000
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.6.ebuild b/dev-python/flexmock/flexmock-0.10.6.ebuild
deleted file mode 100644
index 67922e50909b..000000000000
--- a/dev-python/flexmock/flexmock-0.10.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-with_args-sys.stdout.write.patch"
-)
-
-python_test() {
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.8.ebuild b/dev-python/flexmock/flexmock-0.10.8.ebuild
deleted file mode 100644
index dd44eb32f8f8..000000000000
--- a/dev-python/flexmock/flexmock-0.10.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.9.ebuild b/dev-python/flexmock/flexmock-0.10.9.ebuild
index 2efe124954db..6e73a091c173 100644
--- a/dev-python/flexmock/flexmock-0.10.9.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="amd64 ~arm ~riscv"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index 5a24c5802337..5a07852cc373 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -5,5 +5,5 @@ DIST flufl.i18n-3.2.tar.gz 24209 BLAKE2B dc827eb4099670c6e5c39ebc8702fcda146b20a
 EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 64c1a3388694297adc6a8389cc8ae038b54f2da974b9a3a330169f1fef7583ecd93444bf3e341f7632e33d9114c188adc18c996b2fb4fe4ff6a9b4bdb41cdd69 SHA512 27bdc802c0f90a11c5b8ccd7e7fa89587d754135cbf7de7168bdcb406906a8c6e2a186a67e726d1ff6eae629acbfe26d29c10d05f60a17575e01467aa38dc7c8
 EBUILD flufl-i18n-3.1.4.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
 EBUILD flufl-i18n-3.1.5.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
-EBUILD flufl-i18n-3.2.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
-MISC metadata.xml 407 BLAKE2B 0949ade491046ec4408e690192f73636b2f6bde7bcccdbf840d65a78599044701c3fe1a78cbc8492b91a87b1488fa6d060764c67f46d8486bc713ac877aa143c SHA512 cd432dd5aeca533626de9177072b7bca246c15c7b45255081ecf1768f274046742f5c6016d474b8481f6e108c5bc4195775f9215151d5d43f9c5df4537ab28be
+EBUILD flufl-i18n-3.2.ebuild 752 BLAKE2B b8399997db0a800c1b3faeb8e0524dcf8c49602e15ebc8ac43aab316f9fbb493bb4c78b9685e4f621bc1066a3d80954c20945fcab7e6a0aa35269be95d2a729c SHA512 e566ae7d3eb337d9230f1cca9612d47c1d71cd3f79caa03e6d04389973db0da9710d444e7bf698c1ba0d46fbfee2ea83431b0ed46f46caac2d1115cc5d5495ee
+MISC metadata.xml 488 BLAKE2B e1dfe22c80f0ca5a7de3f70dfd3bea7c4d90968f572d34433629032cf0a62a6a5906bd977fcb20b26ca8378960ad74fe207e3c294ee9e4e34c22746321531783 SHA512 047efe6af9b2fbff70f85700a2e35d02be1447c530f6f05aea98abb419103533e5b10f47135b52033921a08d534c454a482ce8541c00b40507b1dccc40417bb8
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild
index bc9300e4f4e5..59ecea882559 100644
--- a/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild
+++ b/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild
@@ -3,31 +3,27 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=${P/-/.}
+
 DESCRIPTION="A high level API for Python internationalization"
 HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
 SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
 src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	sed -e '/addopts/d' -i setup.cfg || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/flufl-i18n/metadata.xml b/dev-python/flufl-i18n/metadata.xml
index 6af14023971a..1a10d853e8ed 100644
--- a/dev-python/flufl-i18n/metadata.xml
+++ b/dev-python/flufl-i18n/metadata.xml
@@ -8,7 +8,9 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">flufl.i18n</remote-id>
+		<remote-id type="gitlab">warsaw/flufl.i18n</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flufl-testing/Manifest b/dev-python/flufl-testing/Manifest
new file mode 100644
index 000000000000..a447411f6b80
--- /dev/null
+++ b/dev-python/flufl-testing/Manifest
@@ -0,0 +1,3 @@
+DIST flufl.testing-0.8.tar.gz 8754 BLAKE2B 9465f3e1d98c324cac38b06b80d44d050a260d26dae9df5c59147284a0f0cf4c460a3d0048f834bf479c58eb7a631eefd4146a82d490552f6e46e7c9cd96fff2 SHA512 edf491db72cccafef58e08b810e4c29962d14716cda3318a892a3ca36095b95477e7564aa4fe8eb4f3bd7cd9e7896f82282dd2d3a67900932848f1dc265cea61
+EBUILD flufl-testing-0.8.ebuild 604 BLAKE2B 79e2e3a5470f715795f68d42e5dc377b41012366520064fd8754b85ffcf8552b69b1b9eb015b28cb20a9e95e51b7e0299e91f16f41b49c745787d2933960a8c2 SHA512 bd94e640a44132d2fab586ae4f65204fb45c64b22b68418b971adaad17e1fb1b6c5e6c203586d77d678946be5a33f8e2a7c448a1370422442831d32a34b9b8c5
+MISC metadata.xml 401 BLAKE2B a1f9f6ec9349ae83015fa3c44f87518eb5d39baebf3297588b436ef801691620feb2b952ecbad2b63af0fab2a3f799e84f7a26a1367c46f1d45a42415bfaf5b0 SHA512 a0db73e0e5862fd114f44165f5407c4c47498984e86e9cde0c357702518fbb04b77322111f721823206d2312acdc133c442993c43538bc4696fb347012335628
diff --git a/dev-python/flufl-testing/flufl-testing-0.8.ebuild b/dev-python/flufl-testing/flufl-testing-0.8.ebuild
new file mode 100644
index 000000000000..b2212bd8e62e
--- /dev/null
+++ b/dev-python/flufl-testing/flufl-testing-0.8.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+MY_P=${P/-/.}
+
+DESCRIPTION="Small collection of test tool plugins"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.testing https://pypi.org/project/flufl.testing/"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nose2[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/flufl-testing/metadata.xml b/dev-python/flufl-testing/metadata.xml
new file mode 100644
index 000000000000..27c3c91f4ce8
--- /dev/null
+++ b/dev-python/flufl-testing/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">flufl.testing</remote-id>
+		<remote-id type="gitlab">warsaw/flufl.testing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 1176c375abc8..167c07d316a1 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -7,5 +7,5 @@ EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc14
 EBUILD fonttools-4.26.1-r1.ebuild 1427 BLAKE2B c62b3b17b4516545f4bee4b397cc820ae8e26c961a36c629bd2d2a441c4a009771a3e4ede7a6b001edcaf334ff559625ade032b9ad0fba4503d0888ce48979a7 SHA512 3dcb2fb10e9d2242ae4692f3fb546f505d082be6196500fa3cbafe2ca3649f7b52377014a4ab47ed3ffb6a82b0d8cf21fa87842d782f1c7bc38ccaa0063d6b63
 EBUILD fonttools-4.26.2.ebuild 1420 BLAKE2B d5a6cc59110e2f54e574548d7bdc0fcf5562cdc96995a3de925936caa21e0a880b68a26af44621c663f0752e9de50ecb3d01a5c955b2815227031dce15b9eb7a SHA512 6b2e16bef894169a40621bdc29fccbd11c5e177e0ae6435dfdcb7fc27d59136700f0fef2f2f39d84dc88be1e5b4efbe0b312c5449427bfd9d881353dbedaf65f
 EBUILD fonttools-4.27.0.ebuild 1427 BLAKE2B 8d730ded280eb850ea0f612179938de25fdec4131c9e22e76f97288d4f87fdb1b72e3d76eb7bbd77b444931dae16e323c012d118774559c64ce290fadcf27f39 SHA512 56c2e4a315ed59e7ed2473504ce725eea14b893abfe8d3e500d06a8d2068e4fda8eca05ef2d12a865355f51b98b3bb74a92a26e005b6d0b31e4b0deede8c927c
-EBUILD fonttools-4.27.1.ebuild 1427 BLAKE2B 8d730ded280eb850ea0f612179938de25fdec4131c9e22e76f97288d4f87fdb1b72e3d76eb7bbd77b444931dae16e323c012d118774559c64ce290fadcf27f39 SHA512 56c2e4a315ed59e7ed2473504ce725eea14b893abfe8d3e500d06a8d2068e4fda8eca05ef2d12a865355f51b98b3bb74a92a26e005b6d0b31e4b0deede8c927c
+EBUILD fonttools-4.27.1.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.27.1.ebuild b/dev-python/fonttools/fonttools-4.27.1.ebuild
index 925c4733a1ac..b98e2fa9734d 100644
--- a/dev-python/fonttools/fonttools-4.27.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.27.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 54aa264c2627..9a6230107ab9 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,5 +1,7 @@
 DIST fritzconnection-1.5.0.tar.gz 71597 BLAKE2B 2c0d27cf91550a7b7f0d3c56f115dd174995af4293d6dd91ee6bbfaab2f3db7c8e4a2297d83a5d6a5219550ee9397c0b1122260234b6fab4589e15c34a381f21 SHA512 2fcf84c73af146d0422a9e32364562e4cc9d6992f487f40f27eede4a571c4dfa37c92a6bcd5ea49da144585657e382e648e0fd00a15f78646da5abb5060eea3c
 DIST fritzconnection-1.6.0.tar.gz 73672 BLAKE2B 25f6b876026bc70397dca171c90d863b4dd3af81f4f3f26bd9a34bed9241c716e98e1305adcbd87a1aa52a21fd6517eda21db0cd9d02d8df5db143ec0f60f5f4 SHA512 c4517774be0913f71e37e982dd87a7076efd81903036193ff37dc2ffd5530829f5f860b773c2b107ca6734ff1b04009243ccb8b2857261911b5a7bcf6e6a528f
+DIST fritzconnection-1.7.0.tar.gz 77787 BLAKE2B b3f9657153d9529485cf18c6f3c18af74e596f9831b5a57724bef34eb54844b52dd4c417f1e93974e24fa376ae42708708e160ec4ddd0f0fcd9131b6346428b5 SHA512 9df2afe21e5e2f410bb3fde2329c1b354c429b0d23095fe55e53566c7a6dc79f8cbb092666943efceb2949cc2fc904bc473266ab5ab3518da13228193a476f5a
 EBUILD fritzconnection-1.5.0.ebuild 763 BLAKE2B 37f9d065adead3e17392aed91e3ce95149a1cdcbf796f27d26a17acd9a4cc6a447738faeb2d87e113ec60fced37716dadf381f3eb0b4bdb5c28c0ae2ee957891 SHA512 44ad672a74f14714ddce9b6294a1d8a53a84a891a343bbeb850235a3f6ac6b6876cc3ac5a083797ae0cf30584a65bd5f6a40522f33d50421fff41fc2a1157288
 EBUILD fritzconnection-1.6.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
+EBUILD fritzconnection-1.7.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
 MISC metadata.xml 456 BLAKE2B 4dfba055d7915535f8244669fc083d906366209ea857f71e34c6579f8b0c14e31db6cabac34897a8baed2189199c303dc29a1fb06a9a11c0f993513877192e33 SHA512 70692ccf90eb73e8bc884b2b75e580c9b20a91a988387696f76258c183df2623c55aeb02a34389769c34a3fd997f11d5bb7feb93ea1b497f58c6ec60cc60e71f
diff --git a/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild
new file mode 100644
index 000000000000..00eeb7787fd3
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild
@@ -0,0 +1,29 @@
+# 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="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="https://github.com/kbr/fritzconnection"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index a32de7f1bf26..f316b53b39ba 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,3 @@
 DIST pyfilesystem2-2.4.13.tar.gz 176958 BLAKE2B 154761ddc4db087abdb294ec82ac5b18c46e05f04e783559f3b4d65cde21b9444100130c29d1051a3d2b177f5c9ef7299806fcce1ab3a4b0770b4f1c156abd71 SHA512 c07bf6a8d373a11019709ada392153dbf953399631fa388433f9b7b73d9ae1072ea70b8ed9896752161a4737a399520f030b7875dc23137f418268c5acc24f48
-EBUILD fs-2.4.13.ebuild 1337 BLAKE2B 3d5c90acbc73636e21758439905b43780a2dc52835b072b20dab4c27a3543310c4141d77022e585dbf1f0506b619df50e0422cde1f43b99287fbf9914725acb1 SHA512 b3318e1b359a5325bfe65b4e4c5dce99d2af1b3a598919eaa6bc136b343c7fa85eb3a322a6c6c7d97fe8a3971fa7e600c957c4662c5cbe7cdd62b12445fed5f3
+EBUILD fs-2.4.13.ebuild 1343 BLAKE2B 751ebf27982335eec6f490225bfe9259d97d492441af66ae24f25e51792ebdc7670f144bafbd1447a94f4f279e0e29f6fe1f069b357a174b0c5fbb2efa602211 SHA512 aabf6bd80098103944e2e89e2fff7d26a35773c18ae48c54fba0f06138f1cfad500a91e77e7c87f2e6f5415fc3e1421e42a6f47bcbb4250da556fa23d87f4ce6
 MISC metadata.xml 581 BLAKE2B b3fa399e172b10606f13b3de4fb0afbe332e7234b3163ce198b30cea2d4c24967b0943d578085dfbaada503700f70015517d01e3f3a01ddcc4795e1821d1a5ce SHA512 3d3154db8e81f2764f99e2595a99a34061762a5cf16695926e25407859f20a59f4dbf60b0d8e18fb80d90c6342f70cc6a2c886841bf156ae06b17a670a4987c0
diff --git a/dev-python/fs/fs-2.4.13.ebuild b/dev-python/fs/fs-2.4.13.ebuild
index f3878bd3acdd..62a53439c0d8 100644
--- a/dev-python/fs/fs-2.4.13.ebuild
+++ b/dev-python/fs/fs-2.4.13.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 679f3d8b5cbb..965f959b61d6 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,13 +1,11 @@
-DIST google-api-python-client-2.14.1.tar.gz 25415625 BLAKE2B 2b843a6ec6345e51c5a92c0285c2b8ae195928bec61b73033fbc64d8e55c34ae39d8d542534d89edac36d6ddc6c12b6acf11a25dbcbc06f72776799a70606659 SHA512 e22600b9b87d646775780d0f45043753e4dea24e898faf16ae49f2c91677282700b45de993d085923c006f2948747a6afa2e58b38f42f934f1602401faa30d22
-DIST google-api-python-client-2.18.0.tar.gz 26442309 BLAKE2B 84f0cadeed015e9e0cafa209f6256b6262822f7161728aa5eba88f0def718b11c555bd0d87867c1e1ebb02e93046cec068e4ac0f855c55b7abf34a8d51d42fdc SHA512 19b06a252c440d5bb8454fc79487f4009ff73a7bd4882b2d33a354d4c4f287a6ea09f30cff94df4c1d1e898ca237d8e118a7fd5e63022133338d944dcec1243c
 DIST google-api-python-client-2.19.1.tar.gz 26659303 BLAKE2B b1b5064c39b7e0d31e7ee01a7556a9ea6feaac1782d6714e50a32f0dfafedcab59628a1ff32774c426136d7ab796a1a6baf1f9ce7fbd1d233149c3a62648f280 SHA512 85272cd0741caed6ff76b930a69a67f1683886df82681b49f3069243dd40ef3f12febc7c1004ecf230d96bae005a8725d502032a9c85eb1bf9e4ee37af7018b9
 DIST google-api-python-client-2.20.0.tar.gz 26723285 BLAKE2B 3c0cb64ea8c58fe20356cd097676bc7741ea454e61d9dc8807689fe2296c3ddd0da1cb208a639e8b47a981437dea39de9a7c26b669c7dc27a79a0c5ca4a6c463 SHA512 bed0b1a0e0c5384c80e337339e9c5526e0cd5b2d39a3bd69fec1c65a3fed5bf26e6f4f983daed7663d2cd6c47b8a2a7ad54395f8e5dada2b49c15d98a9ff04dd
 DIST google-api-python-client-2.21.0.tar.gz 26754841 BLAKE2B e09b48d80d72e56656b366bd60972cde91d0c705ffe94b61d168e808e575a42f1dbbefdaf21ead1e57bab54a1b2453ba39ed5ae1d2ee616a5ba1418acc9f7534 SHA512 c572e5eab313e01ae94b026e32cf40fb479154942168cc09f2b74f184383ff5fc27cc5c0ae48c34d8ddbd8abe8840520a62a43708bd601341d5b32460f5f07df
 DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
-EBUILD google-api-python-client-2.14.1.ebuild 1520 BLAKE2B ad43947e10809f1a66ada6b8052a17c94f7c6190300cafc9060c01b83e9fd5e99a5f55e7e06f39357e9b4b266f0d605bc7e6566e67c712072d025b6ba9b45f8a SHA512 f0c1426f204dfa81a0c2a6bb013cba52747e72d56f63259092f2473ec4fffd0ea4e490272321246f50826cd6e3a647be575cf58147cee662194407df66810492
-EBUILD google-api-python-client-2.18.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.19.1.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5856c7b7683ceb7bf6f0f65400b2407195be7e30a0982288a0f7892e70b659c0984823d5dd0c3d4115eb781643a584091580ac1ed480b4 SHA512 da8515a0db759cfa4e9b991fd04811e9d213a35c184e993e2439e00860ce86857c2968da75dee3ec755a2f679ab44219d4cc1ed817e7ac24664e667412205566
+EBUILD google-api-python-client-2.19.1.ebuild 1520 BLAKE2B c5a616793b25aa16ea7c56fee7e10dc489c9b6df073ad005f84c878f4be03f3aa2226dc81e1daadeb3bee337db1b786ac1afd300e24bb60ec50c208155933464 SHA512 4bb53282f81960a6dc2bb75a271d815113b01f3678e6fbb21760c2520069c6a5107fac50706a34bec4dac0ef94f6e1ae96cbd4872ac8eddbedc3b1ab3a570463
 EBUILD google-api-python-client-2.20.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.21.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.22.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.23.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.14.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.14.1.ebuild
deleted file mode 100644
index a03212659345..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.14.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} )
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	find tests -name '*.py' -exec \
-		sed -i -e 's:unittest2 as ::' {} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	epytest tests ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild
index 2bf8009bdc63..d5db76b1bdc7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.23.0.ebuild
index 2bf8009bdc63..2bf8009bdc63 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.23.0.ebuild
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index fe915719977b..dd4364f56bfa 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,9 @@
-DIST google-auth-1.34.0.tar.gz 180860 BLAKE2B d536d689ff5b0c033f787228d643504d1888f0b73a9c6855fe4fae3af20772ef0640feca39c58c39f45681561dce6d5f3ec1d1f7d9699442fff0ec63fd019361 SHA512 7c3b64e8f85056fb660bbfd4f737053813a1e5b8aba52290882a0ddb9d9fd8c5365b767c78dd1e7859ef95caa6e653786d5a8747c8792bbee9c6fad1a5218910
-DIST google-auth-2.0.1.tar.gz 180467 BLAKE2B a7490931ea8cdec0978103d9bb4da11bebff1e623d847db5fb30a0a7ef1827902b4d5683835631b645e61d4282614e3efc798bedc13a581ba35d51838a64ff96 SHA512 a68f78a7d67beb4d3d00333f6953decd92e1d346aee6491c401ee091d2fb4bbac47b9ecc46f7063119724a49f15ea13c096994e5266d30975500194b9c4a9df0
 DIST google-auth-2.0.2.tar.gz 180445 BLAKE2B d4e9e7dcfd690f5eedf301e989c4a2dedf509e7c3068e4f547ea43f870979a6001d21849a7102321f6f843196f0a4e0a14f888bd3b43701c301aea3a7f94ed60 SHA512 b8cec2fec4105715edad3242f20ac26b7ab2591903785ed5c31c1af19f7a23e14e93e0d4c3644dca76db5ec0353b8a1baba0224d67987067c5580c75592a04e8
 DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
-EBUILD google-auth-1.34.0.ebuild 1444 BLAKE2B 3d2e22bfee368499cc5795a300373dd221299165cfd0ffb647d3402ddb2f300276c51f0f148df94a4cde203529633d4dadeb329e36d9eeb328fe9b127f8a5a79 SHA512 a3ced8db4c83ae70017801663ef0cddb3208b21ed87ee353b6e22639b345a32457766122b4d3bd8f93a455c54a920dc032de0c2c1eb50f247747e236b84e481c
-EBUILD google-auth-2.0.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.0.2.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
+DIST google-auth-2.2.1.tar.gz 183909 BLAKE2B 4c18f332f068573567af5100828b3902db17e46c47087569386ad3b012e45ecb841709376fae7f14920e3dfdb0124b9fd002b670b565b9c641dc9ff4ef5cc507 SHA512 245e6b8d27ff49e47093dc2f50e97a57031c93090900b5578a91ab335560b7fec1aced1faf822826263a00dfaf282eb147a4e389c13546f2e34d09f1ef1ca285
+EBUILD google-auth-2.0.2.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
 EBUILD google-auth-2.1.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+EBUILD google-auth-2.2.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+EBUILD google-auth-2.2.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-1.34.0.ebuild b/dev-python/google-auth/google-auth-1.34.0.ebuild
deleted file mode 100644
index 8750bd770698..000000000000
--- a/dev-python/google-auth/google-auth-1.34.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-2.0.2.ebuild b/dev-python/google-auth/google-auth-2.0.2.ebuild
index cd44f928efdd..20d8750d0310 100644
--- a/dev-python/google-auth/google-auth-2.0.2.ebuild
+++ b/dev-python/google-auth/google-auth-2.0.2.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/cachetools-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.0.1.ebuild b/dev-python/google-auth/google-auth-2.2.0.ebuild
index cd44f928efdd..cd44f928efdd 100644
--- a/dev-python/google-auth/google-auth-2.0.1.ebuild
+++ b/dev-python/google-auth/google-auth-2.2.0.ebuild
diff --git a/dev-python/google-auth/google-auth-2.2.1.ebuild b/dev-python/google-auth/google-auth-2.2.1.ebuild
new file mode 100644
index 000000000000..cd44f928efdd
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.2.1.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..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/cachetools-2.0.0[${PYTHON_USEDEP}]
+	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}]
+	"
+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/greenlet/Manifest b/dev-python/greenlet/Manifest
index 55fec784b5a3..ab2165e4e87c 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,5 @@
 DIST greenlet-1.1.0.tar.gz 85043 BLAKE2B d9f5eccfe2dda528e5bc90bdc9c3992517b42c7d5f9d5549590b8f94003f715921585fa01219eea0348d6204b0109c4e342657fdf8150f09cabd2d6179e6e9f2 SHA512 13547917860d9a19f2fab519380121805d8f7801ad47b1584003833a5de66eb703373c71e67b32f13b770d429bcee6856b35bc6fc8afb7be598c2bf509bede03
-EBUILD greenlet-1.1.0.ebuild 635 BLAKE2B 6e1685014cb2cdb60d1f86174678ce1611085b202bb8328ccffd67cff793a5aac3147ce18ab6b53a0907effe0e76fccfc7b879e3b50b34bfd271f5fbc1df5f53 SHA512 87d324a03b09e67eda60f51059ad537d2f05d88f9bf42eb110da9eeefdb61dd49b43e0a676c5daad956e600348fb51f65e2aac234d06eef6a167aff82f100067
+DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
+EBUILD greenlet-1.1.0.ebuild 622 BLAKE2B aab3a554321ef71ee14581f7bbb1a1557785a652e9a3cfdf9d63c4c7df02a8c54a67e70d3b40c3cde3a740e4205385a19fc2a19349536c0bc19174913d51f7e1 SHA512 6ca8275677c0571c45f0205e3d910397240227aee3ae7058173d4c808905753b9917ee15371d0fcc1b277c76dedc4bc22d0eb96013c5b1f253e54dfb4be82a1d
+EBUILD greenlet-1.1.2.ebuild 629 BLAKE2B f37ade8d44c202331898c8b14d0614779ae8c52a02281264f97f09e09e1e45de1cf90d827dc03ffefcc2a3004c1ae0b2e0dc3d65ef4cb5a5672b669c68125ec3 SHA512 b5fa22fe7d1e3aa80083e3a3f81395fedc5a1b6912b3c9384e2dcd5d025e5b875f29b44dad0ab9e06086c9a1cf00dbb8a65a57dd561a510b3b817b1a71fdc148
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
index edf429fc6b2c..072fc6423b4c 100644
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # Note: greenlet is built-in in pypy
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1
 
 DESCRIPTION="Lightweight in-process concurrent programming"
 HOMEPAGE="https://pypi.org/project/greenlet/"
diff --git a/dev-python/greenlet/greenlet-1.1.2.ebuild b/dev-python/greenlet/greenlet-1.1.2.ebuild
new file mode 100644
index 000000000000..c9476e6d0222
--- /dev/null
+++ b/dev-python/greenlet/greenlet-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest greenlet.tests
+}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index fb1130713baf..eb1e328bbd38 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,4 +1,4 @@
 AUX html5lib-1.1-pytest6.patch 7489 BLAKE2B 73117fe1e75647760d8ccaa7296b8726d88dc11252d1dd23f3dc60ce28d7fc86dd724b6ee1e6756f937eb78ea7f684a1be9ab0783621971d252fb1f4b8fbae75 SHA512 d1a8642381bafb00f7b682ae35a01168731893e44ae3509ac36d3bc1d65ea48e32099447de9c09113da4ba1d0b6f969260c199c056f145295caf1bf985dc8a54
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
-EBUILD html5lib-1.1.ebuild 794 BLAKE2B c01514c4b88927b168e55727bbebf6efc09216801a6d7089c3218e798acd9897ec0799c28177a0f05a308e8b05a0b4d15cd15504c70a48375a0d321df1ef3abd SHA512 9818dfde1bd6108d6c2efd0ecf4b5d71dfd7730c597a2cc444f59f05b392b2d9c815c61339e2a4a4bca67b0bb47350f87dc069e18c7da73a3f0489ba0348417c
+EBUILD html5lib-1.1.ebuild 800 BLAKE2B eb64baafc106f735315b0524f4e2fd163094f11ea66ca03f671b80ac0fc4f014299ca7438677f2ce173328c1fba0674df0d05d28246b2e8bf36c41d922bfb7f1 SHA512 30022083d77663113b07dd4dcae368e79b914e02dc8cc9d2b9246fda8a186b5c851f5a26a2954153965b176b8b76fd26b1d5ff8584450111b8105ce851f1ad44
 MISC metadata.xml 615 BLAKE2B 534717ae2665116fbbac153e8fc0fbe00bdbfa85e499dd0b6ba904dd4f901e5b68260c560ca324668db56c5037c2a6fcb02736627445d1a9385a1304248ae5d2 SHA512 88059bef419527523f3e7d6a7ad12bc54cf45cbc4b634e73524bdd94afb7d4c3b6ef684cad8649975e4a705d52f382a3f0e9860bb0378fbcadc0024c30071ca1
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index 3fddc1546717..18e0d1b351b5 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-pytest6.patch
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index a6c9b58e1271..e5c8f7784153 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,7 +1,3 @@
-DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
 DIST huawei-lte-api-1.5.2.tar.gz 31969 BLAKE2B ced0afc9c1b878d30ac4d3fb731cdebd6c2a658a7ace7d74f5e3641c049d5eaeab5fe1edd4678b791da0ebd22c78c4c7b10f56e2bb4f224788d1f1cdd8f31c6a SHA512 7d7b8b0248ef6080aa990ce06e196653f315605d771c312c490976cd950dfa962affe47f8df3366a645e0d499606514618e1e24976f434258ca22bd9ccf34237
-DIST huawei-lte-api-1.5.tar.gz 31741 BLAKE2B eded2f2ba04dfa8973a5ccd627996770b93e2509aeb2d0ff40dafc9a5ee0f6d242d032d310102297a1f56ee255b10f0e6e02c3a0ad687b6006e31ad8b53fb32e SHA512 f235664464abc23da85a36b17f356c7be65e686e06bbaba9aa06c728fa04ae5ab4fa32168c4fb2914a22472564d8f3365f9fe47f33e1892f923e6934dbd692b0
-EBUILD huawei-lte-api-1.4.18.ebuild 727 BLAKE2B 60256ea1a5c5a1b3df80900537f46c5db2c2708a58ae5e73a1682c7a548fbe6bbc2b390e2d67d9036ffda63880b78f6a9e049f8a8ec73ad9b92d26ad64ac006a SHA512 f92c89bd54dd7c9fd7dbd3c2ff1498f9930dcfa5afb4baea9895c21574fce444ee937b33cf9c6aa8ae696bfe43e5a453fe36ebe5add4c22da5318f40abd46e9d
 EBUILD huawei-lte-api-1.5.2.ebuild 731 BLAKE2B abda1f70d37413686993f5c5f62439cb4f9485ec58be630024d2743b6c0a2d75bf600cf72b6e2656cac6a6ff0b8bcccedcdd870ad1e0c95ea71966d258a741f7 SHA512 02d27058c175b4f1bb6fad1eda0636540a2907fe231a2342426b5ec99ba4f17882730ea775afb9c3c1169684c082680df4cbf9e197a6e6f00837961a4974ee5d
-EBUILD huawei-lte-api-1.5.ebuild 833 BLAKE2B 8e4496bc1a7e4f5c27e9e2d398dcb72fbd6b3ca0c1770a809dc42205f1669ef0700bdc620177ac2ed6bb55d121116b01bdcb1113b39575cfacae1cac7d6468f7 SHA512 418c879eade8acc0e0d909b2499c12f68a910a9727bc3d767f2d100c7a39dc5cc5678eb1b8c16887ce6aae42d0d267db336632781345085b09bb0112c596a919
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
deleted file mode 100644
index 811235dd7a55..000000000000
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
-SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/dicttoxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# https://github.com/Salamek/huawei-lte-api/issues/86
-	sed "s:'pytest-runner'::" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.5.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.5.ebuild
deleted file mode 100644
index 70850fbcf204..000000000000
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.5.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=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
-SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# https://github.com/Salamek/huawei-lte-api/issues/86
-	sed "s:'pytest-runner'::" -i setup.py || die
-
-	# make cryptodome-friendly
-	find -name '*.py' -exec \
-		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d922d6699669..5a05a8eef6ea 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,11 @@
-DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
-DIST hypothesis-python-6.14.9.tar.gz 9138640 BLAKE2B 3cda0edace7b3a1c373bdd61267013874fe78ae18aa7fda02759ac451f7e576614a61c3ce1d588e24afe4333f61680d89eb30f6f055e41fee91312c791b1af5d SHA512 a32d4f09ae6a44354d136164a517ea53c653fccb3e21a39ac63df78ebdf695c887f13749d2f310ac67863b6645a85dca73ef0bfab077aefe0486e445f6a85dce
 DIST hypothesis-python-6.17.4.tar.gz 9144209 BLAKE2B b110e355b34f386c51e9edeb2589bf11e5d0b574ee7e97437f9eba9ec7d8e823e68ad1e4f5911a1e78f3d5a316f59056301b0238c4b6a8cdcb21e46ea434686c SHA512 95eeadc1655d249008897035660af54f66e8ea78fea78d1069dbddb979505e003d1bdb971371769e90af4a7bc5f96ee0c42a6c14bc42e56677d4f89f39985d41
 DIST hypothesis-python-6.21.6.tar.gz 9166313 BLAKE2B 19ac66c1674be30e14d54faa61244ac6da5b67678da4c5dbc728fefcac2e5f0a99c31f7cbe6fc4bc8738e1b072b4accba6f97863e6d601303d4fd69d4ccbd96a SHA512 454434f37dfc3f171d1865ac72d58821173654fabdd880c1b699ea0ff281405644bb1b370129843d35368cd9b6eb06fa00458e0aa41b2b7dc0b7e05e7f659a5d
 DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f25743793de4de9f2676cf7c36c16519f5fef007f6b677bd5ef84fa975389c5fea9989dffffc8a18923699c05fecc23ef2e4dc5e6 SHA512 92352a7ba13d8a06532c6fcdb965f156c43369f18ba7c46808d9b6dde1ccdd5b4f938c1ce575d5651835bfe981d22e7a68189c93a368420c915f5d1ce9b8a205
-EBUILD hypothesis-6.14.5.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
-EBUILD hypothesis-6.14.9.ebuild 1975 BLAKE2B d95fd7586f9e56b1278f919599dfe53d6cd8c334ceb0c85e518fc217aa49179c8861817619c6a8fa87d9190103823a77b5dca4da80d88ddb80d4d317a4550861 SHA512 ee896bf82cad50a865d0d479fc23870e05a6dea0b61d077193c22ac25d91543fcb63f1363a1d43db0b79c1444bf2963eeee79047ba02474d215b3cc81dd54e22
-EBUILD hypothesis-6.17.4.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+DIST hypothesis-python-6.23.0.tar.gz 9166945 BLAKE2B 89d8a642262dfcbd36d83343c5e632653808711e186f5afae360e870eaacf050b415fd1abeb589b375136f273a53a236da8e4ab6227d94e16c58c8e9d0d3d8a9 SHA512 43d5f1a21d555e2a7942414cfb185e9201d9c5198c12551db7a50f3f118fed4dddc934767a0e7d880dfd044ac1a062b64afc92c5c3f391cedf71b829e177f21d
+DIST hypothesis-python-6.23.1.tar.gz 9167114 BLAKE2B 324df90b9fc09dbaf599905b503119eed22ad32898d118d08cb5a84cbb3a514d0bfea51eca0c9878f3a330702d4822c5c311e9c6e091a6baed51285d8d326c5e SHA512 2d6a10ef6b47e0bc08c90aee62a9f009c5bfe7d64bc6f87fed72232c40a43b86e0ecc744527a611f3cfec571051c4bef3986c4e1970f92526e70bf7f5e523519
+EBUILD hypothesis-6.17.4.ebuild 1754 BLAKE2B afe7c86d0907a4c0500ff94249349431c435567753fba197261ce9bceedb03da6ecab286780b66ac4c83361528fe93ff4422c8615bbc6ef20faf289efaa3dcf6 SHA512 b3199308c4981d523366fb48c5d6bee4e1d0eeaa3e9854627cdd23b5d81d22ba4bde02b2669368a5d8bbcccdfb3941aa692c78b18524e907d70c24470e284385
 EBUILD hypothesis-6.21.6.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.22.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.23.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.23.1.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.14.5.ebuild b/dev-python/hypothesis/hypothesis-6.14.5.ebuild
deleted file mode 100644
index 9a316963749d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.14.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/pytest-describe
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.14.9.ebuild b/dev-python/hypothesis/hypothesis-6.14.9.ebuild
deleted file mode 100644
index 5a04d107e65d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.14.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# disable autoloading pytest-asyncio in nested pytest calls
-	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, load necessary plugins explicitly
-	#local -x PYTEST_PLUGINS=xdist.plugin
-
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.17.4.ebuild b/dev-python/hypothesis/hypothesis-6.17.4.ebuild
index 119bf66a0917..a708f1a69a39 100644
--- a/dev-python/hypothesis/hypothesis-6.17.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.17.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.23.0.ebuild b/dev-python/hypothesis/hypothesis-6.23.0.ebuild
new file mode 100644
index 000000000000..119bf66a0917
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.23.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.23.1.ebuild b/dev-python/hypothesis/hypothesis-6.23.1.ebuild
new file mode 100644
index 000000000000..119bf66a0917
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.23.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index dff8e525a242..ead5941e7d26 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
-EBUILD imagesize-1.2.0.ebuild 522 BLAKE2B 9f6b100ca6a1a499a5a812ae506d723bcf1378ebc307dbd5e15b010a4ff32b1755702fb50c1484e6c4356ea2558a4c93a12ddd8b834f1238a991a6261a3f43d8 SHA512 11ddb721a47c0a222c6e3d4ec644bddd6f34debf46b3a4490a7baec0175106a7184fe40856fa60810e8b94704b498e9e09abc64c68a3b371b7fc29d49fa463e1
+EBUILD imagesize-1.2.0.ebuild 528 BLAKE2B 15359bd94c81ef719bd389ca99b5ee985c94baac275e97690ff7692874a573ff5d0442054c696f790918d8d498a56bd048335c63a2931775e2b0090c28522fa3 SHA512 6b6991a60ce0c08789c6f23675f50c4f6b4f095cf469b9917da974ff8fd47fecb4cfc94c48157ef52fdcc707b89602017cbd8b1556bde9ee6f07b4ca01b066ca
 MISC metadata.xml 484 BLAKE2B 9edce43c0b06aab59a3094cbe36b90393bf5d0a0eeba9bcdea7ea7298e7d42c2cbfa19ce8bb544022e01124743d877646709b90329796d77e916283398aef3ac SHA512 85d73b13ce95d9647d1afcdee5979fe2802a04cea213468c7d7714b976e191dd59715a93fa522dcd2646d33fd27a43911146c28dc477d9d34cd56cf42cc3ebb6
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
index d4bb686c0269..e02aa0afdba6 100644
--- a/dev-python/imagesize/imagesize-1.2.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 507345f67e1b..3f88a06e25b6 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
 DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
-EBUILD ipykernel-5.5.4-r1.ebuild 1443 BLAKE2B 2b421c69ed3393eeb863353969ce710f8164ce54678ce3c685dd916d97f58974ed826bbc9982a3f2833307cd097d421ab95b0dc4d61ab81a726ddf626e98da00 SHA512 cdd5d9edfc22b4953160e88dbd88c9a9e75a44c35925be414bdf38d63b99ee0119711830e45651e529261157df0e2940ce5805a2a703abfb4866afe055eb752d
+EBUILD ipykernel-5.5.4-r1.ebuild 1442 BLAKE2B befb1691f7fa5e80845011c47c77531351fa67b775fd558327c277ba551a74973da07f2d2531795d2e53eddd504e824d3618e78c8602d137de9eef2aab55fba2 SHA512 92c850c80ccf686b0dc16f447ff56aa042fb09ffac5bb62765ab94744060a48ef3ce09fd2ccfa6d09c05ed3e1d4d9524efc680b0b3a861c5f0fd1a27d4a90371
 EBUILD ipykernel-6.2.0.ebuild 1285 BLAKE2B 8723f468ab16284c60a1ef1eaa1508055b263da422add975d2d1e1282663a9979af29587dafc09d66572b820c703739110a486e25a06deefad332514731de6f4 SHA512 9acbc6fc3fb76bd40c755d6993dde68b37f566dc2d2d55eafa3fa4d3e70f507296f22040a8812f92ae0092803278642968d0f52220b520895dc170beb4b959ec
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index 18a8e721c2e7..ee57f42cedfc 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 96d8a2e126e0..411b43bf029e 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.26.0.tar.gz 5147847 BLAKE2B c0cb45550387e47bba6ea67656bbb4561a2250bf9c39b4560b26a8a9e380061f79c5fa663f90df166af1fa49811cb59953fb367b2fea5f07d44ba3f9dae3de44 SHA512 142ff8ebddd61640e6ebff01d16b1310b6370643aa8cf4c7fd076872ad342949a1778c5ad74eccbafdc6b4d31a1849e096d75a28eafc555d629948db523b4776
 DIST ipython-7.28.0.tar.gz 5150515 BLAKE2B e69b2ca9b788d8bcc12fb1b82c2e3f198ba4cf1918c8d8d30aea9a1ee3c7cea99ba3ade8ac7171466f1ffc8771dafcf5980766ecca7b985e07890e229cd1575d SHA512 227645ab2cc698f6f7141bb3712b254d75beaf3f227065530f25f988ac76b5a741752ddfa6bb2816b625eaa4972d434f9e73dbe465654e4efc5420b5d80650cb
-EBUILD ipython-7.26.0.ebuild 4215 BLAKE2B ebb124ad9c69acc70e1359d435b867dfce9987833a97e34026c449ac2d384e425ace3e326e2caa9cac66044cb0a3d6346feb8a07a4ec190315754aec493a3c93 SHA512 59abde0994606ed611145d415b4f3474f571f47bc969d35eec3d88c6e27efe4df1babfccbf1ea3f7a7f95facf6e5de0876a6198972a37032180ef43c84a2f06f
+EBUILD ipython-7.26.0.ebuild 4214 BLAKE2B fb571e9314f3afdc33698227e21d070684666393f6ad0c63a7d094b3303574bd9e9929d7e5089952da2021ecf056f170f3aafdf054a7ee56512410efeef76ebf SHA512 69cdff9edce9e452ed99da47406591a1d8f485000a1c3fae9ec03fa10bb19b9d00b13d5f6478781a044b050f3a8b985369538511a11ea4632464da701f10465b
 EBUILD ipython-7.28.0.ebuild 4465 BLAKE2B 7d3389f0febcdc41f95b299ee8f8879a60a5388bbbaa4616d6e5a562cff671e3118220f46508e9872e005b7f465fbdd7ae82c468008db9ccc4cd093bc3ddc2d7 SHA512 58a51548a7d45ceca17581bbde4586af37c3f851ccaafe2ea90b862ee225cfffadb9714b34f35a88447614528e11f26c1c4e86599aeb03be49aa2ee225673599
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.26.0.ebuild b/dev-python/ipython/ipython-7.26.0.ebuild
index f3ffd2429339..bfc4ba8b51bc 100644
--- a/dev-python/ipython/ipython-7.26.0.ebuild
+++ b/dev-python/ipython/ipython-7.26.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 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index 587a10e6145e..25331394f042 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r2.ebuild 578 BLAKE2B 45a20e23ce6ddbc9e178ffd74869f67ce0decf90ace6521a84dfff872b407aff1b1e4008b3d8b259e94f46bec022c7979753dc0bb50843a351dd28be95422e7c SHA512 80e00d90d73cd386cd0d3fc58e3631bbb7cfe0b977a18f7cf9529bd998a85b4d6d4320429e4ab5bdd0ceca36bdad5a8542080ca0cba028abd0520d84e09a41be
+EBUILD ipython_genutils-0.2.0-r2.ebuild 577 BLAKE2B e032b9d2274c8c19add6992fbf6ec88cc25cd9100dadc67197a8b3ed67b1e459432ac628968cafd63f0f540090625f19ddcaa6611cdf1e0c11c3c18889fec5e6 SHA512 434e88ce1b4c863ad75346a0ca4d8144ebf90a20703f0011dacc06f05673b0af723f653e0521a3ca6345434763f7d41773f6cffdf1ec77c162adea7044f01e22
 MISC metadata.xml 862 BLAKE2B e520f2f567209b25e738b0ffddf7f6c636edd9c4f5a5dfe888009a48f23a73fbcc3c1c0d6ee9886d5b3b3969e1fcdc3cef7e6a9438228236ea3808446757df57 SHA512 b153b7a1d384236b7ac65738dd35d1b7a1557e3db72344a26e9c2a5f472ed971c8bce1787a507f140a85bd066daeade1d990b3b76b272354e18248de2f65c98e
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
index 487546085899..97f9dcd09362 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Needed because package provides decorators which use nose
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/isoduration/Manifest b/dev-python/isoduration/Manifest
new file mode 100644
index 000000000000..da8ac75b6bb6
--- /dev/null
+++ b/dev-python/isoduration/Manifest
@@ -0,0 +1,3 @@
+DIST isoduration-20.11.0.gh.tar.gz 15909 BLAKE2B fb5c3c383aa000c4650490b701fc091c740e45cf782aa929824e3f3e5601d4de82a68a9430f450b42da3658105c87cb293a98b94c77fdf03a1702e6d103a257a SHA512 9b3dd5cc540bba35a73aab01bf1f0274871b93b03ff72f8cc63fa0d2ec43e1f54deb95bad2323aa4cb8066b1b5401f426175792c062cf46449c087601dbe0420
+EBUILD isoduration-20.11.0.ebuild 685 BLAKE2B 059029ad6a5336ee2a72e3ca5a56143c6a15d56c6ffe52da56578616d0446440cd0d5b0f84a6903225f55bbf84138f5c559787ca1d10f3c044956b380f1581c6 SHA512 783447cbc99e0d4358d8b6a89af0ccc91669c66f888cd675f8c1ed9d0d8feb866ff2a728b4274ffb67411301c3372d58ffe27bb00c82b295756b752f1f93a86c
+MISC metadata.xml 397 BLAKE2B 88efa16ab2f656b04592484218f5289838a1e3f6f2f9eaf74f3a836f950d59e25d4d179ad87f6c780b768cd536d3360342c91e3d3082abd417bd398585f409c0 SHA512 ffd673f9fe8cfb45fc4fef014fa2c8de7ebbe0237cc06a6b570f099eea97dbcbc8012c1ba11108b61b0e3ab43077c544db8634775f1675a6e704fe20110e3180
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
new file mode 100644
index 000000000000..23bcc266e689
--- /dev/null
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Operations with ISO 8601 durations"
+HOMEPAGE="
+	https://pypi.org/project/isoduration/
+	https://github.com/bolsote/isoduration/"
+SRC_URI="
+	https://github.com/bolsote/isoduration/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/test_benchmark.py
+)
diff --git a/dev-python/isoduration/metadata.xml b/dev-python/isoduration/metadata.xml
new file mode 100644
index 000000000000..1f3f97251146
--- /dev/null
+++ b/dev-python/isoduration/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">isoduration</remote-id>
+		<remote-id type="github">bolsote/isoduration</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index ad3b6e382c98..4347151e7e31 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,3 @@
-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.9.2.ebuild 1356 BLAKE2B ad23c12a74419ed0d6d0e886213bf976fb825c21cb063b3959e8e1d1b31af7820f9e743ff4629c5a54689ecf070ca1adf910598ca08e43b0ef410944fe7cc111 SHA512 d80ef7ded1a89f1b6f7fe12ee223e5dd287c2d7470819fb65d1bafaebdba9b9ee0fbacc64bb3a397a691f1ce69233a4820e3a9dce884f8fbf9107d4f54b45322
-EBUILD isort-5.9.3.ebuild 1347 BLAKE2B 1fcb810e290289fd1c6594cb104842e9fe9211bf615d3501600a79ec225d24724c71c056a3a6c5b6f24dbfa64fc27d5b93639c76fe89146fc9297b1f49b8d515 SHA512 326129dececfe48fa4df8fd22be6ae54de956a0c2d386cadddb4234fb2e64ea2c98137179ba2d8de0401d452b44c19417ec06dda0e3e4f512e30637a7abd6eff
+EBUILD isort-5.9.3.ebuild 1340 BLAKE2B 1549632d51b77d865abd4f20fd8dfe64210e953cab14f1760a2d093fe3aad3675474ef3668b954eff0b56527461901a1157ec8971f90210226a49056fcbd8c7c SHA512 c5d8b40220d4209c078ae9cdc8eb4fcec3f4678134102af044f06b7fe41a967684713f97513236e6af4ba99fd3a8c19f5e73385349e37c43e91369eb4267ba5b
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.9.2.ebuild b/dev-python/isort/isort-5.9.2.ebuild
deleted file mode 100644
index 3a8b75254a2b..000000000000
--- a/dev-python/isort/isort-5.9.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="~alpha 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.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
index caee88d384f0..114bbda1b9c2 100644
--- a/dev-python/isort/isort-5.9.3.ebuild
+++ b/dev-python/isort/isort-5.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 70718aa51d94..addf46cf8d14 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,7 @@
+DIST josepy-1.10.0.tar.gz 58662 BLAKE2B 367d97a316c3adb33b9e3e2cc8400fc95fef09c5640c9747da852c0c1913dc6db3341e5b40bf1bd54d5f4619ee05642de1a72566f0d41c44aed731da8e341540 SHA512 517476c4b4df35b066f48e20e2c31bf458b998553a740dbfa4a682a94353db1cc9d706cee9429cb34b9347e8d78b97bf4a8f930334b86febfe56f5c9f779b42f
 DIST josepy-1.8.0.tar.gz 57507 BLAKE2B d395f08db9c46d37555f2cc540ab7af79356e32b60763acfa2116cdc08a46e51d75f56e6d393dd28c7dfda5f2012db5f4d5b5cddecf74809a01ca3dfebeb598d SHA512 50cdedfa4cf67055ae65dfeef2328ba7bb369fb8b763b425e4ca73108555c9cd04f12a644309c2f2e1db50e1d227be3bdbd00037e509d2b2d82565c213b81e4e
 DIST josepy-1.9.0.tar.gz 56932 BLAKE2B 0de67823c5015f3665323d33c96a97a8611d333e98a8229e847f41ebb6bb81c948001ecd3cbd46220237f40270dbb0e0418676b3c130f1765fe8d420abbd73b7 SHA512 b3a64a579d23aa87323f01ae3859fcb2cd9a699f160e43ebe58c93e11e5d5c5031cd257af1fd0400d982929eb4c06495c9d4fa09580ffcb4f6a4c09d0f191bd8
+EBUILD josepy-1.10.0.ebuild 787 BLAKE2B 61162986a2e20ba565ea145ba679afa973e25833a2e5956e5e020006abaa1ff096e8a686c4273d24a62f45efb2ded2529402f6bcc6e1e4b08a0a4415a985766d SHA512 2449d55ff461a3fbf3fa0f05b3a78daf9d17570350e5710e02b5440ccd15bb9a2e7c50c278d973e5ed15c8ff1fe8affd1a8917ddaff9cf92d67472abed42a4ab
 EBUILD josepy-1.8.0.ebuild 785 BLAKE2B f6af24b68c94abcd4895914eb09b551ca7c4547144a1b3521b6b16a241e02609a9e33afb36015f63534e2999b500128c0e5890e3a9e8fb08a9ceaf976db671da SHA512 adc17aa849287d6ff8defce9bbfaf29d7d60c642cc2a476d7a1bbbc09d645c3fceda2130ac155c439ddb9f7a422d124952a628704945f7fcead6a620ad85480b
 EBUILD josepy-1.9.0.ebuild 787 BLAKE2B 61162986a2e20ba565ea145ba679afa973e25833a2e5956e5e020006abaa1ff096e8a686c4273d24a62f45efb2ded2529402f6bcc6e1e4b08a0a4415a985766d SHA512 2449d55ff461a3fbf3fa0f05b3a78daf9d17570350e5710e02b5440ccd15bb9a2e7c50c278d973e5ed15c8ff1fe8affd1a8917ddaff9cf92d67472abed42a4ab
 MISC metadata.xml 720 BLAKE2B bfe4668c6be6fcd57f41af649d31ebe5e4d96db8a0d851ca9c8365f42f1752e820f7dcd04da9ab974f8e9c99ab443bc7b516005ca510f4dac9390616b9135269 SHA512 be0b55bee1d51c91cda3893a2751ac9e8440b61c106daa9223ac6ecb3cd20e06b41dbad892e0e647e899a7a1eef1e985f29ea9a355a8c0d50524f599aec3cc88
diff --git a/dev-python/josepy/josepy-1.10.0.ebuild b/dev-python/josepy/josepy-1.10.0.ebuild
new file mode 100644
index 000000000000..80ada4d0e18a
--- /dev/null
+++ b/dev-python/josepy/josepy-1.10.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 977a5d29f6b0..48f5f67e4fd5 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1,6 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
+DIST jsonschema-4.0.0.tar.gz 290808 BLAKE2B 29b53fcdedd170d1ea8602dd706d671b78394b8d5e5f54ae3443269394bb7a4d8399a2d99a87dfbb4d27d6613b47e0d5a1c6caea9b679cfd1d21cb4ee0f4e45c SHA512 5decad39032a229f992bf25555473171a19ae076a0726b73fcc284cecf788bcd29e8662ad48405ee5a93df812b87e5846a640dafc32157c3742f2abf7f7a9c97
 EBUILD jsonschema-3.2.0.ebuild 1283 BLAKE2B 213785899c5e9ed46d98791ce02b45eeb96db799b3c26efe2285246bbd7e377a00522c1cba770f4e139736faab06d3aecc850edf2e5da2c561fd55f45f15666e SHA512 ca901919c61d47765752600d2b8390076d9a94a19a73e02e9d6259473e876e0aa84a0c7237b49bdecfef4b0d5ef449303dfa90afee63b910b900183e73823b87
+EBUILD jsonschema-4.0.0.ebuild 1167 BLAKE2B 6024460fb0d033d2f750be6a52415511cadc9bb3aebf03cadea6f133651bb70068f7cc5ed3f74dbcf6d47498f91d67b7dfe23f20ebaa1a0b927522103716018f SHA512 00496cd729d710df5474646e2d191b748efad9e7cd210fd5309f0780f906ca91c496a83743ce02bae523336cc8617023fd6b3ecf32d55e15f3725db53ed4831e
 MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
diff --git a/dev-python/jsonschema/jsonschema-4.0.0.ebuild b/dev-python/jsonschema/jsonschema-4.0.0.ebuild
new file mode 100644
index 000000000000..12bde460051f
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+# formatter deps
+RDEPEND+="
+		dev-python/fqdn[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/isoduration[${PYTHON_USEDEP}]
+		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3987[${PYTHON_USEDEP}]
+		dev-python/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index bec52613f30b..102968b1fa87 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,8 +2,12 @@ DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a6
 DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
 DIST jupyter_client-7.0.2.tar.gz 317686 BLAKE2B f837d60c1013d6f7db7185112820bc40fe55707403dd179c72c93d7f5a9c752436b8454e0ffb0a133c77a4a11e87ea310d86706145d0501a0ed83d36652cc278 SHA512 24684df13947077add0931fe9e8a2c2b629db120c1554123f36b7c9e736f502f9553c63813de93ff84733eb4a47eb0f5dd48961e3c18527fbd8fece23fbe6440
 DIST jupyter_client-7.0.3.tar.gz 318420 BLAKE2B 151cac17dd965f5a151e0de90cffda35d06943ef7548518f6bac9e977fa3efd02cceb30fc23b252c440541ac74a84396dc7a8787fffbbade8d91dcbc2d51781a SHA512 eae57dd9c2fdd0301cdb53204dfc043a228fa606236ee1eca9e37f4d9d213efd080ec1292567431e24d73899db0833984ed4db933998817d03aff1f674217362
-EBUILD jupyter_client-6.1.12.ebuild 1196 BLAKE2B 914a94f6fec91368fa2c6bf084b0cf32d3314a5e804f7ef3e3ccbd0be8880cf22427764a2b3bb06fc5d34b0bebc46751598879f93d2b90787c7b165e6feb2862 SHA512 c87a355fe762fc537fbaa14f76cb61b0e860cbfdecf60acea9918dccb83d0837be2a9cbd137aa7162ee2918ef3a9d0f9079375e147f68b8c1d359abab881a5ea
+DIST jupyter_client-7.0.4.tar.gz 319415 BLAKE2B 795e10680b0183e6628978cfe2633eaac9d1acf62ca8f72c17cd9d808e9971ec63a251adb7e2f5faaf98f51b06508b55a27686d5a77020cebd858daf61954de1 SHA512 47d17b1369edfe7cac7f2450299558122d88e341515b46992bee716c4bc23f870c131ca1fe86ec8f48f558c2c3ab5c26b05d473b37fd2dcd19c24bc44ba60c03
+DIST jupyter_client-7.0.5.tar.gz 319487 BLAKE2B d8c4e518fb165fbbe6b2de8bd8623d37c9fda6c002753b8a115d615b0c338a6411c4713b974210af45fc40a021bf687b3bc1e7e4f0717c510f569cb7eaf6d793 SHA512 37eba11585d40f52ca5c7a3bf275ee7cd86b2222049abee4b92b32eb6e667e6e5234b8c1dfeb1f67e8bd0d80ee1be1ccf87ffea9f5b5a5e60f217b07063a085c
+EBUILD jupyter_client-6.1.12.ebuild 1195 BLAKE2B a0f657674fc053873f7286634f54118c7fd17099871e95a63fb81b118e94841a2902e84568aeb5d9c1ff44dd9602ee9b8ea20c6e86750d0e4474a07a580d8a5e SHA512 b3ad2f9740ce824f6d03f4087a336fd11fc14286d70d6484c3e30ea752068168caccc3f749324155ca4f127e9e6dc73a4a9a1b45fd3b17736135347be0a76211
 EBUILD jupyter_client-7.0.1.ebuild 1344 BLAKE2B 5e51ddf361d64fe3e36259b11fd8e27b31a32569ac33c095f6c5b9e3443be3a6f4dd2e77f7a71e0ad3e9f0c81290c2cd2f129d0a75778eb1328ce207d2014cc7 SHA512 68642247b38a3b421a7ed92af36f85704bd39145c006d0627e674709fe90a4817da598382f06f921137c4f2b9746fe2f23ff69a2586859f19eb431c27d4545cc
 EBUILD jupyter_client-7.0.2.ebuild 1350 BLAKE2B b5b5eb8f9292009e6a9e4aeb1909f056dc8ce03163555388a8e2768b188d324b19eac787b85b6a91b16fef0e64732f30c0a3a4ddd91465fe009eddb992359ba8 SHA512 efc5f8370d5184149ed5c3b4ff45d291c08daff87dbffff464434b6476567b2fa5e33ed6cf9b5daaa9983b6e9a2cb9ffb41fe586e757d557941176c058789dec
 EBUILD jupyter_client-7.0.3.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
+EBUILD jupyter_client-7.0.4.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
+EBUILD jupyter_client-7.0.5.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
index 95d2d5960e4b..3050b2596a5c 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
new file mode 100644
index 000000000000..737c392b7525
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
+)
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
new file mode 100644
index 000000000000..737c392b7525
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
+)
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 2e90329f4a8d..934f6fda48d5 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_core-4.7.1.tar.gz 68886 BLAKE2B aa89351845c669474c03a307934a5d84b6357679bc99f2fc7da4f93ff347766d52ce3551780803b73941d6457f7004306e795398fd390c81e9180193a2119225 SHA512 bc190abd000566dbd097dcb14acf1926c92bb265f2cfbbd14dac6a9cf7d6a02f924ba89fa957ca30c2af57433e9187e288bb8e80d039a3d3a583c6e488a9c80e
 DIST jupyter_core-4.8.1.tar.gz 73579 BLAKE2B d5dcc89d948fa52f4a1b7c210585e9e5657004a431a4d177d7393d8283a9be86117e2c2452e4381399d1f479ae7b9ec4c5f891d09dd99c81768a64b69d8b182a SHA512 774612652537f46f486c0ae4157053463debcdc079d5e732865c729ef7fbab5f0d1b8da5d4e7cc1eda3a80250b43877d8f75889fa86330f951c61e3f8a7a29e2
-EBUILD jupyter_core-4.7.1.ebuild 1040 BLAKE2B 9c739b46fca155c8bde5e8f4c01ee170c734a91866091a6147b39f7c5a5fe43fa193b5bf89b096499e5d73cc5c31247bd43191d1b053a06d6aad1f69c2d5b09c SHA512 9053102e0a723538839d34e55e75e2933b2fc24017716962c960df73d4865765fc3eecbb64c7ac67d870c0fef7b3cfce88cb540f93a49ceb521ab4ce0f766225
+EBUILD jupyter_core-4.7.1.ebuild 1039 BLAKE2B af13f8aa4f26d6d1ec2d61fa3a60c4fa06653139d92412a7beaae6778ea1984256acf0f820779d3b6479222681ca6bccd290e609ddf4729967a126b84a9061b8 SHA512 81f8ee830885beec3208b7451e2ebd408c18b2d34f64e90bf2e29ddd57cb5d8d43dcf59e5ea16000dbdc240cee4c16cc582e76a0dfd8f093dde59ec9dac72fd6
 EBUILD jupyter_core-4.8.1.ebuild 939 BLAKE2B 0bcb0db874a15b03d7cb033be0e66a9e0cced43365a608ee5094e4a32f5aee1b87d42c87f0ca673bc55db394ce78775bc30fddafacae3e5002a10530d69c70ad SHA512 63fe5994cfed2434f87bbd399dd4123f44900a578fa1ec5838f7f7a5a4443827537040be8fdfb20803158e2a6fb8cfc816210f6f03113a4b3c02df8082078c99
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
index f114eef8a97d..9e966dfd2d97 100644
--- a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.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 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index fb4deab814de..1ba78aace423 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,7 +1,5 @@
-DIST jupyter_packaging-0.10.2.tar.gz 21735 BLAKE2B 92de31e6835a2228f85b008b0fa3b3b8b5ebd175399fa82ee79d328f97b50c09a86dbc325e0378a7f946de34522d4af12fa5997507895ff6d85e77d4e7d38e3c SHA512 c1f5562b8fd72d64998d32d1a85dd1af2b730fa7e4a0d9e2036ea4d5a607ce02b1e9c641f01997ea3b0d6e047fa797009ce3c2ca52ef866ec9c7492ef836e679
-DIST jupyter_packaging-0.10.3.tar.gz 21530 BLAKE2B 43392f938d40e859e79f42b7942a199f808218c1da697c48a8ae0b1c5a4e8a408f983196e9d148edbf17d1725186216ed79446bd42fe8f18baaf8fc9f66efe1c SHA512 7634a056d506328af6e963ac7a8d6ac5fdb5d5303a31495af2275a7feca3732b60aeebb332cdc009ab690aa4185f5b3687ae002300b4885620cb9f2da6d2c79e
 DIST jupyter_packaging-0.10.4.tar.gz 21698 BLAKE2B 5490443e197861a53587fe744d749162e412b88bc5c1e5917cd6c145254e4feecbb8b3e3853bf5a3e360fc9ee20c3345af9c7a245aeb1b03639d99d1d69cb377 SHA512 066abaaa00be8154ea39cc3db0bfa4cfe03864c3e50a741f416606c2f8a2d2e0202943f390905ee46f99414168705b9c3519609c6ea16b3b7d54820631c3ba46
-EBUILD jupyter_packaging-0.10.2.ebuild 1008 BLAKE2B b1568c777b9f90b2f9136fae2cf5f5e960bd3bc707efce70db4ac58da79adaf99bd5d103740f275888f46dd93f6db4487a27be579202991f4f6cbac403f95474 SHA512 e73d2649138659e4cb5b2dff4748c4deafc89b11aa8bb7740b90652c26bc930b572d9743a8a11fbb9f80e55c4ed136616ff9c6221d7e63bfbf3ea5663675604e
-EBUILD jupyter_packaging-0.10.3.ebuild 1062 BLAKE2B 31b256f1f8297c0632e7ce29497b2e230e43aef6c86a4819775f5dcb489c264204db5a97a1c872761ebfd0f7c465a0fc07ac1ad051e2f4a5801aa743e0d6046d SHA512 e2b51d1d5638eef6bee38b23da470922d5070224264c74c598d85429e3b52ca152688f673743c3a9508e74ff8ca3e75b6dce34e8831514645a28e0390b0688d6
+DIST jupyter_packaging-0.10.6.tar.gz 21836 BLAKE2B 921e763e11c3973442fa819559d921618aab4010ae7cd4ca3314acb53c7fd7be68f10af46b4d0c9888d2648c0e28565c22ad47270a9d9a1c950640b38a2a1078 SHA512 1b59219dc14c3e44c0f100e9a46b614a8c4395fc26937622515e82f4ffa35c29d8101d6f56a3d496da9279e1e7fc58a91af83bca2b50875afaf1745706ce466d
 EBUILD jupyter_packaging-0.10.4.ebuild 1061 BLAKE2B 962d4d9a91f13e93ce9414afea56f3f60b5228c95530ea7cb8343cf5aa8e81a7af444de41654060eace026cdeebd494cc6614b91af630b58839ec1530bf8b8c4 SHA512 3d52dedfd365813d15b06c355eae9be720924498c0ffffc2cc8c2c3eb813d7304815ea61848cccf0d5a593c004e9bff30371d6bc3c5071714ee7b347edfbe81f
+EBUILD jupyter_packaging-0.10.6.ebuild 1061 BLAKE2B 962d4d9a91f13e93ce9414afea56f3f60b5228c95530ea7cb8343cf5aa8e81a7af444de41654060eace026cdeebd494cc6614b91af630b58839ec1530bf8b8c4 SHA512 3d52dedfd365813d15b06c355eae9be720924498c0ffffc2cc8c2c3eb813d7304815ea61848cccf0d5a593c004e9bff30371d6bc3c5071714ee7b347edfbe81f
 MISC metadata.xml 436 BLAKE2B f17433d8ea516577cca652a0bb111cc9879ab5de87e056bb2cf28b3440858c92d8a942672f1d9e8be219c0aa7cbc255ccd603eef1920660366384b642c04430f SHA512 f7bd149e6c92e1164a5fc424a99bf44a1e15fcde8000171ad5d35828221ab38bedafb9460969bdde5151013f80a5197c1c1940d8434fe950104f149e9e8c449d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild
deleted file mode 100644
index 593c51be660f..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip the tests that try to install things or call pip
-	rm tests/test_build_api.py \
-		tests/test_datafiles_install.py \
-		tests/test_install.py || die
-	# Permission Denied (tries to write to site_packages)
-	sed -i -e 's/test_create_cmdclass/_&/' \
-		tests/test_deprecated.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
deleted file mode 100644
index 7d5ef4959832..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package "build"
-		tests/test_build_api.py::test_build_package
-		tests/test_build_api.py::test_deprecated_metadata
-
-		# broken by Gentoo pip patch
-		# TODO: retry when we finally make the patch less intrusive
-		tests/test_datafiles_install.py
-		tests/test_install.py
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.6.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.6.ebuild
new file mode 100644
index 000000000000..6440233f72bb
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package "build"
+		tests/test_build_api.py::test_build_package
+		tests/test_build_api.py::test_deprecated_metadata
+
+		# broken by Gentoo pip patch
+		# TODO: retry when we finally make the patch less intrusive
+		tests/test_datafiles_install.py
+		tests/test_install.py
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b64c28391a66..4aee5d64e253 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
-EBUILD lit-13.0.0_rc2.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
-EBUILD lit-13.0.0_rc3.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
-EBUILD lit-13.0.0_rc4.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.0.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
 EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-13.0.0.ebuild b/dev-python/lit/lit-13.0.0.ebuild
new file mode 100644
index 000000000000..0502b9a74a19
--- /dev/null
+++ b/dev-python/lit/lit-13.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+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/lit/lit-13.0.0_rc2.ebuild b/dev-python/lit/lit-13.0.0_rc2.ebuild
deleted file mode 100644
index 37168fbde9bd..000000000000
--- a/dev-python/lit/lit-13.0.0_rc2.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 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/lit/lit-13.0.0_rc3.ebuild b/dev-python/lit/lit-13.0.0_rc3.ebuild
deleted file mode 100644
index 37168fbde9bd..000000000000
--- a/dev-python/lit/lit-13.0.0_rc3.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 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/lit/lit-13.0.0_rc4.ebuild b/dev-python/lit/lit-13.0.0_rc4.ebuild
deleted file mode 100644
index 37168fbde9bd..000000000000
--- a/dev-python/lit/lit-13.0.0_rc4.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 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/lmfit/Manifest b/dev-python/lmfit/Manifest
index db3776003a2a..91952f6ab0fc 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,3 +1,3 @@
 DIST lmfit-1.0.2.tar.gz 306039 BLAKE2B ab5fcda566f81f00a9d2371f6ae5b3477ed015c70e9b9faf8c5228e3f75f0bf9085d9bd3789042af7b46813d0b6c88f96da37ce295593a5368144d53f5f1799b SHA512 85adeac989117dab3cc9aaf216c37ea5087452351a7978238929216dd9d9be8b6b6790103d4fbbf5211a943c43fb99461750cf58287e2b18c27f66eeacc6ed9a
-EBUILD lmfit-1.0.2.ebuild 1056 BLAKE2B ed874fe8d63dbf9e1c649770e6247c61869ddd7326af41d5c1366ba1e23072d5d17eb27f91606ece5bf4337b119b33a667db2469945c1ef4c85b4137a7a2810e SHA512 f197479a8b159a215f38ec933cca2018b4f8a2fbda3ad7df5f6239d3566f7c9379bb1b1279ef478e4c9a12324c26c1a44ffae049e3fd51126720c85b64f44bfd
+EBUILD lmfit-1.0.2.ebuild 1058 BLAKE2B 7c7e4d11c83705cfd493d011b42311877afdd07c1363049464184941dddea7dff0635b44a5733669f5a8a8ed3f04afa2896a58d673c650702429dce9e3ae82ac SHA512 11d169cbaed18fab8e936d1b895f76f72bdc21d6174a1ec41f6cad9ed44ca33e34cbcf72b443f2322e62cf0237af8fb51dd071a99d374ffe625137df9c6a368c
 MISC metadata.xml 386 BLAKE2B 19872fce1464db158a66df58e6458655215ba8f8eac4469046be955a27a761dcabb9b324e3324a81e1bb407fa5bb7d8611371da8844cd75d0b43b44feb8e5bbc SHA512 8de0cbfe89611f458d854f50c59756dbcb386466bd582b5c84ed724546d74ae430ab9ccaaacbb4f7c6f892d3fe211624597dfb39038f01d621c548c11fea4c55
diff --git a/dev-python/lmfit/lmfit-1.0.2.ebuild b/dev-python/lmfit/lmfit-1.0.2.ebuild
index 3e93970d9753..33dc0c4bf79e 100644
--- a/dev-python/lmfit/lmfit-1.0.2.ebuild
+++ b/dev-python/lmfit/lmfit-1.0.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 62c79306c2b4..658ec20f20fe 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
 EBUILD lxml-4.6.3-r1.ebuild 2728 BLAKE2B b8b4d6251b11490b53bf6d4eeeffe61d5ce49336a26d81675332c540c8ddc33cb3f0df62320b35f3eef7fa3588c7add0abb1bdee39f7725ee2701278204d0492 SHA512 b135691777c33d9158ca6d6811d972c07fd19d16de94ec522b4200694c46c8768ff9e2109b81ca5b0afa55c75a7779805fa42e2d595330c8cd136bf6f34c2524
-EBUILD lxml-4.6.3.ebuild 2718 BLAKE2B a3488b5482e98496b4ea30b0bb3628ab89ff857023578bd30ea7707a8f67c1f02c12dd146d434ae791c1090b7bd3a56fba5515a2f6f12eb069e2c309073e5d85 SHA512 65e26ad55ba47047f7fb034dd5cc00777ed116af26737a0b4baf3acddd5c961557f04fb772720d1c691c5e99a588472103157e6573bc634143668bb214217bf2
+EBUILD lxml-4.6.3.ebuild 2724 BLAKE2B 92ec35b5b36417763e94959a0e6783b93bf46f6fc3e21e57c08c16f1ced68ad6e54023b76f847b1895cfeabaa1e264ce06be452583a427e0701fe805b468717d SHA512 c92f437294a4b224a9c86fdc024e6cc412d1e6e4cba6c8af2c92d8eedbd20f86e6122aa8f505d1b078fa880b57b980bf683304ea5b30af597342d4d2607f1b73
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index fc97e91c34bb..1e533db84d9b 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index cbfd01f6fd6a..abc78a62b9a3 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,4 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
-DIST Mako-1.1.4.tar.gz 479823 BLAKE2B 048c63c6caf493b9809dbcda8d1d697a7a25c8d22e97f439facae64b26d5b8f5f3002ff65529e9599e6069482fa25d6db95d810175f7f674f5af02cbd3f9f5e3 SHA512 4844c1d6c8d0d474b4ca4e1b31d3557747fc7e30f70a1976163a26b46b1b45c4c96ca6101fbef252b4e3bb4a61635d2a2c6d1c2933fde5b82bb1a1306f31ff84
 DIST Mako-1.1.5.tar.gz 494647 BLAKE2B 5e4f3e111137820997eb39bbaa1af35ac97de101757b66b6efd097e0d35f6d020bfc8b5b98da8c03fc81a907f228526543f5bdaaf161c4f850418cbcaaf81770 SHA512 3eff75f1a94f8e01131ce118df73be1ade79306562ae2ca68079eb2b64ef82c48c09cfd7ed6eda42819bf50c70941cf4115f8918b4d8187f7489717c7d4a423b
-EBUILD mako-1.1.4.ebuild 890 BLAKE2B 3dbc93b84d8977fcc6ceef4ddc0cae6ccf06552391491c1e0e378047b60b934376d0ad06c88b7810515c8cf1b766c2f5de14c99711d3544f58b62e561ea7bbee SHA512 b4ec0ab13d00c7d82b45eb11f09f1ba47a863c73e6b898aa2a3b4630f9964dbf3a4bb746d81982b3a4e3435902341d2f0b097134b70844d334a7f73f873413dc
-EBUILD mako-1.1.5.ebuild 898 BLAKE2B 990880f7c548d3e2cd8dcf412171ee4c276f848118597c0e845a7479ce5857d42ecce2844add789bf4439a5368367b4222b2c9ed90ef5ac0ae3496424bccf552 SHA512 98344ab6c07e7a52e622db6ac966e3f1b0283c0e12974b7caca47f619f6619a61e921e2cf86714a05b1e02f08032a801a7d21371fe22b30ecbccbeaa3d16bd67
+EBUILD mako-1.1.5.ebuild 890 BLAKE2B 9c7bc55a11e0dad99496edd2491324f0146a1fef5ad6e5eed12fa496804408eed41eb84794a456d8e3c1aad3f1389f3d9d461fcd8d1c982b04cf3633cbec38ab SHA512 e0fc5f6ef00aadd2efed9290421f415428268269790281460f63cb43126ec993adeb4002c5dbe801dca090da55406411dfca0ee7e3ef59b604771ba53a8c658f
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
deleted file mode 100644
index cd829d5c4924..000000000000
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1 optfeature
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/mako/mako-1.1.5.ebuild b/dev-python/mako/mako-1.1.5.ebuild
index 4b80892ce7f7..1a172d633329 100644
--- a/dev-python/mako/mako-1.1.5.ebuild
+++ b/dev-python/mako/mako-1.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index 9d09ed5cbe66..c152abee6fff 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,5 +1,5 @@
 DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
 DIST matplotlib-inline-0.1.3.gh.tar.gz 7337 BLAKE2B 995b6e5ce9068760e701e3b429d2187bdc7e7c5b989d54a9fb1f8b5f385f91c6a3621a54d5a1e62c9000737f5f42d9ceae5be7f36b664b7e06ff9c712e6d76ac SHA512 684821204faa3cb35c46663b8c8cb8f0ba5d4f761d15bc708de69c98753685c89da1d330087bcfa970792de592188768dc068accc471d55360f551e44cf4a79a
-EBUILD matplotlib-inline-0.1.2.ebuild 550 BLAKE2B 1f95a56304fef36a3e33f2f0196583974e260a692f535bb5bb894f1fc903c16783d0ac6d26a7ef44efc3bf538950be2c5bc64acaa681d6b50414e346db1f5459 SHA512 84ab3f3e7379b22f1a3b1b8c3456dfd3c7b4bbc04bbcc23ecbcc0a4abbe57cfb653dffc7965e3008d6120ed91561a180abae7ac3f9225f95c5f03663ef16c087
+EBUILD matplotlib-inline-0.1.2.ebuild 549 BLAKE2B fb1dee47ea76d56564d39e6f29d254356bcbead6fc15181285cac69851cf8506a4aeb6e135d710989f597c108ab11f173628b23ada8986bd50f37aa7e338cef3 SHA512 3aeaa8783c40cfcb411584eac7fdfc070f0e8ba1d71590e97fc5fca6cfaaa7917f95359c47e6003a32c381274a451b9183ce040a880c8c376217437e3419230a
 EBUILD matplotlib-inline-0.1.3.ebuild 555 BLAKE2B 93b05b2ddc718165f49afb3cb06512c0f7d746b725da64064d92e59b8370f6cc29c6a6448a8f64195043c6ec81522a29343a3bebe037b47b7e734c077344edfe SHA512 dbe629ead7ad50baaf5689288a31343dec095c9d3263a36df1fb75a6dda403a35156e5489f1826400786f05e6af1d0c0ba56e8fc2d3305c7e7365c80675a7440
 MISC metadata.xml 364 BLAKE2B ed49b2fa437a2f09b0299ce20b67f21f6a47598541b5947db5577fce784d08c61e8c87e3ee84da52f6535a076d4ea9ec7acb06071bcca8329064a192fe433d13 SHA512 796577807f86c3568136409adcb92fc0f8eb2259d63f308709c95fa15bad5cdff0e8603a9e2cf705c2f7b61df86c5fed98aef773c571267169d030a9406e69f1
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
index 601008516c97..33bc090b29a7 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 0065e3fdccf8..358732aa9552 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -2,7 +2,9 @@ AUX mediafile-0.6.0-wavpacktest-fix.patch 391 BLAKE2B 6ef2b9f82cdb7c261c5c56d86f
 DIST mediafile-0.6.0.tar.gz 509351 BLAKE2B 5b8d97be6bd7becd44053d2d1b855252161779d5a01e8fea29443db0b3f524ba3b58dfa372b48451da76672ea5fdb521cd8a2a5c6c110d37e637dcfefbc0842b SHA512 7fd7d8a1d53311c22835041c39413d9dc7e1b4d8afc94a8c578aa4de7f65361f6c998062bb1b2804cae1f672c6b8e7c109fcc3e459e2266b8f19a0bde8673945
 DIST mediafile-0.7.0.tar.gz 511379 BLAKE2B 7248d72a45bcea59937d0098fa3ee7458852ab9e4663ed3ba6582b5671531154dc7d3f820a20cf10d1bfe2e594ea202fc2825ac8aba683df08707d2cdb52d9c2 SHA512 5b43aae6066e2122bc37cbdbfda04406d3f4da074df5512a5def9c1ca96ce96163b73d7c7d335518a4a7a41a9d5f195a0e371e908264b6040d3494e9827ccd81
 DIST mediafile-0.8.0.tar.gz 559590 BLAKE2B 21aa22b2369d86fb0b5ec4c7b92c1de65e6d266572d938b92330f391242a87cbadda84157409bca22e8568298f1f15928819f9c929c343de03b4f9ddb0be486a SHA512 772190c719c741a7a0a83c6e04803efaf008624769764b72a92febc13d89da4ad615b344424d2a55a60715e67802935a49aa57d6ee4cfa1d5ea9581851c5ca1b
+DIST mediafile-0.8.1.tar.gz 559592 BLAKE2B 3eaaef6349cf24dc871bee94cedaffe4c6ac713da0a55fef926724697f0e42149d544cd28ee9b8d9d21fa1e117306838f586cad7f085bc359f4ed8e78f6aef1f SHA512 58398ec94ab4865d88fed4c72344599b70fbeeffb538ec23ca84d8a8e19fac82a1d0d52c67867df056458716d5138a1c96e650bdb766c567134b2666cb8c140d
 EBUILD mediafile-0.6.0.ebuild 1078 BLAKE2B dfe51ac82824a5586807f42333279862c2c4104650ac3ca75e32805e3863d95d4ce8c0e2c678c89247d299d562bf36bcdc2ee43bdbb90e52abd170a7be4bddc3 SHA512 57a8e52614eaa79a566abbed0aa13b4a894680dad4a03eeefbf408def11ccbe014145edbf9950d872e81873eeb406b5bd35b68d4f67fb50c7502eef875fa7fcf
 EBUILD mediafile-0.7.0.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
 EBUILD mediafile-0.8.0.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
+EBUILD mediafile-0.8.1.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
 MISC metadata.xml 680 BLAKE2B 0b6b669509378e4377452e3f0020f16f41cb1c162b5596aaca7459c794b7f5c818df76969b5829d3b2e72ca0a4463a5d8b946c133acdbc063e5c4cb6a55ee1b6 SHA512 70109bda3921ac9eb6f0f09f748d3afdb977b6cb6699a457e5ad439d341a88cca2a28c229c0a7c5cbc50937ce7e8b2448156f829b9603f911b5c07807e3eebd1
diff --git a/dev-python/mediafile/mediafile-0.8.1.ebuild b/dev-python/mediafile/mediafile-0.8.1.ebuild
new file mode 100644
index 000000000000..2f819917342b
--- /dev/null
+++ b/dev-python/mediafile/mediafile-0.8.1.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=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Read and write audio files' tags in Python"
+HOMEPAGE="https://github.com/beetbox/mediafile"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 45855c5f4fd2..cdffe550ec31 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,8 +1,12 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
+AUX miniupnpc-2.2.3-shared-lib.patch 1297 BLAKE2B 006825495896e2c614611abfb51453da937f15412b905c4d237dbaa90de4a9dc40a91677efa34653d6a5357a2a4fa71126b99e3a1e3de363872a5136b9450d3d SHA512 1daeb1efde47ba18684ec99b60ba47dd99575754817a1479190d9ec698246bb7f50365e73179c08c5cae8b57a4652b09cd3d3aea6293164994ee33e14d61f4ac
 DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
 DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
 DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
 DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
+DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
+DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
 EBUILD miniupnpc-2.2.1.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
 EBUILD miniupnpc-2.2.2.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
+EBUILD miniupnpc-2.2.3.ebuild 903 BLAKE2B 35ba634549aeac4dc665715d18cefcd1d77c5855909e583d4924621af98f0c6e0becc3285410f06f34723dd8b4acc57b35e4d6b66b3a7292909f7f1ec954d768 SHA512 21017a01191e3c0f8a198dce8a5ffbd22e1427ddcde6e9afbdc279f6bdf936e2a9bbecee9c8597a5121cfc931b22d34307dd2ee821375dd05d1f75737170002c
 MISC metadata.xml 320 BLAKE2B ad0563e313308b3f4e7449b7010821c45c720f90fa9dbcb72ddd82707281ccff98d0c9ed60083d3b3e6c650a2d4f57c83fc0194758e1fdbe7ea73fa0fd6f850a SHA512 72ea7bf08fc1d4a32c473d8e62a368e9e79b52814a4d40a3f0be85bc208e2a057895c8db55196c232564e4a496b5e2b19a1206e967450b715f059219e13c53f7
diff --git a/dev-python/miniupnpc/files/miniupnpc-2.2.3-shared-lib.patch b/dev-python/miniupnpc/files/miniupnpc-2.2.3-shared-lib.patch
new file mode 100644
index 000000000000..6fbb17e60e9f
--- /dev/null
+++ b/dev-python/miniupnpc/files/miniupnpc-2.2.3-shared-lib.patch
@@ -0,0 +1,41 @@
+From 7a61313dda299b16c4af3260ae5c11ce5945ed97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 5 Nov 2017 09:24:00 +0100
+Subject: [PATCH] Link against the shared library
+
+---
+ setup.py | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b84146f..73b05b7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -13,13 +13,6 @@ from setuptools.command import build_ext
+ import subprocess
+ import os
+ 
+-EXT = ['build/libminiupnpc.a']
+-
+-class make_then_build_ext(build_ext.build_ext):
+-      def run(self):
+-            subprocess.check_call([os.environ.get('MAKE', 'make')] + EXT)
+-            build_ext.build_ext.run(self)
+-
+ setup(name="miniupnpc",
+       version=open('VERSION').read().strip(),
+       author='Thomas BERNARD',
+@@ -27,9 +20,8 @@ setup(name="miniupnpc",
+       license=open('LICENSE').read(),
+       url='http://miniupnp.free.fr/',
+       description='miniUPnP client',
+-      cmdclass={'build_ext': make_then_build_ext},
+       ext_modules=[
+          Extension(name="miniupnpc", sources=["src/miniupnpcmodule.c"],
+-                   include_dirs=['include'], extra_objects=EXT)
++                   include_dirs=['/usr/include/miniupnpc'], libraries=['miniupnpc'])
+       ])
+ 
+-- 
+2.15.0.rc2
+
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
new file mode 100644
index 000000000000..1c9a9048f4ad
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.2.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 verify-sig
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.2.3-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 6d082f55cf54..d7b22372c207 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,7 +1,5 @@
-DIST mkdocs-material-7.2.2.tar.gz 6777834 BLAKE2B 09c5ee5e0e0cef76ca66c8d86941fa044f2650d621a194991f279c09dd64c81c96bdfbe7d37eee5fe0e3837fc6461e7abad3537d92f3fdd178078485665088b5 SHA512 5332246103eb3007df3d2fd7ead4f2f60ce29c0e8a2bef6249db3e14a8e0ce1b2cdaffe4f48f57701d07a1771e275c69a79006ec53cfacff1a885894076188fb
 DIST mkdocs-material-7.2.4.tar.gz 6803091 BLAKE2B 377adcdaa2d24248f0430327a2a4b23fdae6f379ac23f6f609d50dc9c1699e13a92e925d9df24ec8298384228abd8c66c487afafc357edfc83da9c0e2897f422 SHA512 ba5c3a2e95eb32d2f2a3027a1cec7a54c9bdf655b51308e519e57d06fc8475ab74e2905dfeaef9bd1029e7814e5bc6c7610cce0526773bfcd3a92a995ba25c40
 DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
-EBUILD mkdocs-material-7.2.2.ebuild 815 BLAKE2B e569e3d6db88f9dcf46137796ffca1e56c362d5bf4bffe9238c7e67ab5c99e2f06c55ce4080313164c7bba4269866068d5722d5636daf2c7a0ca9e44d1d51e90 SHA512 764be13848db96b3da3f4c695e68721e9aa20129a79a637d621f31fa5e43a5af142a9e634d55507af163d9fc0cb51fab88be07a41255241f1921bb5676a956e5
-EBUILD mkdocs-material-7.2.4.ebuild 817 BLAKE2B 541ba90c73ce9a7a3c7e52664f7f73a569001a6e644c81b5e452c2c041ef745473987580491e1f4fa67e918d0019d22d10824ae9f4ba3738060e5133aa7c6f3e SHA512 2b09409640d0dc8fc45e0336544517f92c3aad66c450f93632b6f57eefa20c7ae446906d707cd01c207be5fa9c36746eafe22a8d8c4f4f795567e629d7713518
+EBUILD mkdocs-material-7.2.4.ebuild 815 BLAKE2B e569e3d6db88f9dcf46137796ffca1e56c362d5bf4bffe9238c7e67ab5c99e2f06c55ce4080313164c7bba4269866068d5722d5636daf2c7a0ca9e44d1d51e90 SHA512 764be13848db96b3da3f4c695e68721e9aa20129a79a637d621f31fa5e43a5af142a9e634d55507af163d9fc0cb51fab88be07a41255241f1921bb5676a956e5
 EBUILD mkdocs-material-7.2.6.ebuild 827 BLAKE2B 3e9dbb3b33685644b10f1d9ab8f5fcba80125f5e3d8250d799866553d746f02c52c6d82f939fda7a0577148683e18e7fc5daa94fcd13936c24934d5d1dfe4dcb SHA512 16cec7ae4ed6ee0c41eb479dfedc44b00f44ce97f1b160663e54c37b62c23ee5cdc0374e99f7484249b561cf9d0aef7be04565cfd0ee57c946bbdd7a84f92775
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
deleted file mode 100644
index f353f649d7ea..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/mkdocs-material/mkdocs-material-7.2.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.4.ebuild
index ed35fce29300..f353f649d7ea 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.4.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index d0afe7245006..bd20633fd96c 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,5 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
 DIST mysqlclient-2.0.3.tar.gz 88886 BLAKE2B 2673f2ab46ddff241260b036b14bad84947a37d002cbacd7aa53127fa3dd4fad7a37c9e2f8704d43cab6a2e0289f2542cb36ccb3f1bd66c64d2440f79d26948e SHA512 49c234bc982b373a74d65361a697dfa4f87f06d193d86d7cc40a732f48c9b2494cea21ee3f95d4d6d2a55b3f7476a92eda0c2e294766cb0ff592e1c54353b9cb
 EBUILD mysqlclient-1.4.6-r1.ebuild 882 BLAKE2B cddc4e111d81da2ecb0578ead854950dfa7154a5305ad11d45c0cddeb7460756f276ab2a71b514dc5102397b3def80c6692274e57c6349898218aa9ab70a4a65 SHA512 4474ff3d671bee527ccd47eb78d646b07864db62dbf813d5ecd7378f4110f8e2cac16cfc11a05e8a603122984c24b035fa924c6b4ef5f1c8f3670056d713965f
-EBUILD mysqlclient-2.0.3.ebuild 2098 BLAKE2B 75aef9b09010cf4af537653f54fd745a8f75bdb1ec98d75fc0235038e329d054435c93a3032c1b78d1ffdb3ebe04b589d993f1ed490962116ffc1df7ef857b7f SHA512 d00b955006c5aff7b6d4d7d3bcdb09ad453724c0d7861c7eb3752ca7001e08ae71d2f91be805114aced692c2549ba4e1d2628e6589f052f211c44e8cf6ce14f4
+EBUILD mysqlclient-2.0.3.ebuild 2095 BLAKE2B 460e66c8f198f82d4cb29ad08281743260bb763af701fa9b498d84cdaee9f80fa19fa1b473b8648c9178e8a4b4c451d56b23291fa412e03b4933884ff4c67619 SHA512 25c4fe04ac9d310490a0326b14ba7ecdffbc5e28bcac879d3ba04e3613bb31025edaa8182b0573de788bb4f72682227c3d2261adc7a105bb1f3ccba7a512a7da
 MISC metadata.xml 514 BLAKE2B 6c9f1d00d136f60a412e1fc87923ac25e1985843b04d4c5b6ce7cc65521ec23f5070dc4001cb7426cabaeec949e40498e9adeef8bd19cd4bff0761a918d2896c SHA512 01797cf940a6baa96885c2cbc9073e2386f8bbe9c1cec14c2b6b6e5cb12a4da6308a2081d894de3342c69165a4836f6d9e593f9a324712b8dfd30a3874c81223
diff --git a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
index 4c4dac00bd99..284c5af7c011 100644
--- a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-db/mysql-connector-c:0=
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 38953ddfec20..dc2c8c23a3a4 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,3 @@
 DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
-EBUILD nbformat-5.1.3.ebuild 909 BLAKE2B 612e18ee280d367ddb4af3a24093dc1bb978160bb7d903220b3b721b3af44e123f350ee2cfdf79574a117544d3e784482bb31bb3465208f6081e18c7cc72ee83 SHA512 b791370f411167e48460ee88dce8c7798657a543f7c8f2b4eaf04cbf60d6da7e276b1f441931143984d85820f6fe3c3dac707918b723f2389204c9fe7deb496c
+EBUILD nbformat-5.1.3.ebuild 908 BLAKE2B 87c7dff2fd2ca3d5562c5c1ddc5c2d71d7c2898abbec77f9eafa6a18e7ea93219ca6e36fe09f77fcefef2d36cb901444d38b7c58226909aaadfc259fde8e61b3 SHA512 c04b2f0824ce79c1aeeea42179914fd77b726ded0c1b9adbe32dc9e4ba50d331a7225c52ba5192522717e5c795d898edad72d3cc4840357501fc6fa8a33005c7
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
index 1788a9f7dc17..f93a457bf92b 100644
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 00e1b056bbfa..4c6ea4b947c8 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,6 +1,8 @@
 AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
 DIST nltk-3.6.3.tar.gz 2824924 BLAKE2B fcab6647f43f4bf139857e9f4202aee688f564851976ed6a183e47361451fae771318346724e41f198b82cebdd5a47f151aaf932099143ef6faa2a77430fbfb4 SHA512 fe7244967df018670501304d1a8aa50a0f4d42bb0c73cc5e202eeab6a0f5da1eaed9b961f6026e3b8ae4b0393d788bcb58b263ba22a3ce6f5644022736035f98
+DIST nltk-3.6.4.tar.gz 2828051 BLAKE2B f757c9c6d0b5ab6105e90e1a46fc6671d5f661f9b1b58026ccb43c00ff4969a98cbc2005670e0a81218ef4d18e45c37bb380c53be4ca60984344b11a0c8dbc54 SHA512 ba9acaa596c7f9246cd2f8da37b58146021dc2c246306fab68a37ef833a5a346b1aa7033d43b9e72b52aeda1cf8e303c7c690d1ca439f6f58dc673aa63a37298
 EBUILD nltk-3.6.2-r1.ebuild 1634 BLAKE2B 85e25a760e7c94b0b4cf463d7ab89eb34a7d235a984dbed139da6cc0f151449f670a46edd3831e7866c16a37aa3fd569aac82317ec5b07bea00712f35c83038c SHA512 02a73f3ec7e43072b6200f9b65e28a1bbdc63efa23ee79508c8eb3caa25aa7f265562561ae54bf9e35dcc92e52ba98b698e89f82303949da016186c1fafb9602
 EBUILD nltk-3.6.3.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
+EBUILD nltk-3.6.4.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.6.4.ebuild b/dev-python/nltk/nltk-3.6.4.ebuild
new file mode 100644
index 000000000000..11dd1a3283d2
--- /dev/null
+++ b/dev-python/nltk/nltk-3.6.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		>=dev-python/nltk-data-20200312-r1
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 91e0580aefa7..fd4e5ca69c9f 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,3 @@
 DIST nose2-0.10.0.tar.gz 156614 BLAKE2B 8e785cd36a781952b4401842288edf7b2551c69a894cee0d56b56c3e74de36b89bf09f849dc7264733d0c906660a5d01f2b74252507ae322073640d8ca0abfaa SHA512 e9522fddb45ab303819a38f6e4de16a2676b824e7027e8137d5e44917c21de91aec8661b28946e0bb1c7c72de907ba5eaa0e8bf76b2b76ae1edfcfe68fdb01dd
-EBUILD nose2-0.10.0.ebuild 874 BLAKE2B 6a61a1b5c27bae61d13ed89b866a894da05b1fc789ed20f2f4546de6edd5aeb79f0be9348eddd99ceda51e147f06de2cc965316555e6ed9a5f26a1c1e32c925e SHA512 f87a3cc96b067df9cc0d63b187a791dc48b6976cdee2d3189e44df9a5c5bfdd80c5502b59e6b2b331ec66a065921c5f41ce669dabfb5a0cf9ad7cb191b80007d
+EBUILD nose2-0.10.0.ebuild 642 BLAKE2B 7e5c4c8cc2840ad69591d3c7584edbf44d3dc6e0997fb0d47d663555733433dee7d372083295d542e0baf1fc268ab339a19fe5cd3ab2ba5768560dcd2064f501 SHA512 2be35070e43d36adf23360043bd4677534035cdbff009110b3ac5d60f9ca49cad16040525711945440ec05704ac868f3baf2ada76f2ede085fb7176c51675080
 MISC metadata.xml 313 BLAKE2B 6723fb509a4391fe826f0adf0de0d3cf12013c07c4090f7dc258a7be6c3903f1cdeef469712b3db285edf7680ee30b1808c8e71f433d8c0e69853912996e1ec2 SHA512 7140c75549a66cede53b1d5e54451565f5b84a8ef00843e6f1ef8737b8f103fac8a66e96e8039b2bee32e65d0f07e12e5f9c27fbe72c334eb4f37998f5e51654
diff --git a/dev-python/nose2/nose2-0.10.0.ebuild b/dev-python/nose2/nose2-0.10.0.ebuild
index 78d73e088364..868ec6bfc4c7 100644
--- a/dev-python/nose2/nose2-0.10.0.ebuild
+++ b/dev-python/nose2/nose2-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Next generation unittest with plugins"
@@ -13,29 +13,15 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc"
-# Failures need investigating
-RESTRICT="test"
 
-BDEPEND="
-	doc? ( >=dev-python/sphinx-1.0.5 )
-"
-DEPEND="
+RDEPEND="
 	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
-	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
+	"${EPYTHON}" -m nose2.__main__ -vv || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index f85d486bf267..ca8397d7dff8 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r3.ebuild 519 BLAKE2B 053300755de2e2c1d7a5c4a45945e4c45a70b450f784702e8e81884c4ead3e1e6419a683e3cc263b4aaf93a6d186326e274b6eda8f8da8c543e85deafa5be111 SHA512 fc02e0f45d5181206d6190f414eab3767f770a6770944ccb771327b679a870fc0e21170a240d7687ec177b63b43887bf2129508f5e6304b3a608957759870d81
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 518 BLAKE2B d7b693795db4d52df4d9e9c22d2e09827ecdd0e0a1e233cbd16579f6c669e9be17b87fccef1e5dd18d29ec0459a2ad41a723412f976ee678334b796bb1f7b0a5 SHA512 8220441644e09ee9223f9ec56629f4e8a6f59fb4bc6403930110aa3c7bceddf8892d5be0698f2e8763a36615b87f434fc17eaef3d45baedc9116851c7f20054d
 MISC metadata.xml 394 BLAKE2B c0690d3854412fb367fa7108883bf0d04fb79ffb895aa95d0e3b40d6cc469b3b07f2e338ba6b3a96323fdbc8524da4f2c10864b5dee00d4c8f1c26b7909192a0 SHA512 5d639f6a0f739af70b1b93f65434e87b498ee89caeb527aaa7515d81d51d5cd3d03ae53432b8c4a444bf13a39e99f812762f28f59137dc5bf1f27710555a40b5
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 25daa5260533..d948984478d1 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 0c0720d063bd..d40116824644 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,9 @@
 DIST Nuitka-0.6.16.3.tar.gz 2965278 BLAKE2B fc015f78912688e3d3b0833e7c126833352aeda7ac2599685a007445c43a7099407c4797eba47d5254fb5befde9482c210b920f4c7e38a2d82dbb5331125abee SHA512 a46af040774fd3523b64c1a113f6d0251c8d45108686017dae07429107f5057025bbcfefc7ed2b86da32c69516285d3af55fe234d25d6949562a96b0eb3f5293
 DIST Nuitka-0.6.16.4.tar.gz 2963879 BLAKE2B a6a0029f06aac5ea8fb0fec81ac5b1c5b7bb0ed85bdd0f0308ac74140792360684f42cf79f7ff7e604de3729584b335671ff57f0805aac2154ef1ea88bbbf245 SHA512 e2c73b19e459c31b85adf79270e258ca3c431364ec90b51682a7a324aebfeab1ab7703421e8646e18e0bef62f5f5636bbbda74d0ec0e4666e1571d71d41971b2
+DIST Nuitka-0.6.17.1.tar.gz 3144303 BLAKE2B 999a391830459fbfd20c52b3d640070bf4b69000ffcaaf0e86d1a0ccbd4602ce7cfb3a47658a5a94a8935f0dba4658f2616a2d7c4c176d5553ad3a488cd7645c SHA512 7d121a03539357f480ffd940699bd5df5ebb038f6914820b3185e0bcf8955ab005e2eacd49c837b94a2f5396a751264cf950764482a523e90a32d321e89ea2d2
+DIST Nuitka-0.6.17.tar.gz 3144123 BLAKE2B 07d95a987eb6c772cd58f8bd0bb7aca638c475e4e90b6a58af890e63b5d3bec9125efa54ba54925311a38cc06b3c8e60a86ce18be7f189da111798fe77da3bd5 SHA512 8678cb9cbc30d9a9a139f98ae94d7f881295bbfb5f450faafb335cce7243979ad3dbf81946024a67edea177f2baae9d694d9e93abc5389f34dddd06595158eff
 EBUILD nuitka-0.6.16.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.16.4.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
+EBUILD nuitka-0.6.17.1.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
+EBUILD nuitka-0.6.17.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.6.17.1.ebuild b/dev-python/nuitka/nuitka-0.6.17.1.ebuild
new file mode 100644
index 000000000000..758649696b8e
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.17.1.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/nuitka/nuitka-0.6.17.ebuild b/dev-python/nuitka/nuitka-0.6.17.ebuild
new file mode 100644
index 000000000000..758649696b8e
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.17.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 2337f0f51d29..a70ace93b214 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -5,4 +5,4 @@ DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33da
 EBUILD openpyxl-3.0.7-r1.ebuild 798 BLAKE2B 6461de0ea8dc4e2f611edb6baa49931be0254feedc75eeabd1e43c45ce1f84f7c3ae3a23b9139bdb162689e9ee1bb27040864df56896ed822864ed6d845262eb SHA512 e38e78ab91253a791cfc388939edcc9af6d91da017427811c05ce2478ca5a8a12d2619cd60cb72451b3368afad55dea37e0e07e9684c4c560ba0a1a0ae498617
 EBUILD openpyxl-3.0.8.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
 EBUILD openpyxl-3.0.9.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
-MISC metadata.xml 536 BLAKE2B b7f2485954fdce3ea5f40c3354cfd8775a0b098714ce3f3d8a0aacdd9a8676d00e6f07548438235aed65091cb57a4860579e3761e1f82b9bf5df2209456a7c3a SHA512 2435e40e7b8366195d1a7fc5e5bd0a759157920253a752211d3225b078d1b26313ecea475c5481db4955a4619331bc97fccb7911ed72b9a0aad479f952675427
+MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index a33001197a29..88cf8f771119 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -8,6 +8,7 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">openpyxl</remote-id>
+		<remote-id type="heptapod">openpyxl/openpyxl</remote-id>
 		<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/-/issues</bugs-to>
 		<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
 		<doc>https://openpyxl.readthedocs.io/</doc>
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 667ca73a7ec1..80282e3c1620 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,5 @@
 DIST openstackdocstheme-2.2.5.tar.gz 1244899 BLAKE2B 17e5903719303e459ee2d07b988a5dcd763d8fd2e575d8eab3a9434c1f055ee0deff237cb85058382c1f429561a220d7364019f71735c90f6cb5643b7865d502 SHA512 9dd0ee94f9a8328597647cc4be15fc60ea036f27ea385390c3f537d19ffda8e617f9f748a474c62030b67f33faefef2f222eca7c54b244c95235ffc29b0a1862
+DIST openstackdocstheme-2.3.1.tar.gz 1255622 BLAKE2B cbb03cbbdd2d22c019879b03be87d97fe52e4396cd45e7acf4e138bb50a99444a80a43c3c76f777ea74bd24ec92ca1e4a562dbc91159d1ddf3cf20c3ad86a957 SHA512 d3e190543e83d83b00d247fe79598f302684e2baece50a01c196231625fce9d7bdfe9716a7eea8cf0a9b59319f02b3c0d3cf35086e58c71cb0d958410fd560cb
 EBUILD openstackdocstheme-2.2.5.ebuild 595 BLAKE2B 687f4bf0d03f452791ec8a869464049263a75f7a753a28f4c102ba2738a3a80b7d8ce443313acae28cde71c2aac2b0639125961e02e21aa01180d5d69b38bd89 SHA512 74fd91c0b6c5752e7c29df7e17675e45db411aac73f1df9c0e222dc42b76d9617074cfec6be843a3d9242693a9a9b02e02e13c0ef142a112a02b033bef03ad9f
-MISC metadata.xml 716 BLAKE2B caa72d69bba4b8c962581e221c4e446af021bd3ffc9c7f6129bebc118a912827de640d2a8a69132a5b406574d4cb5f83db2b63258e033d4db355e47b684f960e SHA512 f99167613d0065b1a9fdc575f5e348df9b8963d5b363f2fef676c8b6fe680c3385e5c857fe25d2c681781283631306aed8f5a86920a2f3864135f88316830fae
+EBUILD openstackdocstheme-2.3.1.ebuild 558 BLAKE2B de33d9f648fb54c07bb0d5e817826eff744a7d65e2e40602861a9e2016341ff3516842f40130427459c0cd30a832224c4ed96deb777df760825f40f5fd2573bf SHA512 3d6ae98b373baee3f25f7794809f63bba2dd3662a5c28886f5dfdf0f0f8925fdb4622fd8cf9c1dd364ac28ea58e1a9e3e7f9bfcff376a475e062e962db072b5d
+MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/metadata.xml b/dev-python/openstackdocstheme/metadata.xml
index 98a86786c746..d6e2ced15d08 100644
--- a/dev-python/openstackdocstheme/metadata.xml
+++ b/dev-python/openstackdocstheme/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Theme and extension support for Sphinx documentation that is published to docs.openstack.org and developer.openstack.org.
 	</longdescription>
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild
new file mode 100644
index 000000000000..9a99ae747093
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
+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"
+
+BDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index d6ede6ac06eb..c9a4f24896ac 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,5 @@
 DIST openstacksdk-0.58.0.tar.gz 1021818 BLAKE2B 530ec940b958d5c9b1a1caba71716201172e1141ebac208b26ea512732be152ccc6e928d20e38964eb455ff47fd6f42756d3f9af19800a45104b631d45d312c9 SHA512 94bb317e9f79ab419e5a0e7def4510d6686e3b8585721c15bd1f03eced5e8f45509cf925ed2b3e51a19ecd2d3e28469343cdae5a3df549f35bb61c448add5caa
 DIST openstacksdk-0.59.0.tar.gz 1021995 BLAKE2B be57afcdc707547e2cd69774de1b7d0dc4b84ffe58bdaa4f063b85996e8ee08ded60004d3211f827d7b4a5239d1420485ce2fae92b550722c959274a18ed2753 SHA512 02f8f8f174896417f0cf4ce1c65c87ea705664fa7a1c6383ad1791f5d94cb818b5b0bfee331bd0d07d724df59859ccef91c507b0c39522115f9549d6258a3eb7
 EBUILD openstacksdk-0.58.0.ebuild 2638 BLAKE2B ab1d7b59ce18a6120ba724081fce20dd1d285db7b41b94102bdf0257d76e0a9d4c4a5d87320ed0c88a14b4e89433c0da81798c87b0779f67541fbc07ae918706 SHA512 0f2a96b33252c16ce0460d5ad4c771f617199e5d6c3e912ff8947488569db931dd993063be5469ede6d1ac50c21af3d99967f28c2df69c858856ebc3aef163f7
-EBUILD openstacksdk-0.59.0.ebuild 2652 BLAKE2B 7dbf4c6e491d08e91c88b0deb63644f03be0380c53cc3ce23d89bfa278a0eb9df2bcb70b5b178b9fd0ba570f461409e24d230085a29d0a71226e72b6ce3f79c7 SHA512 d36bacedd932e6cef5406a7ab4d757df24a9d2f51af0e6b8d292067b22ffdc135d0b1499ec5718cb6e4495c1521d93c11ac3593160eae6e1fd71668260074590
+EBUILD openstacksdk-0.59.0.ebuild 2592 BLAKE2B 7b171af6a3462346958e98bb5b479eb7d90635ce7f826ffad58fd9ef34513ed43ffecf4b2becf02be770271fa0574e75bab743e3474a5d5e1e7b8d140563d58c SHA512 de48308c8ebe5018da32eed3b9bdf92bb2100423fd5a0e8982dbdbfb480f5eee5cdf2f44ded557372630a9f6ef82a2923f9de61c71a5f9a9b2a3ad260a4fcb42
 MISC metadata.xml 524 BLAKE2B c0761a68f0744c605e0fd5e565052e83a7788a6ac532ce69bc0b31abe5465aae34762fb258248c0ee98d05bfd3eefdedd38d7e6431c0d5263739f9c5f737f62a SHA512 c5aa5c8cfb7ca0c7956877fc806fff6d4b000324fa9e005cdf246fc839bc8e20a6e6cf904afdf0d3d13efd034643978eea35410e9e30fcea8b18bc448b509272
diff --git a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
index 4c149a4c1b41..00e5891929b7 100644
--- a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
@@ -13,16 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
+CDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
 	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
-	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
 	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
 	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
@@ -51,10 +48,7 @@ BDEPEND="${CDEPEND}
 
 distutils_enable_tests unittest
 
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-
+src_prepare() {
 	# Internet?
 	sed -e 's:test_create_dynamic_large_object:_&:' \
 		-i openstack/tests/unit/cloud/test_object.py || die
@@ -73,6 +67,12 @@ python_test() {
 	sed -e 's:test_repr:_&:' \
 		-i openstack/tests/unit/test_resource.py || die
 
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
 	# functional tests require cloud instance access
 	eunittest -b openstack/tests/unit
 }
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 595e64142645..4b9d86c54b94 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,5 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
+EBUILD os-client-config-2.1.0-r1.ebuild 1117 BLAKE2B 27561a53bbbe4027f40ce7292053a8116856b7c52e3ae0327b2124f5c8538c26634f5f9d36939cd4d457aa2774842ebce9c6923270ac2c7ceda80c42c89275b1 SHA512 736feb3caf00e3353eb285343b847ffda4b6050f0ecdc017ea35ecab4f3e5ea1f1ada71ceb2b3b108a1798c042f1427f82c4850c37ae8236a9bb781504bb2252
 EBUILD os-client-config-2.1.0.ebuild 615 BLAKE2B d80ce7abcfcb821e60316c9315afc4fbd4dc0e9a5dba7a7f2e6cd6d57210438a5b302d207a471f37a77e779faa65896b7d94945df95adef761bacfdc801d86cd SHA512 2fca1dba72888c57ee232d41f3e216ba76d1aa68762a2898b4d640bb091ffa04cf77e12a102765f295380a710395e7d532bfe4b2c773657d1a36375d5e2a42a8
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..01f631cf7e9c
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="https://www.openstack.org/"
+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/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.13.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		dev-python/python-glanceclient[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
+
+distutils_enable_tests unittest
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index a62b7b287b91..4bb88da223ca 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,3 +1,5 @@
 DIST osc-lib-2.2.1.tar.gz 93855 BLAKE2B e6c863a13ea950a30a033e3877660a66ef60f66ef1e42efec39d207b1d492499136f9fb696e10001fe40b815e6cd4fd320a45acfd995504a4b7222b29951bf3c SHA512 8328541f319dfa2ffd0ac51aa89429b05fee0b160b2d236fd30cd9ce2d233c86963b744ce0a63bbb849e5d47af9868ca843db2ad79e9099bd22f59d553235d06
+DIST osc-lib-2.4.2.tar.gz 97648 BLAKE2B f5d34e4a13408f7eea8289c68f938ed47c8818fa9928da6b4d21c9b20f722360c155287e5167d445de18d2f00b8856390f995cd40812f967683d7c6e395e6d75 SHA512 4d6a0016fa17eba5c14c9db919719e6dea2ff13ca64ad6be6e0c3af88b8a1bf75ad2b47475efa3a7d262d73fcdb433afd372f573f00cb0854b5ac4c64ecab4bb
 EBUILD osc-lib-2.2.1.ebuild 991 BLAKE2B bc9b8ab0257eb747f2cb902864d13a71c5c08fc34e491fa8de790bff44ea40d26597c3ccc6ffe4bd0d9e6b6b07353635a7bd06f6eca1a9b30ac9f8e6f92f7dbe SHA512 fea0c2b89ab192e6ad89e3898c25bb6347a504d2e1eb33fe15a04e10cec7726c33d91d8cdec1dd6dc7a972bfc60bedce6d329816a30d02d1fc67dd34581b8b12
+EBUILD osc-lib-2.4.2.ebuild 1421 BLAKE2B be97cdacdacad8f51157ac8e55664f317f65a6eddaa05b19a54af9f84f138c37dda610b874f97ee7c10038e1190d64a2ca6827b463cee18106d14f6ba67c85df SHA512 b6ce2ee6d11b9b19857b3fdcfb7bc4fe1f243544885d46638351f67bf0044bf51a187145f52a2ee03fd1599baebee483fb526d2d46145500b88b47e5acac63b2
 MISC metadata.xml 729 BLAKE2B 176bf470c3c3bbe5474967ab8123237244d26e811aa6ef251e88cfb3a6ac6b7cf3b96085dc670cf2053b700e2d98534867ec043e8c3f26249d4152f9ed70d4c0 SHA512 d75db35ea445e03ca7adbfffe78946519cbd7a44251735193fab8a0a1cc3c80cf60ffaeed5b9c2f9ea92bea2ee367271f6c068690625562c8c96341f38141d7e
diff --git a/dev-python/osc-lib/osc-lib-2.4.2.ebuild b/dev-python/osc-lib/osc-lib-2.4.2.ebuild
new file mode 100644
index 000000000000..817b4b139fae
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-2.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# need to skip all tests under TestTagHelps class
+	# checks exact help message, based on another unittest runner
+	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
new file mode 100644
index 000000000000..bf43a71b0370
--- /dev/null
+++ b/dev-python/oslo-concurrency/Manifest
@@ -0,0 +1,3 @@
+DIST oslo.concurrency-4.4.1.tar.gz 58399 BLAKE2B ea28cdd53ae124fe458c0d901b305d99b7a5b5525835e6a04ca856177876fa6c6a1eff74842dcf260c78c205d95f353cd1b70f0cb6205e7bec841bae2d6ecd0d SHA512 1b7e6a2cb2e3ee0710f652489522c7a9e47a5292c46041f21a2ffe4c61a6bbae48b43e93507465013704b89778deec860da06fec32b4d3778e05cade9a6d39a1
+EBUILD oslo-concurrency-4.4.1.ebuild 937 BLAKE2B c2eb9d0b1292d0c2de0f2d28a7af15604bac6ac58440c9214711dada90f0dd085e663052837fb196add0f1fd6b7c867878bb2b9e6401030d9529f138959f5cd9 SHA512 7863eb4344bdecbd0011b00fd2a7150d14b83df073e6998ae3fb996537b090d79094172933cac41ea961ce1d765c5bf9498a7e412c4d1334da24afd98d536102
+MISC metadata.xml 539 BLAKE2B 243e21ae592bc6063b27bd2da21e7c9b7caf5127ecfa616dac4e36f34a74c0a8d221a83659596faaf5981451feb79553f4dfb94dbdd35916dafc32c5c6d6f279 SHA512 5d1bdc934197cf39dda7e8b14d573c7e401c4b18c09da4447e1ab0ec97fff0f24f90908819a0a3e03956bcdcd58af9beb95511346346c29d59eea8f752751a1b
diff --git a/dev-python/oslo-concurrency/metadata.xml b/dev-python/oslo-concurrency/metadata.xml
new file mode 100644
index 000000000000..19a76ec7391d
--- /dev/null
+++ b/dev-python/oslo-concurrency/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>arthurzam@gentoo.org</email>
+    <name>Arthur Zamarin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">oslo.concurrency</remote-id>
+    <remote-id type="github">openstack/oslo.concurrency</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
new file mode 100644
index 000000000000..1d4915b303dc
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency"
+SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
+S="${WORKDIR}/${PN/-/.}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 184235d2426b..354404b48e47 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.context-3.1.1.tar.gz 29335 BLAKE2B 2179e5c273b5e387806fc4a8b1ac2f0641f4cc9f2345cb00e6ef9c2e7c8b69709c0c14dd11254d026283b2be7e032044b6f753a13f062915db9f000ae1873f1a SHA512 a9d16475bac5aa96d086019632f417fa5b496f615b814527e547a43362f1e36ed47c47266032e72194f88716237ccff7a24bf941d66bf36afe09b846a810583b
 DIST oslo.context-3.3.1.tar.gz 32676 BLAKE2B 38d5eaf7a3162fdb6a8887f2c627ee192950d743a9de929ea332495099bcc76e27a192ce6e8a3b010e190ef749ea67dcf168476bc84ede99d43c1ec8b11e1734 SHA512 40f3418020246066841e62e5579ac4a1c761c92c5f439b07059cd0b6b2e8984d2e1dacfa57af7c6d9c97c2fda8eeb5cfde76f2110a36ef21513b42d0d3bffc73
-EBUILD oslo-context-3.1.1.ebuild 794 BLAKE2B e7a682a9e237bd136987b0e871b874dbe0d77b6a8c9e5c421284ec6b303afc131e33aa6394b5a18e104e825d5e411a6396cd61c43c2ee5431a9b48fbbe0af7e5 SHA512 39c0aa6b54a31eeabc58277c0c416164dd204c4afcedb3c0cbeea8548bf137ba551b25eb0ed8fac9b4e5a58ad0c69ff68f88899561fbb5f245717198a46f4b18
-EBUILD oslo-context-3.3.1.ebuild 797 BLAKE2B e61c6555acd066ff01a87743745a178e89c5ff20f6eca7582126e37dfed7e83a6ec57727076ac6ef682fe9088a19e42d346e080d2052466b2d21647bbb4d3247 SHA512 94848270e5c5e93fc0478d844a43429ea35465b773ec9dd1f87b90c999d10866ef05844860b9b2e110f61238a36a3ae36d94b8184fbe5c60e5e7a40b374b5a3c
-MISC metadata.xml 726 BLAKE2B 1634b5899b5396cecf149210625d90327884a825d7091208243520c421e1442b15c3791497e258f7d8943f66d6d0a615d759135e1086c88e83ee999db1e57350 SHA512 eb4c8def737d9c8d86f17a982f65bd15ccc55cf328f4c586fe343e698a3f0d13c0ee4eeefe2df4db10e09bb5cf8c48de52ca5dcf911ec8a63b4b328660370e2e
+EBUILD oslo-context-3.3.1.ebuild 795 BLAKE2B 4e31a233efae683ea1136c37761a15f4c3db3c7e0af0c16f44987707265d8484032aebc9887c01160929e3f5b826cb8a860e4a0c40e14d7830871f0a1b8e5a8d SHA512 3d4098cf23ee179e97353ea3d09c584717029497d11b37fa80761f8c1034d3fa120dd82171f7e1f5b7fef642e4c87111b292d987323b3222a2023a2d9e1f76db
+MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/metadata.xml b/dev-python/oslo-context/metadata.xml
index 48dbeb668f7a..92f76dd447e9 100644
--- a/dev-python/oslo-context/metadata.xml
+++ b/dev-python/oslo-context/metadata.xml
@@ -15,5 +15,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.context</remote-id>
+    <remote-id type="github">openstack/oslo.context</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
deleted file mode 100644
index 2fccec703764..000000000000
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-context/oslo-context-3.3.1.ebuild b/dev-python/oslo-context/oslo-context-3.3.1.ebuild
index bd441f414e83..6a0c34e72178 100644
--- a/dev-python/oslo-context/oslo-context-3.3.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Helpers to maintain useful information about a request context"
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 204a5dd48a0e..f548ff228c28 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
 DIST oslo.i18n-5.1.0.tar.gz 47423 BLAKE2B 621ec835fc975978fe3da392edda66471cd85fcfbe5af8c7a1704d7422d8f52f3b61c97ac8cfbd2aca94f65c8428cc5f97b095bc116ece605a4dc325a4a0171e SHA512 b2243f22de3ef3e33609c5aff573c4448a42c74d75022e023bea97c5338608e3fcd9da92aa2d262051e6b2ccbd5a88cfb2c91da79b7e3f81420dc24117da9b1d
 EBUILD oslo-i18n-5.0.1-r1.ebuild 750 BLAKE2B cea3aecfa9357b3ae1886be8aada131674733084c89242e7537dbe64d04bc42714e91c7331aaa94f387e68e6a8f1d91dc498a9cfc89ed7eb9d6f00087e041f85 SHA512 926fc45ddd8fba80942f87cd3e60e1c53d391ce15f22ab66ba2edf49faee1146bef21a3a89844a67d7e0ce95ffd7c2c52543c637f67af2cca84d6f6b370deb1e
-EBUILD oslo-i18n-5.1.0.ebuild 711 BLAKE2B 8f0fa1e04da6bbe74d4564de7728f48a4b84fe21aadb2ab6f212b0a6ab9c41e6cc75c49128573216948c6633bf58b5fede07fa72b769db4649ea457871c073a5 SHA512 4dfbe52a9ef4e637114444896650711123181399489130b05247787071e7259db9d7ff8e935f285c827dffffb9d8bc4964bac3bd15a31fd2348a86a56c9a80df
-MISC metadata.xml 606 BLAKE2B 0c8ccdc0eb88878ed01f3d52a8f0087047598718e82e470098d69c0cae1a5d6b9563893471ae262ba2d305220c57e5dfca83af804c3224fe51d2659c906b3580 SHA512 e92cd747eabda209457bd177c82853160574ec5a9859ff3b4b3a30f3db865aad2778f1d0f69754eaad5b6a282e2995e604934a23e27fcaf82d2e2f44ebd6948e
+EBUILD oslo-i18n-5.1.0.ebuild 712 BLAKE2B 333d0caef3e799a8aaa21293278197934bef86fa30012b890e6074fbc3dbc3461e930621bffe1ddf8da15fda2e19a335eefe55264d8cbea3afaeeb24b9846cd1 SHA512 fdb5d4840c5e38bf2ac395131a9d50cf2f5c6739d8485799497279dc81f5c968e75e6240c5a89f1440163c30060a267f344f3830e3fa89186cbbebffdd2b75a5
+MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index bbc6704c6be9..c287d67c03ac 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -17,5 +17,6 @@
 	<upstream>
 		<remote-id type="pypi">oslo.i18n</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
+		<remote-id type="github">openstack/oslo.i18n</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
index 9796fa081884..b1bb12d3b5a3 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 5f9ccbb29b9e..7ece16932801 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
 DIST oslo.serialization-4.2.0.tar.gz 34024 BLAKE2B 709c71abeb9cf84d68dddbb5fc404401408b17eaeace13935bfd5e567899d087d4e5d5521546c3791e03c24591f64b182337d78f2d54d74e71e50922099bf4d7 SHA512 2a2c51d03432c35bf872b2da9c51f6deb764e38d86d5561843fe4f7a39af8383500b214039acb37f0e972141e7c9e5f20c457084e287498d4c93a89207bdd938
-EBUILD oslo-serialization-4.0.2.ebuild 1046 BLAKE2B 69ebe0dada99a26c93528f8b961b81ef5c0f4d98dfdbdaddb0bf992927cde0b8666dddc5a30fd1ba97dff6e8d5c190d59a32d6dcbd5c52c825077bd8515d7f2a SHA512 23966b9d2f73a501849abb04bfe9cc675dc963701b0489b5ec124d209dc4f0e926af9dd2dff095e9591b639db3f4c1517d51ccd45e45bfd7efa8ef7fc504746b
-EBUILD oslo-serialization-4.2.0.ebuild 1052 BLAKE2B 2467195e7af06416b35c886d9d7df286ed10c819f2a30293376d81c71d2f80bb578ded4729e36ef13f25bf6a1ed29e48c19b6f6f21b185b649af5bfe25bed1dc SHA512 1debc8f1393bce5fb0ec5e8d832a5364414ef1d7c3c77b5a233b3a3632c053852bc84c7b88e81d264a64137553e412acd638e93144446ede93ee84338a0e4e4d
+EBUILD oslo-serialization-4.2.0.ebuild 1049 BLAKE2B d299b999296966b2209f078a308b349477dd33c6dce84630da47a99bd2f5af255e6dab76c517a40148983b9b31d4da7698f8037606474f54f036e19c04a2565b SHA512 0ef2402a3328e76aa075b821ad7476ea6954e08942d72c81e844d19bff3bb1c901a7bfc9266bf2c439d8bb0923a6f03b9850212500f309b2af7a04772d204825
 MISC metadata.xml 615 BLAKE2B e25d338d3ea1f94f81bfa5d225b1883ac14eeecb217ab0b4d8687bb8a7ddb35bd33e39d894444655f67bdf346cd394ad280aa511b8c291c4525265877ab75942 SHA512 a95c2e689c9f7d5a60fe1c4bdb9b78eaca78d78cac5ccb765696204122f65a21ea5285f6bbfb88cdbbe1042e69998872bc545bd2af1ab8765317f3a042860778
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
deleted file mode 100644
index 6c3dedea3314..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
index e80990be9a7d..276f78b8a82f 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 3e9662509b7d..3f1087cd3947 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
 DIST oslo.utils-4.10.0.tar.gz 100481 BLAKE2B 45bb815943912b08256cfba943fb729202346eb8b2ec4b3d2ec5ca8ffed55e321f2abe2a579202240b529e4520bbd70a23ec0dec760f74aaffdd236ee2769723 SHA512 ff51fcd4d12701bf9e729d7bc1e8d6091a7768e7583fcf7ba879e69ad53c6425216c76fef783012f3d9f7cc5947179c4470225416e314c9c0836d201a6d76c14
-DIST oslo.utils-4.9.2.tar.gz 100047 BLAKE2B 4dab375254015d312bb20a61597e24d55c228dac1970b3724e188d96ce8319f2f7b72d6d14220265dbb1543732f86af73ec2b3be2c1d2fc364a5c419fe7dd228 SHA512 17e32d63292b95f3bf44baa83d68575f7b9050a220f091d8a5e4da4347e9b543d02008558c1fdc61fea9f4d2c0b0dd8b6552b694d45fd698095530952adcbe11
-EBUILD oslo-utils-4.10.0.ebuild 1289 BLAKE2B 3bb9f84d7333d319f3e45a5469302f3f281d52bb36228facf5a94b58b60b0dbe700e16b8c80aaea416bf0e24754ffb9b50e3c5ac25e55551a2aecb48dec9d2b6 SHA512 b336c215b44a30dba7e59af16c9867371e94bc6a315d6b1113e03c059c975088652aeb0a91ace19afdfce7fa6b40385f6e2424ed2c385a52b879b8dab70b4b86
-EBUILD oslo-utils-4.9.2.ebuild 1274 BLAKE2B e58e580b3d7e50519d421e82644eddcbde2dae5c0c25eec3a8529ecc717c58ae3c1dec98cbbeaad0f0e9a682454d5aeb4f03a0394af499e1c96f32e6a33e4c1b SHA512 d542f308644f401e001039674befcfd47eea65f78b6fc8fb6e688a08c1e4feee0e7d8dfd9874504074ee163642756f7ce87e30cbc722efb3d9c3c52968e7f4ec
+EBUILD oslo-utils-4.10.0.ebuild 1286 BLAKE2B b780decbb0cc7d8daf247774ab008ab837c3daa8a8c3090f8018cb7c2e4321ce3dfcda08ef5fbadb8bef0513665b5a15bfc72310eb06d4162634d0f9f75296ae SHA512 d4334c5f92f205f4c5e2563cf1810ad2b339b0003d4eddce52d19575bbf83cb5399b875072d79013e0c76785471da6a924675469d1d6a29ad0700d376695c9a5
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild
index 45519072b840..48ad03a4b210 100644
--- a/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.10.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-4.9.2.ebuild b/dev-python/oslo-utils/oslo-utils-4.9.2.ebuild
deleted file mode 100644
index 2d6b866146cf..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index d6d10238ed96..da1114ff095c 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
 DIST oslotest-4.5.0.tar.gz 38233 BLAKE2B 73fbf056467c5d86c647b0ff49ce2e75654c8a2ffbcda78f8ea49edddb55a4c5e0f065c7a95291468b2d5d73ec5f5152d16a2129ab17fc5e6d457284e684ec31 SHA512 2dc0644365621fe271e09f2f7be631f697749c9d343f1ce9b635986df41ec5be8787350b3f2eb6b6501f4baac1ec597b2f0ecada7936db967075ebce837e1517
 EBUILD oslotest-4.4.1.ebuild 658 BLAKE2B 5bdb57aab28a40f330c5446e72b8a5e5e60ff213995533dcb3246f41478cb35c79ed0fea59d7eb29141efc9b8a6a41eb8817577e8c36005840f65cf96b666c87 SHA512 67062d9036c40e30dfd6fa983b28f5a7e1289f5f8bcdf3901cd257a981b28d627c6c1c1c070eafd1140417ad34f9bb50375dc90edebc4ebb633b0113bd6eb277
-EBUILD oslotest-4.5.0.ebuild 668 BLAKE2B 9e4b3fd987d6b178b7e2fec41246fed00a8b8e1240dbacc34cd837a0aab72ea15c194894f5d4534dfcfbde4b2b917cd10f9e5ad3ded0f7bf54a646e19c066055 SHA512 6d82c9c1fc965783bd4155dfc602ce09ff10181deabd1f8306402012ebd42ca570def06ac94c4718c5f45dda492830c1541059f83130db8a79005c91cf083009
-MISC metadata.xml 877 BLAKE2B a57743a820054d45f61574e3176bf0b32125fa3228a6bc70e6f9ec018100958e4197d33a8d0c612d568fbddbe1dd3486bfce7b78f4d93fd2b7774cbc6816d820 SHA512 6f21bda141de902fe33c9281b870a5637261537828327efe316a4d9029a72bad65cfb0c1066a9d22e4b1fa1603137d7f827cdd219e557c40af1b6a5d3114a68e
+EBUILD oslotest-4.5.0.ebuild 669 BLAKE2B b3e064319cd14ef8caec0abffaaa26e3224037724beb69ce64b5b929b5140d1c9651b38b5be1871b341178946072dfbc1964a92420571eb739682eb8149ea984 SHA512 6655bca82ae945fecdfebc758b2385cfda3ddfb239e7fa34bce14feb6e42f1340371dee4ab3bb6a72ce4a0fc61377a5f1f6304aab92be40f768baf7d64e3b510
+MISC metadata.xml 935 BLAKE2B ec63aed42de004f150dad32092560db0c3e76297cffdd791fa4f717af68ed6e88ee012923e1a41583ae56568e9e7ce8dcefa58d38cc66f675d78d9bf6a17601d SHA512 b116d2489597a1088c189a0db83950551c2da239d7a27319b63f886b63deb047fc6ef1b021db8044b14420bddbd759856d655e7d114df11bd918c1263ec8a1ed
diff --git a/dev-python/oslotest/metadata.xml b/dev-python/oslotest/metadata.xml
index 5fce0d21c1a8..aee541ecc086 100644
--- a/dev-python/oslotest/metadata.xml
+++ b/dev-python/oslotest/metadata.xml
@@ -23,5 +23,6 @@
 	<upstream>
 		<remote-id type="pypi">oslotest</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
+		<remote-id type="github">openstack/oslotest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oslotest/oslotest-4.5.0.ebuild b/dev-python/oslotest/oslotest-4.5.0.ebuild
index d54ffc620182..2f853dd73397 100644
--- a/dev-python/oslotest/oslotest-4.5.0.ebuild
+++ b/dev-python/oslotest/oslotest-4.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Oslo test framework"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index a830c0941a64..ffdfb1e8eb56 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,3 +1,3 @@
 DIST packaging-21.0.gh.tar.gz 79977 BLAKE2B 4ddfa5069f463abeab09ed92650a174d58622927d24b22eed184506d36d9144520e90cd5ea6570e7c06af3c768eda608decc4befb402942e6d6cd1ba5cb10b42 SHA512 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b
-EBUILD packaging-21.0.ebuild 841 BLAKE2B 2d97c39d72974b8d51e5ebe9ac4c7cb07d7b31e15eecf1155e7b81e4c37f8b977e073eef9f2883fb5dfca826e47340b4a35abe9b4c46f346acc964024ae4971e SHA512 e27b7791da4560ecad7c8824b3ff334c769f963889429628a31c32fadd704de06c61e10353c0ed7696e48f856dc7acd5ca098bcfc2e5060091460e3b6b8f7994
+EBUILD packaging-21.0.ebuild 901 BLAKE2B 508db15d470613c74f72ab77bec311cf5344692dedd118cea19f93716a4178a151b292a8e1712dd5d776c3565b4101d30769d8936eaf8f713c157e4d30aee8df SHA512 88e1b52ea52233a1fddf2b874cd914ca010a5e01785f79ee83934c0e2f366d6a0576ada15276ac03c554ad01df4bb38cc2de2c8a368cd38ffbbee4539172589b
 MISC metadata.xml 391 BLAKE2B 0d73ed3809b26e3069048116ab247ceeb9e2932e0d8d6063b97cc1f0ed8359e73a54b22035fedb169524e502b6a07b8203e6c35d801f738bbed685d90e12bf96 SHA512 eb4d1ca476a45232547fdd961a4e6715dda24c7ab82e1f1995ac977b9825793d5d10a2ac408b1ee0b7c8b8444f2c42be33d6fb1012461f96db9a71477cca67ae
diff --git a/dev-python/packaging/packaging-21.0.ebuild b/dev-python/packaging/packaging-21.0.ebuild
index 2f7b5d11bba4..90a00ee03e7a 100644
--- a/dev-python/packaging/packaging-21.0.ebuild
+++ b/dev-python/packaging/packaging-21.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3  )
 inherit distutils-r1
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 00023e15926d..1648e327d83f 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-2.0.1.tar.gz 20312 BLAKE2B 6fc745ffc5d344cd542f1b299ef5151144a13d1f75923398d42a6882d3c80aca4827123a3bd1f751dd771e882170c76f5bad99ad42d09dec2a9baf474d846365 SHA512 6e16ead8bb489336f8b8fe7e50d1e65acf950ab64c90ba1508ceb07bd598d8ddd5b960d9b31697867ddb7bffa970a08d7d53b778b5eec5e01b7c07babf2d5de6
-EBUILD pallets-sphinx-themes-2.0.1.ebuild 691 BLAKE2B 3f614d7bfef21fe54227f630b9325f2b309e04d5722b14e306fd8c3c69df570656305a48afa8a5cb63a717de200acb872334b241541a2f4f5fc712a37a372881 SHA512 0ba4e3112ae58a0300d73d1d6e5f725c68437cf6b40ff944ac20979ae988700957fa55a2994fcfab95eaa1de6e108eaf6ca8e80943f7cb5504807ae86fb9e4ab
+EBUILD pallets-sphinx-themes-2.0.1.ebuild 697 BLAKE2B 0b704f7b00c45fd999ac6cfd52d2126107fb9af239c0d0676b3d52c09f779d99d4e838d5e0567767125858eb6ca802d0995d808193ce99d88f0d7a471292ddc7 SHA512 6c5dea14a7ca87a7e9ec2d41fd73ef816c5d071ccc1eb0e84006b8594883539b938ef7b85eea071356cff143d05d817aac39957a6ad4c26b28692ab0738e2962
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
index 4057a576a16b..641fd7382c6a 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index a4fc7e1e122d..63a8bdb4f9a1 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,4 +1,6 @@
 AUX patsy-0.5.1-py310.patch 1159 BLAKE2B 6b734bf60d74f071cae590658b613c36fef694d99362fa30f4e6651a14c4f8063c8a67f93e756447712146d89b8f3371a8d08604a40edfb29f31c60b1e7a24b8 SHA512 843cac6b873114de82f784d3bd1ab4d317c73d4ae125088d303a976d15ca38eb6a0e2598e4758eb06a984c3c3820814b0b66380b3f7138eceef0d4730ca2fb8c
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
+DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 EBUILD patsy-0.5.1.ebuild 668 BLAKE2B 033448e97e8f2f889d43bdce7a099dce9bfdadf6dd137586800f34d632b156f910f6643cd5d6bcf27cd08dac8f318fc0e88fe5a6400fb60bb27d86bae0b3e232 SHA512 47db98de6b64287ffd59c3994fae0d2fc31e9c024782aa3811cb7daec8d2a0395816cbab4226026b4acc478b2a7b45f2379602960ecf98f08f3c8d8dc3aa0df2
+EBUILD patsy-0.5.2.ebuild 626 BLAKE2B 7b110d367ea1e319659f889b6292f08cc5b05b25ccd0645c54f605961fd0611508a20d7eb5a58f4b6536ac98d203790da722898b7e77ec30232d17fcc54c7a85 SHA512 aba6f4d0d064a902a7adbdbe8984955f8a1315df8ce8dfcce88c2cb1d3a4f2fca439a623bd12835022f710487a1fad1daad32b3fc023704147a1504213074852
 MISC metadata.xml 569 BLAKE2B c7e5c84214d6630ee67fc867db27979aefae315267eb1689750506c5ab39189dfcc39bafac886ae3319a6a0417b68141eb60ef19c257fa4048ca8cdd0e4c1709 SHA512 ba4bd3cb646d50fa3388e3fa138f9dafa78e171e1be114c63f122ae982a27702a9319a953a697e7de3beca10d8a642ab35070017048bbee89c5e5d729fa70d57
diff --git a/dev-python/patsy/patsy-0.5.2.ebuild b/dev-python/patsy/patsy-0.5.2.ebuild
new file mode 100644
index 000000000000..79ca7593449c
--- /dev/null
+++ b/dev-python/patsy/patsy-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=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module to describe statistical models and design matrices"
+HOMEPAGE="https://patsy.readthedocs.io/en/latest/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 09489b81f92f..6301395b647f 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,7 +1,3 @@
-DIST Pebble-4.6.1.tar.gz 24800 BLAKE2B 5030b1206eb263ac4584b4dc5a6b2d13c39af827245c5f1574b30138a80ac4eb501374e22109bf20c4bafc21105cea7030d30f68fb9f48e77400b028f30c37be SHA512 0d6c04a45af66f8d849225e87158f33e8ec218943008dc385c5b13187f816d7e7a2fb485ab1a230b8d5e2ab23fc9fd18efc57ef3f15dc5caefad9b75cd149de1
-DIST Pebble-4.6.2.tar.gz 25877 BLAKE2B eee4835ecf9a2a83ef4ce58be3f87c41fb9a4469695218e5c4f4b779b4f14b8d8097bf9d9e9cd60cbd12a8261c7715f2356d7e8c700e633738d9313ce6373b3a SHA512 a46b66539ce8a51417bc7a396da82a9d3f63b69be09f9d2d647c0e5c52e920a1b68f7543ef06c3d3231807c965a7ddf93ae5ad1ffcacec98b8bd15e2eabb60ff
 DIST Pebble-4.6.3.tar.gz 25888 BLAKE2B 71f9e4c77d7dcc841f8c3a5e9d3df764727c27fc1ee5bb8250e33d49ce006ee94c11309f469f2ebb79aa720fd58ac2741b240aaad8f6d3c18be68189f180b639 SHA512 92cbb5ac01cc6fe57055facb6bcb6a64e19eb5eb3a3ae5fead32d4dd1001a3c70fbf85ef832dffc6b6bb81af6b1c275e12a61eda421176548a7bd5a928056313
-EBUILD pebble-4.6.1.ebuild 535 BLAKE2B 703a36115d4138f5f7a04129bdb1ff7137461f1b225ba10fd95c185867dd8c09139df36b8a071e5c091eef56f94ff26fc59e2c9c86d712d2ae4077e884119617 SHA512 2fe56fe2a040b402b0e16b67816c1876cb13678b21aeaf353d8b30d9588a6d4449e05e7ad962044d9a53efc26e368b017141269b64c4f652c3d3923b5e64ec48
-EBUILD pebble-4.6.2.ebuild 537 BLAKE2B 159e34e53805f89c6dfc121caefa9ec9103c0c14d2cee81d77d34cd5155ace5db245118421ae0227d78f2ae3e305a24141cbedb3077b40c18f03aceaa11a7e31 SHA512 dec99a3d895584cdcc2dfea6821092f5c2316228f947c0200e924a5fef455aa3b4750a0cceb6fda7d7b4a87b7b34d53d110a1adc92d9cab8677b164f44fac926
-EBUILD pebble-4.6.3.ebuild 543 BLAKE2B 6dc1a6e441a3bd4316999a14fe20e083c86c260a3f96b6eb19d017667d2bf44790db39d4505dd888f76afeeaa1ed1e2993767c5119a95bfc985688cafa0a52d6 SHA512 381b631ac20765d33a3c5d3bbf7d3aa7ddce8e3430d78f27714686e394b9e7b067d88b5c5072233d5852c8471a570e32c0c8983629715c3a2baf391b7ebf7245
+EBUILD pebble-4.6.3.ebuild 541 BLAKE2B c3898dd38634d622d9e8351915c6d79756103c285a47bcaa474bedf1f908ca51a08b811cc98123052b4ab1e5e2b99e808344177a6787c2c603fc253cfe081cf9 SHA512 96dc9ecb010b67a0b52bb01ce3d8a8d1411d6c20a5faf8a04e1094a24cb438a70bed2db8cd10424572f4cd32631a7954d7c0ff03b00730abcec255e40350f7b3
 MISC metadata.xml 367 BLAKE2B 587e93606cf39400151b413a1d1ee5446e6c6dfbde19bf2b9cd8e9a7226c1d4df53c8849625fba7c61a84ebc8939803cda5c1250c3068cb8cd61ef9db901ab6f SHA512 8f50888f29afc88c791f54078d4120eb26a0217ad76fd72f311bea4bfb769cd37adcf657bff4949fc9360b701b44d0736cd294101ce9838db538b6a34e103dd3
diff --git a/dev-python/pebble/pebble-4.6.1.ebuild b/dev-python/pebble/pebble-4.6.1.ebuild
deleted file mode 100644
index 13e2b001e2c2..000000000000
--- a/dev-python/pebble/pebble-4.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-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=${P^}
-DESCRIPTION="Threading and multiprocessing eye-candy"
-HOMEPAGE="
-	https://pypi.org/project/Pebble/
-	https://pebble.readthedocs.io/
-	https://github.com/noxdafox/pebble"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.6.2.ebuild b/dev-python/pebble/pebble-4.6.2.ebuild
deleted file mode 100644
index a56e138d22ff..000000000000
--- a/dev-python/pebble/pebble-4.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="Threading and multiprocessing eye-candy"
-HOMEPAGE="
-	https://pypi.org/project/Pebble/
-	https://pebble.readthedocs.io/
-	https://github.com/noxdafox/pebble"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.6.3.ebuild b/dev-python/pebble/pebble-4.6.3.ebuild
index 21c146c258f8..e0bf181b3773 100644
--- a/dev-python/pebble/pebble-4.6.3.ebuild
+++ b/dev-python/pebble/pebble-4.6.3.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 98f3e2ffea04..d9f6e386572e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
 DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
 DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
-EBUILD phonenumbers-8.12.29.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
-EBUILD phonenumbers-8.12.31.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.31.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.33.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild
deleted file mode 100644
index b1997c3749bd..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
index 4df0c54c7011..b1997c3749bd 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 42d936fc137e..9fe3457413b9 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,3 +1,3 @@
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
-EBUILD pickleshare-0.7.5.ebuild 518 BLAKE2B abedc9858ce59f905a4cd980b350f2540ed5e0b84d3fc9dd36266f222b1809032ba9bc9326261e24bbe7c17f8905bc59695d893efda9b42f786d36c77c7e9271 SHA512 b3ce63f7c36594310897bb218f075e4c2c625e69db14c4241308c1a2985425fbf0b3653a1abbae58e468a7ae2bef38fbf4a59b1e4db3091802ba2c4f235671aa
+EBUILD pickleshare-0.7.5.ebuild 517 BLAKE2B 2cf942cc4bbb9350352bafb313f6b0fb73d1914c2e32f3e1a025847b3b763de5f1ce83be13878a01afb633b21e7c17cc8dbe71fd0ee52236022355f6ddf16822 SHA512 409f3f1908ac448ce73291142fd2e3803858953fe5987624314b1069f755900137c28b6c8ec1d9b8abae6ea37a84a84f29fa2c61ef0a1f6d332ccfc74ea7d596
 MISC metadata.xml 970 BLAKE2B 834db945c8e9c90ddcacf7d001f108b9e26321a155a747f5c7f00068cf915590813d1293afa5f0516233ab52d9a04d73091793bd945fd6e9a96cf51263fa8dd8 SHA512 12a8f50cd4f8aba47aeba2326400d488051d92ea05336b91d59f10e8c2885d00b39a453455c748ff1777a339c39ec0f5273126e719cbbcc8aa15503285b220a9
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index 854ae2d8b559..564b35aa6ed8 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 47d3489b6767..05f09efdfc9a 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,7 +1,5 @@
-DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-DIST platformdirs-2.2.0.gh.tar.gz 17674 BLAKE2B 1b8e31033194f5682fb8c06be8268cc1ce6172b2bc9f0bfa0d376ab4387547c03c18d46e7c387eb2c36e5db42c09398c95d75cb32e4c5a59f0c7517e867aa1c1 SHA512 fbf4a6929543f5777576a258592e8065195e4d86d728f5c9b4065d1639d53b1c3c5de23c9d58282c291a7f600107af2de097ca2328f632927b9b773140590510
 DIST platformdirs-2.3.0.gh.tar.gz 18338 BLAKE2B c7d2b1b7ea65794507153b5c8d4d2e5a0668e4f9ef78024ab08c724e5cc5e91d0b6d7ec115a1ddab8a6fd7d34b4cb84cf3ebec64079d866344d2a7d18ca617e6 SHA512 3d20476d5064b6e300cddb5dcc9ba15346b1a8c3f5bfad869edda05cdd123a00a0c6c18b15af49a74f55fded5e11d69112b77239fe6f8f7da97c9a43ff442d8a
-EBUILD platformdirs-2.0.2.ebuild 644 BLAKE2B 25e8794d977290db4ead470cadb65c4b864074434723b2096585cfec3d0b265e6594e36f102220193b42aee7018b747c5c5bc75aa733ab5968de6c96d56f13b3 SHA512 a2d4bf191a3bd78ce299101d5ff0cfdb7baf434fe39535733b3448e43f4d3b4d6a0a80a1f9b6aee76f1126e20d647d15b2c06ffec06348823500acb309e96b99
-EBUILD platformdirs-2.2.0.ebuild 785 BLAKE2B 684d0310c09f107334ef902e4c3eac28bf9e5eb32b972430573643ee8b38216db0af16a2c5121ab84929887d95e746d235afe42a8d526fab95e5c1f2264d07c2 SHA512 f4a317c329777d239cd41950f1884400005322ca8461bd362ca9c03b52bb3b748f1081b491260484c4824b24e8c18eb0ce27c156bedf057863fd21ec079a4aba
-EBUILD platformdirs-2.3.0.ebuild 803 BLAKE2B c767e7b83c0df2330bacbd45fca203c331d4abd71d54231fa40af88ad15ba7ab5b1ba787daa9fd7950137f0b77917aa711ca4cbd7c1a2318e37798296acb5809 SHA512 fec658124062fe60fa5d7ba8d92b68774506b88f49fb3f8bd8c988439b2a1a0a8ba3f3cedef4f5abf4ba65be9a8a1cf864264d9225c78d09560c034abddd1fae
+DIST platformdirs-2.4.0.gh.tar.gz 19482 BLAKE2B 81ebc4424bd2845ae3b28d95428f95c7920300193ff98159263089b3db0d104a3a59af616bf6b815c0c8b1453d3f05d85120573c71b16b0a5104cc2532c472d4 SHA512 76b492f9d1a5c666c3c6957c775055bbd74db93f2a66f0651a74e1914626d757ab8110df87281cd31ad65abbd89f02906fdf8f0854a44f8500487685993fb8af
+EBUILD platformdirs-2.3.0.ebuild 796 BLAKE2B 0092e91de4510e7a7e52dd83499495d6952bd57ed0a2fb6e16ca107ae615a86e213d2c7b4234fefb7fcd53bc91e62317bbef03b9c9e829d6c38790eedf0cc9a6 SHA512 55f13de709aac862227b259d5be80bad005aabf260ee58fbc85b7a11fc6f3baef7c2e03211e28fcb5fde5e9381a3b89aa72af5894b08487c75a8f7a3e2315977
+EBUILD platformdirs-2.4.0.ebuild 803 BLAKE2B c767e7b83c0df2330bacbd45fca203c331d4abd71d54231fa40af88ad15ba7ab5b1ba787daa9fd7950137f0b77917aa711ca4cbd7c1a2318e37798296acb5809 SHA512 fec658124062fe60fa5d7ba8d92b68774506b88f49fb3f8bd8c988439b2a1a0a8ba3f3cedef4f5abf4ba65be9a8a1cf864264d9225c78d09560c034abddd1fae
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
deleted file mode 100644
index c57296e69f97..000000000000
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/platformdirs/platformdirs-2.2.0.ebuild b/dev-python/platformdirs/platformdirs-2.2.0.ebuild
deleted file mode 100644
index ca2a1a338088..000000000000
--- a/dev-python/platformdirs/platformdirs-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.3.0.ebuild b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
index 39dce3345f62..2f9f2e8a02cd 100644
--- a/dev-python/platformdirs/platformdirs-2.3.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/platformdirs/platformdirs-2.4.0.ebuild b/dev-python/platformdirs/platformdirs-2.4.0.ebuild
new file mode 100644
index 000000000000..39dce3345f62
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index 15572fd7cc85..de4b4b9e1dc7 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,5 +1,3 @@
 DIST pockets-0.9.1.gh.tar.gz 42077 BLAKE2B 0cdc5a63389b7c01df9a2e63fc1e18edfb8471da8084832b3381141459932146fd46e2e1cf8f87fbf33fea8204a46596566be62ca6c5780985f0d7bd18d5d3e3 SHA512 a24418759bc133a0c62cf0a606a851d00cf1bd280c731065b92fb96a5274a45bc2266a4e1fec3db929aacec5baab774667052e7b732a53c4c4a217663c02ec7b
-DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
-EBUILD pockets-0.9.1-r1.ebuild 595 BLAKE2B 05dbea40222ecd161b81ef971a96486119fe3e539766b5836df97a951280bdbd2326e8456504d9b27427c624b3e14d72d1e9fc5010886d71c14fb9df55020b33 SHA512 b01b2a6a5886a4de0937de8a47c0266546ab0922a065013f440c3f20ab7a7131a808fb0a873fb45a5e34749ae9b9c095d2cb38f7101fb95728b4dc52d298df02
-EBUILD pockets-0.9.1-r2.ebuild 846 BLAKE2B ffc2816c5237773c9126885c6890914c9f9912d89ee12e74dd0c4bd6192f301b90a70e93ed38b231c585729ea3d74fac54091ac3cc652a6c19f82abc9acb1068 SHA512 cda0a83a7a3e3ffe40f91087453398f8d61aba6f200c65b6c97ddc09e6fd3a305ab3e90786f3a09b7630744788020cdf53d8ecc4bb67ba684dabef69aea09f96
+EBUILD pockets-0.9.1-r2.ebuild 844 BLAKE2B 7a8311b65dccb43404dad7758040b2f697424c5af0642fea5ebb4ced31fd24eeb62ba4c1a368c0c6a2cefa8a9fbd918b0e6e7120ec64d91fcb359e77cfc40c2f SHA512 aab13f010d4d4629b577ea5421e9655649a71678929a0c49f36a5ba70d2dfb6d7fbe6911fdcc6f71d9555ae4b4eacb231bd2e78454376f8769bb224ea9484de4
 MISC metadata.xml 415 BLAKE2B 437322971edca427c00ea9d96eb88611ba29f1549197fa15846efdb8961a5c294d1bddc2076ac998dd69a9bb6b56310ea9f8d54470e83d3f54755bcf1970d6c5 SHA512 276f4ef504941dd7cb7c3cf314ed7faf41ff071c36c5ee53b658990828368b25ab0f53b9ad833827a97ffef4e25eb0c1caea28a361d7ad076938d8e61bd61908
diff --git a/dev-python/pockets/pockets-0.9.1-r1.ebuild b/dev-python/pockets/pockets-0.9.1-r1.ebuild
deleted file mode 100644
index 4abde4b91189..000000000000
--- a/dev-python/pockets/pockets-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of helpful Python tools"
-HOMEPAGE="https://pypi.org/project/pockets/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i -e 's/description-file/description_file/g' "${S}/setup.cfg" ||die
-	default
-}
diff --git a/dev-python/pockets/pockets-0.9.1-r2.ebuild b/dev-python/pockets/pockets-0.9.1-r2.ebuild
index 4e7e77a96337..ce01c439d500 100644
--- a/dev-python/pockets/pockets-0.9.1-r2.ebuild
+++ b/dev-python/pockets/pockets-0.9.1-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/pytz[${PYTHON_USEDEP}] )"
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 16815fbd658b..fcaf4184c6dc 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,7 +1,9 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
 DIST prettytable-2.2.0.tar.gz 44939 BLAKE2B eff6eeb98b6accdb5089cfd1ceb09db2e4a0897e9675a07b744a12ab15fb1cb43bd4a411788d8e22662089f68a31c346d79cfaaca44c7f14f452870a7039bdb6 SHA512 df8ae2a1103a4965a351ba16a95ef9659107075bb023090bd9bffd69805ce647dcb26f49164f07f5af0c0b03503373c0353935b32a0fb18edf969dc984aecda7
+DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e2c7249923d5299c967db74dbd37baef9557d8d5511defe54f64e3f4625ef45635cf2f00a051a599177a3774da1a5 SHA512 5496b1525342b9df4b88cc2cd6079d8c329787b20f7e581465dcdf447b90f78aad764c6505aab8a0e3c4cbb44c943720672373cf754d6f7313b68c28005a707c
 EBUILD prettytable-0.7.2-r1.ebuild 606 BLAKE2B 5ee8d1567cbcc4ba9ac75bc7ade72ee37f9dd658bcbcd8097ad3104b021e121b02fc93dfa31ffd711afceca065b4b9557ef8668e7b6da73fc01379a16f152ae0 SHA512 1a1016c21f70ef304875c21a1a2660c0433c2e68ff2d630695a123b581b15d0846a97d705f7f91ec1a4f3010fa90baf28e4c7fc29c42fb3ed63d709f10ccbae8
 EBUILD prettytable-2.1.0.ebuild 718 BLAKE2B 7609f8e3ab0c836631cba6942243a8058428eb8b78c1e05d3c2ccb97439b61e74d0621d61a4471131b466b334f3be750eb2b52227531cedbc25237afb025da2e SHA512 a9538a82e439b8372eb0ec32f28b1bca1030f74dd3e8d80dcb50517fd90978300bad2fbc04937ff58ee94b40cc01c3dffdadab72e7bc84ddf46701fc1a3c5463
 EBUILD prettytable-2.2.0.ebuild 814 BLAKE2B f545600336ae8beda699ea9f51bef6fcef71d8d656a84a2167b1a1d57c80cbcc767ed2fae31e9a8b26307d0c5d61ca6c3aeb0f68abccafe4293b9b6cb1635bc4 SHA512 d91f2bc87046647cf019739e851f05e0fc15f72214c2a7a97a9f225b9607006903293dfc42896a2ed1d6710471419e888dc23da4d540953bda3c472e2f8b5499
+EBUILD prettytable-2.2.1.ebuild 814 BLAKE2B f545600336ae8beda699ea9f51bef6fcef71d8d656a84a2167b1a1d57c80cbcc767ed2fae31e9a8b26307d0c5d61ca6c3aeb0f68abccafe4293b9b6cb1635bc4 SHA512 d91f2bc87046647cf019739e851f05e0fc15f72214c2a7a97a9f225b9607006903293dfc42896a2ed1d6710471419e888dc23da4d540953bda3c472e2f8b5499
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-2.2.1.ebuild b/dev-python/prettytable/prettytable-2.2.1.ebuild
new file mode 100644
index 000000000000..f2e0a92613a6
--- /dev/null
+++ b/dev-python/prettytable/prettytable-2.2.1.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 4296ed2e78c0..2e70b31906e9 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST prompt_toolkit-3.0.19.tar.gz 3034818 BLAKE2B d1f0741931d4711952cfaabd992e64aa3fd252627c50f2a0ad8ad1aef5882bd4ae054c0d281b141595488fda6328c102f900445a42bc32cf018d37663deb2cb5 SHA512 0f3f7c5a2d12e03e06e900a4239f86f27d959fa7337d072dae8c79bbcd2ffd4c1026d1531210e34a4f4669d483b20b9d2f49c7625d0d7aa1fcb1e3f9f3894349
 DIST prompt_toolkit-3.0.20.tar.gz 3037349 BLAKE2B 52773f9c277d1a16adca007c19d087e46a0dd4ec154076525ea7bb59523762513bb137534bc18f17aa249fdc7ad07327e400b3bb730b32a614929f0a48d9cdfb SHA512 3f2a0edb4c7756cdcfd0ddf19f6016910aaa5de3ca8ee0dac11bd0fdece301b4d562681294b7cf9e6d5eb20937106f771ffaf312961cda4477ce534cce8d8db4
 EBUILD prompt_toolkit-3.0.19.ebuild 612 BLAKE2B df5de2b77aff12ddb7dd80d746931e589e5b2ba4afca55da906d504e8f73402fd7281f79abadcce8af4255bc1fa804bd54255e323871cf0e397adf72cd0dbc3c SHA512 91e0b16cb8d9e1cced54bd4342670d4a4eb86a7f27cd926dc016b893ae88db7d1f0af68ef787c6ce1d42664b43f3cde1ac1c13d11bab8debc43b6701f8c25a6d
-EBUILD prompt_toolkit-3.0.20.ebuild 621 BLAKE2B 81de62f2f2108a9e82c8ab8dc6828d18ea5fd0fbd3dd2c709f3c6ecb58a5461cb7fd07c53ef002e48470619f5170e12390f98b2258694e4c14846129b547b76e SHA512 5f3a8286ed1549373567940056ddc2d1eee5a080b1cf4f52b9b4f9647cd633c043c28ed8b2796de2177447ee3c4b86a59404dbde21a1444f762eb656a58efcf1
+EBUILD prompt_toolkit-3.0.20.ebuild 620 BLAKE2B 27d958dc82f59aad9395079a22b226225ded45fa5d098736b02c133528d298821b741e1cb49e266f8b87efb3bdc2f93b9d0b27734d28de311f0fd1b053321638 SHA512 3146f81ca228a7bc5687bafcf34e62dea7a13da0ed3f86b123c5607a41c006ed12d712a4208b41fe17dec7e4bc7e5dcd739f076192b173c1c9d992a2ae7e1273
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.20.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.20.ebuild
index b8bfb9e4504c..b8f3d81cffab 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.20.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 55e068163e1f..5aaa52f6315a 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -3,5 +3,5 @@ AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e9
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
 DIST pycryptodome-3.10.4.tar.gz 15552675 BLAKE2B aaa6e6768d099b7b229f2b920671577800baea11b8b5a8efdd818f3d5685e46ac51d1c79d9c987f1d93cc9df98c786028137348c946da7aff35fc436ff21894c SHA512 1ee2f6c499d7ea73bdeafc94b1e91b45bf888f84ea214a01db180e030b4724264ba05e16241c465484ec13075f5300f6c489229bedb84e54b93e2852906b634f
 EBUILD pycryptodome-3.10.1.ebuild 1533 BLAKE2B 93b9523336f06fa12c19140fc4dbfe1e1aa2c0be7e7d48955b3e86b0ca461a0b8b4d360e9e6e37448cb9434426db78ff3a7d7ee646a8d04fe2349c945f60e903 SHA512 671ceadeb8fd10c0fb8a4bdba29f082f192f03f4163b92fbe753fd46c7fe1b9a3c9371f6460dac44552e5485fbb337726098bf1c0e24d4777763777ac60bc9c3
-EBUILD pycryptodome-3.10.4.ebuild 1130 BLAKE2B 0c62e744f70243af0b9ba0327ae23dfe81861241b054dcf1eb34d811f8c10ae0a6592d739969a41d0ab8ce391182e164cf0e415aff14159d9ef56140f7b444a6 SHA512 ab65e2c962ce6bf7a64431e353fe2899f0182cbd51e7dfe4eff70dd3e9607c612b27b254053389aec2eaba2c5d5f298bf6e815c16e3d29cc976896a123b938a3
+EBUILD pycryptodome-3.10.4.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
index b9f61b34e0f8..9bf29ac5892e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index fc8edb5c55e5..4604ce6fa28a 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -2,5 +2,5 @@ AUX pycups-2.0.1-py3.10.patch 576 BLAKE2B de0c617d24d18290c23fa7938a62db451dff69
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
 DIST pycups-2.0.1.tar.gz 62968 BLAKE2B c9d955b89f2e9746827721c875dfc97538bb4575ee3f78c41a94f06b361cd3d22c14d453bfbea210160026d33c6e161b1d14c4dffeaddd644c260779f56e1db7 SHA512 fdebf1cac8cc4fffb8a76a938aa91965dae4a3dcdb6d8ee26e8e6054809d26dd3fb20b10c2351fb9265c03b16d6bde011815111c452ccb058518372f22d9d617
 EBUILD pycups-1.9.73-r2.ebuild 659 BLAKE2B bd06f65fd93995b9a6874762a67c47d936745141f393e40bc13c9935f47c2b4cba9a0830de4d478a0ab9b3bcd15432f1ca9e58f0ee9aeb376c673d7f5863c024 SHA512 79c5657bb659d2d0377a9b20a91851435535b2cc485675133872088d96c7f1664eeb2ed8bea98ef4b693663298ab2817832261f5afdec8c8349faab187ac5ebb
-EBUILD pycups-2.0.1.ebuild 803 BLAKE2B 2ae3093ebd928f15014d2dea0e3ec1d3e2c396b754a1dd02b19dfbcd3705dca66210524f4b16e42179a9b462fb8ca93ea5d56be94ddada906e43ca9104723dd0 SHA512 18e034fcfd77e2a2bd1f49325032293d3ab31e2396e4f89ec513c200688087a7b5a83e5df4861c9a53aa955869a04e78bc398abf05cfdf3bd0098617bc60d175
+EBUILD pycups-2.0.1.ebuild 797 BLAKE2B 5585adc846020aa06d543df859b2e18654342645e47716e3388cd7430ce567a6b4f672b9c2d64a18ead660e81e22209c9c391428ac9b6698c02b79ba5be81cc4 SHA512 1f9c06746e7d0291c510d62b7df0c7da6ed90e1af80dc6a54fb2dd011189dbf140f5fa363f141f7c3101988b45ccb312fede598e7c3b7af372adc6d50d5b1b8b
 MISC metadata.xml 567 BLAKE2B e0f8590318ffd3bf0963973f947ade6be086cf99f5f09b49cbc6ecef7ce397aecffd3cb534339a3a86ae98b88da8c60619a610bb8eac9ec1ccebfdcbc329408b SHA512 63e388902a77c052d0944b84805ec0905598e7f0126eb67813e4c75f3a11a51c2ba8ae46e0f8c3bd64f5c96806e0784c23b2b3e35d3261aba65b267fd28f6c71
diff --git a/dev-python/pycups/pycups-2.0.1.ebuild b/dev-python/pycups/pycups-2.0.1.ebuild
index 57d5ea1cc9fc..fb6c859e8a30 100644
--- a/dev-python/pycups/pycups-2.0.1.ebuild
+++ b/dev-python/pycups/pycups-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-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"
 IUSE="examples"
 
 RDEPEND="net-print/cups"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 55aa4edb5fc9..95669c18cdbf 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,5 @@
+AUX pygit2-1.6.1-libgit2-1.2.0.patch 1870 BLAKE2B ab6d4884c5330e98f5e889f4605d8b1d9527033603707e8c3414944261aade3dfc3c8d8a0bcf7efa0d73ddee9d1390db47325d52205ee6d00ce95f39dd0b01ed SHA512 f5fb9217812057e62db50fa4f10ae0d845c031565956c60bc2b498209b11effcbf4dbd2f253c303f4b2b7192403fc777e4854ae472dc6c3e2178c19a62acfdfa
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
 EBUILD pygit2-1.6.1-r1.ebuild 945 BLAKE2B 79cfd82aaf7395b5adddd3b4a791f6c848221a2948d02fc75d239d77f5aa4e456a3163b5682db51ab2f8181cfc5aaec1f29c999fcec83ac26bdf77e674761160 SHA512 b0ebb0bd047fd0b1d2b58f970ed7cec2d63ec86c1b01e2461fd14fb85edc29824372b92cae3a0fdd52c22aef30d4b2ca03d401749a9ed500e543df606133a3cc
+EBUILD pygit2-1.6.1-r2.ebuild 999 BLAKE2B 5f8e1ab0c9a4041cd80821c858904debee9221ffffaf44d5933f31b73122a300e1566b4def0779dcedb0b636f54762c4b86fd656a8e3142630cd82d222adbb58 SHA512 b8bebfb9341ebbeab1daeb6207c27a131140b278dea2e8431f8dbb6140853ffc42176ab338c1fe45dd7e06a9c12423c4b7483519096e374cccdf9a1be3e5a33c
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch b/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch
new file mode 100644
index 000000000000..d3e097ba62b3
--- /dev/null
+++ b/dev-python/pygit2/files/pygit2-1.6.1-libgit2-1.2.0.patch
@@ -0,0 +1,48 @@
+From dcde9eff5950492ab0d2565a07fd18d765332a96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
+Date: Thu, 16 Sep 2021 11:19:04 +0200
+Subject: [PATCH] Upgrade to libgit2 1.2
+
+Closes #1089
+---
+ Makefile                         |  2 +-
+ build.sh                         | 14 +++++++-------
+ pygit2/decl/remote.h             |  2 ++
+ src/types.h                      |  4 ++--
+ 10 files changed, 29 insertions(+), 25 deletions(-)
+
+diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h
+index ff84371c3e1ce81a7e9914d4d4592638f41376bb..4e912c065cd6eaf19ef6d0304b0fd8f646edbff4 100644
+--- a/pygit2/decl/remote.h
++++ b/pygit2/decl/remote.h
+@@ -23,6 +23,7 @@ typedef struct {
+
+ typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
+ typedef int (*git_push_update_reference_cb)(const char *refname, const char *status, void *data);
++typedef int (*git_remote_ready_cb)(git_remote *remote, int direction, void *payload);
+ typedef int (*git_url_resolve_cb)(git_buf *url_resolved, const char *url, int direction, void *payload);
+
+ struct git_remote_callbacks {
+@@ -38,6 +39,7 @@ struct git_remote_callbacks {
+ 	git_push_update_reference_cb push_update_reference;
+ 	git_push_negotiation push_negotiation;
+ 	git_transport_cb transport;
++	git_remote_ready_cb remote_ready;
+ 	void *payload;
+ 	git_url_resolve_cb resolve_url;
+ };
+diff --git a/src/types.h b/src/types.h
+index ff967b81f76688f8f0958638d99a06f7bbacb99c..89ad3a00149a1326c3edfa20d2d69d629cb1d2a2 100644
+--- a/src/types.h
++++ b/src/types.h
+@@ -32,8 +32,8 @@
+ #include <Python.h>
+ #include <git2.h>
+
+-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1)
+-#error You need a compatible libgit2 version (1.1.x)
++#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 2)
++#error You need a compatible libgit2 version (1.2.x)
+ #endif
+
+ /*
diff --git a/dev-python/pygit2/pygit2-1.6.1-r2.ebuild b/dev-python/pygit2/pygit2-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..fa7f6c1fbf6e
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.6.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-1.2*:=
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-libgit2-1.2.0.patch
+	)
+
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	epytest hack/test
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 25cba0ec4392..d7d3b90d4017 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,6 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.10.2.gh.tar.gz 813391 BLAKE2B 109f8817e32ddf8d93c9120518e77a1d2f7e61cd1a6362eb1cf9e6d242db72fa1a9271588a3abb28efca54bcc449dce623ae5d5fd63153ec2bc367e008aab465 SHA512 5d694587956c4f11eb4afaec26cefb66ccbe14dc2aacf378a0362326506d80eb2633e0d351c0a20715a3359a9bc438092d77b2e46f7f787210c7ab0555f2722f
 DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
-EBUILD pylint-2.10.2.ebuild 1451 BLAKE2B 7ad2315c2d652e005b04354b2cc57aeb09590aa5d4c216030b2000ed08e64941b26be9fffd2169195946ccc157e74689a1b4fd4788c1b25ad68cc725e58201ff SHA512 6672969604b2c79a89e4f1907659f264c6fc6df0c7634ddac5458abf2720ff0717fa91b53f58b4baa0d875b89b7c9d6847fd22fa8f53f5be22ee640c8261ff39
+EBUILD pylint-2.10.2.ebuild 1444 BLAKE2B b42a90326d85c9d3534b66f619b297c4255e04ecbd4f008d185ef1f35854f01381d040619227c71663be534a59f6cd5b606d47b4231afd1812bc5eb18c240c6d SHA512 0f5f4be70bca93f12c4ccf6e0dfdab0b5886dd3fe22c2a82f4c2f412a5439f969c60d4b6bd34d085183eb296e462a224e8c3097b9f55295fc33c532927415900
 EBUILD pylint-2.9.6.ebuild 1417 BLAKE2B 5949b36afe3130c030a608e7e2854ad4264fea065082794463870e2801a13c992952de59d83d2dcefa25a489cf6faae5ea4e441545429380e63298f9aa5d3297 SHA512 1d600f96bfd5c34a7f7c96e3451f71d8b7eb81cd06f475fb1a244ab6c2ff2f0e9e593470dd797a126fa9ea1080872d6c23e9427d74f919b7dbff838ab5927576
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.10.2.ebuild b/dev-python/pylint/pylint-2.10.2.ebuild
index 5127696ea382..458edd00d90a 100644
--- a/dev-python/pylint/pylint-2.10.2.ebuild
+++ b/dev-python/pylint/pylint-2.10.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 3ab5cd7fdf3e..e5714b6129c1 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
+DIST pymdown-extensions-9.0.tar.gz 978665 BLAKE2B 328b36bf34b362ed20b8f52576fb8ea1bbf818e99815c15e0779e38dc560134096bb35ac9a5a4ad11c713921052b0ac0041b0fd2491fc76fcd7cfcbba0760f0a SHA512 813d81900b19e8235e67da362951e3e72f9948751cbe3ee9547e043d535fb8b480f0b65aa811a8b8a67c25509fefef01d3f46b4a1a6af9f00c8be244ad6fb6a9
 EBUILD pymdown-extensions-8.2.ebuild 1192 BLAKE2B 10a13e389416f44b7156715ee1ed9948720ee9e839dd7ed203b8e8d0de90ab4b9fa637f8fdbc22f1cc207bd54fd65c7e50e3923df39be4b3c2419f3269ae52a0 SHA512 c58b66762a48a8a88e6d59ba171af5c312909d371444a30c4041c93982232cab39eac07b7a23d0d5bfb68baa321b3a6714448f873da4b8f6beaa7791cf05338a
+EBUILD pymdown-extensions-9.0.ebuild 1194 BLAKE2B 83b88a1a6cb629a60c86451b43587e639c1ef44bbf691b77b52784f3fab31fd2f14f26a890b55c68507de93d438ae285537f5e7b4bcc2d3232bc86dacf529f7c SHA512 5bc6cdabb49f582d4ed38550ddb42debbdf86f962ae40cf119dd7790c73f7f8e98eeb2479302e3900813820b53e4f6f6a483eff245e479796d2ebc0d9ea8aca0
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
new file mode 100644
index 000000000000..8ed924a3f6a8
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index da4ccf83c614..550ade2c8e86 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.7-r1.ebuild 854 BLAKE2B 1f1ac9c6191168f08acab4b57e26751e5a217d8b76eef3eaaf16fac78bd88704dc514eb72cf5dd98d47d7b5801001d42331de63f131345a7b0c5d181c8af599a SHA512 4d5086e7f72f9aaa1151d7cb6e54c48482d52c218b7221200b526d5e74c52bb17603c74b4ca3c6702d506e127381efb632a2dbae1b4a66f77790c81bc30e87a1
+EBUILD pyparsing-2.4.7-r1.ebuild 914 BLAKE2B 35964c6637273b2a733d8d7a7969a2eb771aebb230f63d7756788cd4de9403e29375f379f0333c45775efeefaee4cacf483eb93a9a02e8b6c4f7148c0bc36b18 SHA512 adf954f17e3de9ba1376526f6cdfa17ce9cce221e13eaac8382cf68feb5b75b4b7b26de54297ffa96250ae902c2499996486e8223ed61c9b338fabbf773068f2
 MISC metadata.xml 797 BLAKE2B 9707adcde7106fb0726de82da965fc3aaf7a23b34f4b71cfea4e09bd03cb44c069ccd4d16e6a6f37eca4720ff8c52d0bc11c864bd7dd9e6995d0d25cb92c5cc2 SHA512 0f791598d2b4a37797e7f917be22093f01020cde34876d7d0db3d1b2bf5da8a18d5399d70f381d98ea569f8c3abf7f1cff8b3cc92fbab39bb00f329a58e96229
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index 5273b6f4b0e2..225b1b9d79d8 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 MY_P=${P/-/_}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index e4aad4126222..bf2b81ceeff1 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -3,5 +3,5 @@ DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff
 DIST pyproject2setuppy-20.tar.gz 12795 BLAKE2B 14f1862c546d9850f0e523b79c44d49dceab76752c4a0b5527d33b36bbb459735b29ca9fad9d8c72f1be189004014b2ce6b2b6858842263fe913532800398064 SHA512 1d75b908611f121c6723037d0132c890d9d00f3f7b1b237fa658dc8c217a1f60e7141a99a7d744e9b8ff67b5fdef1fd11b38f4a3bda0858a55836ad49211a068
 EBUILD pyproject2setuppy-18.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 EBUILD pyproject2setuppy-19.ebuild 789 BLAKE2B e9e2f1054075cd7f5d2bcc2f58f589816817ddacf4e73be175fb3f7491cf51a59e8b0d18f9fa872347a902b01e39ea4cb7f8f03911f993e1309402183be8dc9c SHA512 1ce6b5186288ef992365ecde9cddeb48ba98585979f2360186f323cd048b59a9c9ff91c9ade4e9c41efdc2bcee1b3cc6aff4173988a31f6bf51b17db4c828faa
-EBUILD pyproject2setuppy-20.ebuild 788 BLAKE2B e5d2d17b2b6117c69a12f7b21f19f4929b3786fd318e9a6daa0cd978f312f08d14aafa1cced2e9739e3e8f61cb3da70584d47215ca9500154ce8c6798e2826a5 SHA512 83fb22f8360eaab4871a28ad38f1b7a6064eeebe188bcdef4ef9f16d53f8e5444743f1e64b258d3f54b88978f68b843e22d3daf70a70c71f5be3e91b9014433d
+EBUILD pyproject2setuppy-20.ebuild 794 BLAKE2B 75603adafa8605bc645b01b8020190124d1b17f718feaf9f1dfe39e9976b0680f1d0ffc9f9e577457bf74618d26671b1d8fb5e5c8b6166dfdd4296714ca8dc3d SHA512 0af7676ab338b487ac2dc431b64e9a0aa5f174de1286f0b80c59696a06b13b0c8a715410deae1e29fcaa025b96ba5fcea767af0e0924bf77e0fef077d91bb0d4
 MISC metadata.xml 431 BLAKE2B 6403b7a6b11b6d90ce2a2978e3a57bf7c837d0ef5d2af3e5fe45f105aceb0c32e1a76cafb9dcf8040b0ce2bd884739a66aff2bd318cab35799e26efd1426c73c SHA512 6638d532a2ff39492b13f9114f4ed22c0ffd2bbe1c28f53fe1f9f9ae6731a4dd05ecea612b65d3bff830f5aadf5c87241f0cb84b2403513707ed453c4e091f37
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
index 4c79cdf97029..8def81edd086 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k 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"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 278f10eec853..81cfcfe14c0b 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 651 BLAKE2B 87794388acea8d033ddda6af2a0cdb158e2f7fa06eecde906e759c6396404f1ba669d4918fb139cdffafb8185939ac7f348158110a966efdd4639891b06288f6 SHA512 a7b86483bbfbf4a325ae10beb3ddcdbb00feab0ebe2bd12ef0779e521ce52e25dbb64d81f49db68d7e05a110b93965af48f0b79ae1ce88ec040f5e5868ad0516
+EBUILD pytest-datadir-1.3.1.ebuild 657 BLAKE2B 233ba007a4998d182372a6518bf732ccec27f432a106add051068cf6dee0d96a7bceb50b3775a9de22f67b55689a3ede442a77a60c992b338f42a81192e1069b SHA512 2a5aedcf766846de12099066ab560a0d640c48269308a3f7951cfc48e674a91a826ebc56e5f5efe49e31dc0b87436c02ba8e193e5550049a88686236a5deeebc
 MISC metadata.xml 360 BLAKE2B 32eda1b71737f15dd195beeb8a8b8a94c2c931a234e2c582d6841e2ec10e5e40010cb461fea2abeb1eedfa460da3edff78bd0befe638feee5b38a4dc453f221f SHA512 cf15128efd3dcf4b064a051144f9e1a7b2cb236f90ef437849204026ca2997e808866fa4b7972212daeae5b438a157a2b82d3db34084c5f3a94d7012b36117c3
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 2af13e2a61b4..5399eb0dda5e 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 74c69c28e3d1..bdd5ab33dae7 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 647 BLAKE2B 79e59ac6574b01ef2aff97e0c8f5f3122c9f454698905071f0e1ce850da20894b0e72b3660ee3e13f874274dc7ed09d7b00fcc165eeef1152e07a4bb53cb7f3b SHA512 48fbc186d4b620ab9a178984f04913d4e6e2ce18d55deef6f0a4fb9f33287871ec6097e62a621b238c496eea3db09c94101d040111cd910c8206d9c930cbbcc2
+EBUILD pytest-expect-1.1.0-r1.ebuild 653 BLAKE2B 80c0e18ea66f67cc13603dafa522d1e80dfad1bb4b1fdd544a075fd20371d93576e7eaf1b9e31d5bc3e1986c82e81816528f81c1bad5e8c5bd586ca62428acc5 SHA512 78b056e88e44e10c7d0b72b1b19b5f06fb36fb516910ae04d942009ff8c2d433a329d21ad217d88a8ba34c44d57611fb35c68029c637d9026241fccebdf09737
 MISC metadata.xml 485 BLAKE2B 76212d43ee4934e9f7b98ae1c5dbc9799e4b388bf7911d2d5a69f92556f3c45521d6e4a9de2899716829f80503d7257bce3aa4d594563197028a80952fe0e234 SHA512 959f50811969db93eff402e0fd7672bddcbfe1e328a06d09844584c8a90f7c887298c7a87946d4ee8a86e832cdd51e684fe548869904efda737ee989af25c5e1
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index 1b3a2ce59ab0..4cf73b582293 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # no tests
 RESTRICT="test"
 
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index b7466c4c6951..6167cb1282c1 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 1104 BLAKE2B 2f593a03fcf5455bbc7c3a72f694b3b90d8eed8a0559e572e31ce48167cbf76dd1f5f6fd30affadbbaa83a68eb9e8cfbe89fd09e95ca8b66a0b8ca82aa95fe84 SHA512 1b7a0fad035c630c4fddbe47d1db9f341ec2c92bf35138daaa1ffa74cbd1d211b1d3fe3b95215fbb21f3cf9ab643d68d8356c2310d8998783771c01fe9bc7dc7
+EBUILD pytest-regressions-2.2.0.ebuild 1110 BLAKE2B 55ad26f49849cd8ac41234f5ce94e740c62b655af8ba755a9797057aaff23206765c1f9100db7a305c3a53be3c8498c0e5556377effc48c51fcd2a4346477da2 SHA512 3b8302351a2e37c29d3657dcb1fcddb3e88155fb1294976a6226182970fe175fcbda61b1647f2ae2a4707b97af49256d5ab9b6669f1a5b8f88f50b44c2ce1370
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
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 43606258a43e..a562aefb9732 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 1b7d2cdc28f8..c278f965cfa4 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1,6 @@
 DIST python-cinderclient-7.2.1.tar.gz 251082 BLAKE2B 20b1ae9ecce0161e225b510363be74f7197075bd2247d3f5386894040582a61379faa1825197728bf9981fb9c6d66cc020483a07c0781e30e43f6bdadcb33185 SHA512 c434a353185d8e47d5849f08e7c9418454a5f643292837f0890f9aaccbf939be4528ae75851164068a2bc2ea39a4c841965be664bae4e7d37fec54a55c8332dc
 DIST python-cinderclient-8.0.0.tar.gz 236611 BLAKE2B 818279d06b597a00a66c34cf3b468e8293aaf1e90fd04c996e118ea206d475e598d7c8b9ca78542bd07ada1db5d7a2c7ea9a3748fe85ad787d283c8d8073ecc6 SHA512 ae0c5e1d6f0c173382f57f95ac05ec8872a8ed548b145c1f91d96ab7b9e4602cba11a7205c26c81027ca4ad07cbb69f675244e3606ae5dca00c22eeb8bedc126
 EBUILD python-cinderclient-7.2.1.ebuild 1057 BLAKE2B 2837e9d8d4bd6bc52595ba4e71fc9a6d11532b3274339e7678cdb7f4f627783dbae43d226bf743c99a8f19f04bb0afe7ec1398801c3c6380dc828fcc84d5eaa2 SHA512 64ed43f46c4e462bda547204c09ffdd469e2f1d50d65ea57b00779bb3a5958f91091705de80c2f1c079b22650b4d05eb90e4052cd5fa9a6be1dfbe25cec5068b
-EBUILD python-cinderclient-8.0.0-r1.ebuild 1299 BLAKE2B 1d3d308cc8bf6c0197d8b3eb99b621d0f54eb7ceca992371ec81fe2a90803bb5c345b862109203a123093472a000e65e946584d6b9d603e27272d003bcca9cb0 SHA512 1ec79ad820b31392768de95fbe3434ad2d7cdeb0a3879fba6f7be032194bfb8c03c50e4d6e8240cdd5a1629894d6c75f439401cb7f39cb10b811176a9be75250
+EBUILD python-cinderclient-8.0.0-r1.ebuild 1297 BLAKE2B 05335aed3f1b230dcb8f746bbdcc63f155af0948b82e837329709eb599225db02d023e2360d713c21b5bca49d7ec4a61a9f78a20e2b215904e565b535ba1f0aa SHA512 ee80b0376d92be4c8eed9b329f3f2840603571436f29db882fb8647e80217ddf1b45116ec2ba715921a1b9ee3dbde1bf29a7dcf9b455e21dbce8d910ea50782d
+EBUILD python-cinderclient-8.0.0-r2.ebuild 1272 BLAKE2B d2996af242fd2264f537e6011f2f532ca30559109ac0a76485046a5930c27cb50a05b21e239c58899639eb87a9941894e4b09020e5ff58ccfd8ddc712a156e44 SHA512 279cd940250393f9ba70d09fd8533f61e46a64bfab2186bfc924d589af98717c92f455274fefc0362255c830226f776844df43b862ab4cab9eb602e96c69a210
 MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild
index 2e6cf4560d59..44576c3c75b6 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
new file mode 100644
index 000000000000..8453b966a990
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslo-serialization[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b cinderclient/tests/unit
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index ea3baf9a171c..ece7aed0b090 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,4 +1,4 @@
 DIST python-glanceclient-3.2.2.tar.gz 191501 BLAKE2B 0ccafb81aa01f35313a6d312496538b0a3c7f2b8df9f0523b244fdcaf55eedb48a7b9beb750b56df2303bf0e4f32e6cd85bdb998618584bae05f36db606b0eed SHA512 900c8120f2a06f2bf5016ea22883b78926c5b8b27782692f3e44a473985e31cd8c6285371ef16f61dfac79828add8d841363f043453cd68ca6ddb31c8c126606
-EBUILD python-glanceclient-3.2.2-r1.ebuild 1392 BLAKE2B 1a4bfa38d923bcb6b3eff021fb0b8dda2b0d62827f7032ad90bdab24f794c32f258cd703e53456b1560cbf36a64430e6ed59774ad440e73ecdcac54132a332e2 SHA512 4a56e02db0554be08dba952e0594ee220466a0258d9b666f982995860d0a7ce5f90f9db3c14ec17e513a2b8b246b8e15cd2f6aa59d975c556bd66a4136c5ee58
+EBUILD python-glanceclient-3.2.2-r1.ebuild 1390 BLAKE2B 311a5f52816ee70aba0dcb7da63a2a75db7659c2e9d8e3239c4926791c119f6b847f00b130dac007ac693ed0634b6372811587f27afd5b874d6c83b347316077 SHA512 d8f35a50158a4eb2536f83fa43fde8b238c02559d4245ac836f86360081239c1d7ea82d0095bcdc5fb1977a4e213cd40ca88d3ec06e8a5c7b4450863bee49b33
 EBUILD python-glanceclient-3.2.2.ebuild 1055 BLAKE2B c85d385b2a7a50545fb9d0b43962d4e37807d58c4912408a06fa9151ea2777693380dcb19df84308255c3e45adae24213bfa9c77413c98cf4ccae6747816b5eb SHA512 5085edc18ab762512491fd1ce665f86bf5251ff985eb02a7ada5ec54a38b5825ab72d79f3490261916bed89266ca0038a66e19d4904e876fcbbe45e57b95e017
 MISC metadata.xml 556 BLAKE2B 1007f5d86b8a7a5feb6018997ad5126f31c10d619d480adaf28db855ae9745c1395632b1d0fb9c915106e7678b7148487c3a2de800e8bf19e1abe55b00df7ecd SHA512 43aa944c6c8a91dfe59aa8261718fe144c852f0e036cddbf4453cfcfde21816e619388de98713de965d03c63ae242ee4fc27be103263cd1d44a5985b3c905fd0
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.2.2-r1.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.2.2-r1.ebuild
index e0999c504f89..15d95e7670f0 100644
--- a/dev-python/python-glanceclient/python-glanceclient-3.2.2-r1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-3.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index ca9ba70096c2..8977a0cbf86f 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-ironicclient-4.4.0.tar.gz 205165 BLAKE2B eac0eea383890d9d9d70594300df5d8771217e0ba226a38da38544e715487c12d3fcace07651b84e180ee0601ae6bb3c17b6ed47130bd009ed351f1e4d270d64 SHA512 8d9325e464804503a504bbcc3211f0e6f50d4a1cccf652960d1020e1cd0141f8ac67ebcbab37ba7af417679fef3f25d5aa48b9e8134fffbc971cff34446fec3c
+DIST python-ironicclient-4.8.0.tar.gz 217915 BLAKE2B 6ef8636a063eaa344bd414aa5a75b08dc4ba4c615835defba522233127baa2454f9c54de40874cd5fde9de1748887ad0c1a002da31176059a5d8562a8ffeda87 SHA512 c784124e59ee836c3349e17f347b59bb96e28afd067b7de2d948563293c16d2f641c15d3312c56c9fed476e1c8c9de65949bfdc139cd9267cb210c5cc70ccbb3
 EBUILD python-ironicclient-4.4.0.ebuild 1247 BLAKE2B 220da8c65fcb58606a9d5a803d193d5c07c67c105330cd4c3cd1a3da4bd968770fd3dd208ea234f07da1d3a2e6c1e797974ce114b7c02fd6d81bacdc4f015827 SHA512 f890583c05a168285168d2753274f9b3e47df4728cb81a4a6e154163b036d84b7d5536d3ad228c3a1421be865c001cb69aaef2e5135d9d541bfa60f243ec0f29
+EBUILD python-ironicclient-4.8.0.ebuild 1398 BLAKE2B 29bf7085e2edd18903077b09f4e019339fda73f057d7c541dc1bb780b103f1694559b064605086a2231c28130ba38fd39d9b9e475c9b4cc5b6bfa3ab38613016 SHA512 1bbf21efbc97167161c5d7d153fe2b1387397d18af2c197e6dc6483b1398cdce4a490c2bb255d58cbcc9e8745e71bbf8bb0d5096fb188b72633d86ad66f0a204
 MISC metadata.xml 337 BLAKE2B 15cacc055a0d30f7e002d10388af0533f089c7b694b70a8bd2d9be2b74b093b87268e710b7c6be7a88cce3946882eef807203090f1c7484c895c8254b7ef959c SHA512 739d5e13560065dc8e4931a15e0a6af7c650209675b660d2571ee904184bef9fa7d5e27e0d73ea9976742b188b109d8634687e6d9b6b6acabc4dc3950ae995a6
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild
new file mode 100644
index 000000000000..fe7665bdc9ab
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-4.8.0.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 077d50c4f355..f2ced255556f 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
+DIST python-keystoneclient-4.3.0.tar.gz 324711 BLAKE2B ac32c2e4a2a86562cd694506c83e05a4373e86ff619c96772c8bc38329a4e1f52d2cf332b16cccd9690ffbd79c5046e08d44fe2dbc520ce2c2a9b92abe3cf634 SHA512 08131026648a03e03f5bea4505c7fc4922317c8e9d584729c569433a66416cb1584dc932132c5bb7b7d892b1d2545a731b0d77aadc321b1370e332c8fa9eb5ed
 EBUILD python-keystoneclient-4.1.1.ebuild 1066 BLAKE2B 722ed128639b4e17552819cfec52325b404f3c6fb6172135109cfe03fee81a84cb52048b0e2e372d64d2757b8d4afc98e146e6424023b409458b7e83c5700275 SHA512 1f239bd6bf7a1223cfcfdac2bb36aa5cc87c9ef46a596b43b1c83df4af7a4f0913fce50d6195093cc474f0ee67152b29494abfbc9420ccfa480f7446a8d6f701
+EBUILD python-keystoneclient-4.3.0.ebuild 1552 BLAKE2B 35df30485d210d99196d3b3e5200bc14c66f87c82bcff14202fdfec534b7e9491dbc0d87325a82f4ddd45379a54ae47e7aaad8225854f4035c136969f2a998ec SHA512 0a2003504298caf731840feb62ea9b6937c2a31799690c198edeed1f43144e8b1bf0ff91dfe94f6a74e1ae21b63400b2132f62a856a835d74e5987b23be0eeb6
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
new file mode 100644
index 000000000000..51f039cf6f1a
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest keystoneclient/tests/unit
+}
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 13591492edea..9f30e8724441 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-neutronclient-7.2.1.tar.gz 294034 BLAKE2B 46ddd29327a9c8c8cfa28b90585a6cddffd80a3892a97df53d6e3624570277525eee0e74aac4e9c70389d2abaa5fed4276e64a37df517c3903b649150cd0060f SHA512 7b05ed090e0c88e203b38ad536e303c5ee892938e9013750cb6c0bc1d5e14b50feb3ea3a6dd9534c99182b613d225d99b8aa432be3623617dae6a364bff7adfb
+DIST python-neutronclient-7.6.0.tar.gz 304124 BLAKE2B a7dce6092a66f1a6f84f17a8f2caf0d7f8cfa84a6a6dc5ac18a12186f155f04f23deaa2e23b0da62e538687a4e573e0e54ce0c78c6b2d572447a10a15ce6cd2a SHA512 f624b8de5ac7c157351518311c70ba111641b8e94c9230689c3bd3bdeee72d8173ef0bb9498fdb603eb3f01c3daddfc8f5b1b80ea0dade5c2b1d7257520fee0a
 EBUILD python-neutronclient-7.2.1.ebuild 1764 BLAKE2B 19bb35a07cc1d957a8745cabb19757eeb439220dffba48c5fec7f2997319f2afb37d1725f72232c10f4b8f67dbb4c3a4eec8cc06518870cb6f3a1b14d6e8b132 SHA512 bac032d155a7e5cbb0ba7802e7d934e00eb6afaa32219ee061c4cc00f67cb677e0e355d7538ed0d357cba8e183ef7ad4eec4de277df7ab415dd37a3e4a05f610
+EBUILD python-neutronclient-7.6.0.ebuild 2224 BLAKE2B 4a4c4d9bb274d997072251057a7a100b09f6014b094d088a576b800da86555b9831cdf12ae00782d894c3b34ea1e8a5eaf87172163cf69284126c9c7c0b885f1 SHA512 c9591676054cf17e654f28fc3c6b772fa3a966b3abc77f1ca70c48a2f4c91fbcadc5f90e516bf54ccdd8d5f937b555bbbb26b97e06bf3129d9fd429e6fd9a85e
 MISC metadata.xml 538 BLAKE2B 13ead632c3a584fb1e8393993fef34cf6e9e61c3d80b90ffea2ab5280abf61235c8823f62154741fc9dcb7bac9be9565c4e8a1e3c4aa4c24af9a6673b0fa2f79 SHA512 50378bab897481da3809a9d9c82d53d7b3e0470e1decd432ca18ea1e57875aed3ef5b8c993f23099529ab74d7e0575b664d53b4abf8d737a1c7933ff781cfee9
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
new file mode 100644
index 000000000000..87d1631fe413
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bandit[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslotest[${PYTHON_USEDEP}]
+		dev-python/python-openstackclient[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Needs osprofile
+	rm neutronclient/tests/unit/test_http.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b neutronclient.tests.unit
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index b4e32fa15747..504b55dd8b04 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-novaclient-17.2.1.tar.gz 323330 BLAKE2B a7dd4a7b134c09945c3549ce014060c95da07d9125d5b24e7c99369c33538cfe56cee9f90c17a1d8025ac74969af950dcdcf8b3f87197cbd099e84cca857e23a SHA512 d1a9966f7da80e0884a451b3b014c45a1b4057dbdf0d8bcd23665eee55b6f15872e8e1d2b79b3cdbfc78f51800ffa3536cf0ab4e30eebf3878ffc007c52913cd
+DIST python-novaclient-17.6.0.tar.gz 335297 BLAKE2B 24fcc869e71ef4ca382d6a684f5823331c49e84bced80e5f3e0a5e00efeeffc6cc6e554b7d97c571085dddcdd9bc6145442c5b7100bc9e833cb5bf883d860ba7 SHA512 54cc617e2698cdf50697b35153489f6fe64e84416d05987b7c60ed78241299631a0c03d893c462ad2f93788a5fc1336082acb5d22317d5733e9c033a91b1c34f
 EBUILD python-novaclient-17.2.1.ebuild 1166 BLAKE2B c209d1d5497c68fdab4ea9ca34befed2460d6514a7fffcedb0735ccb462fdaf487ec68e005e9e83950231914997d871027ed9a47e58106e97358ad6e45535001 SHA512 575ac26982ee6e7ab8452e24f29f40041b966ea11b253fc53364f25853a7f32b6f48ab054d0b97b9abdf7d943e6167c6fdaea7c354fc04c47764c4c8d61ee3f9
+EBUILD python-novaclient-17.6.0.ebuild 1694 BLAKE2B 40c6ec847cf37efd95fd88b522eb87f87eacc2233565437824635aa745e6ff886f63add8255b6ba6f4391533d3d224cd520d9525dca96dd9fcd16ee47ffebc5f SHA512 c6d12f8ed68c02673e874a965d7fc7b9ea561ff7b16721fcd19c231e49c7bad042fa96b25210bd808897427e596780fc38764867962a262369176a014a6d50a3
 MISC metadata.xml 786 BLAKE2B 8e3cf9379a274131833f3a6ad3f5582cd9517ac8361aed04e3a39f14da4074de9f462ab890107db966f553726067b4109aa18d21e747545dd4a25c8794366a80 SHA512 568595965bb99b0f0cfea9e502d1876652a3184e54a963ad3841e28ff5205479a525fbd8252998a4df5505b6a50bccd59bb10288cb0244851c47b967f58208d7
diff --git a/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild
new file mode 100644
index 000000000000..37fa0db2258c
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bandit[${PYTHON_USEDEP}]
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+		dev-python/python-cinderclient[${PYTHON_USEDEP}]
+		dev-python/python-glanceclient[${PYTHON_USEDEP}]
+		dev-python/python-neutronclient[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/openstacksdk[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b novaclient/tests/unit
+}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 4eba3c6b4b3e..9a7bf68c9fc1 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-openstackclient-5.4.0.tar.gz 727289 BLAKE2B 15aff0e53034512618ee4624031618d44f24e8d639033b22eacd791d45150180b52e5ccc0e78e6ed9a5043076259c47bbf981fec0ee00129e838efdc9d4741a1 SHA512 76370c28e27bc1aa13f772721c1efaf1e5eec931fc6bb0653989d4a38b28426bbabe1e6bc6d4be9a902c0d8fb871bc63f37c5ea0fa57d6bd96a9a9a02630ddf5
+DIST python-openstackclient-5.6.0.tar.gz 815567 BLAKE2B 9421af19527d1aa004f9e8928c40896fc001960f12dce11d860185e0c2c396642972099823710bf21fd838ec78681601d4196ce99e16d90836f6117e8ff97c5f SHA512 821abe0f85e53d7f52fd01a87a4d77a63fae029d2f03901f3ed5e47a4dd52fb8d00452a53027a347f83d73851ee3b57da4b025fb799571be256e78cdc6b96f9c
 EBUILD python-openstackclient-5.4.0.ebuild 1129 BLAKE2B 65ed38d2f892f7e7e8b7e3dff1069d60261457f483f9dbd11ce9a53a18ebcfee9abe96aed9f1fbd7e7880ad0291196de673aa41f1db7b2006130915a2de24411 SHA512 6a6d14ca7cbb37f2247925f9fd5a9f685848b851c521bcb67483a754e1ce9b9e3fa461e417b51a2bfda50ff89822a310f0562b5182170c65af4d6f9ddd481ba9
+EBUILD python-openstackclient-5.6.0.ebuild 1669 BLAKE2B da59a000a7c3eda8df5fe5db9b290f40d453209097facde0b584b6860b4bfd61d40ed41c71731169f9ad33a5acc82f0fe0a65ea0866168bcbee63c44828f3b06 SHA512 b04a5ca658d161414455deee8ae703cb5ff61731d072f0c114e9621919a61a1845668a4febb01c175f39d45294d30ecb8cb384a8cccce5c7c9a2990f21faf2de
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
new file mode 100644
index 000000000000..84660b01dd12
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.56.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Depends on specific runner
+	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstackclient/tests/unit
+}
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 5e59e8eb4586..9088aeefe17d 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,7 +1,9 @@
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 DIST python-slugify-5.0.0.tar.gz 11730 BLAKE2B 0ec93c230523bcd4ba5f917bc9d2676ae92fc164eccc84198777a59c36ff427fdb7a242bd89f9bc3d24e86b5a1d106f0118cf118349de648f5779c384445abab SHA512 b29c542ec3cb3d05d88be0fb53909b160022fe97dbc89efc0eef5f4e2414031026f570dd6eec1e7bbe2930d801c2fd8d152e49cd2639cddb23392c9b11e7266b
 DIST python-slugify-5.0.1.tar.gz 11706 BLAKE2B 1fdffd6fb9eaec13a1ece65433c53dbcb35c5ccbe2ebfb07055acac4d9a7be1e0832535aa6f335ae7eda5b07b823a3b4d63ef1f95f220b5fbf26c28dfbe62ac2 SHA512 6c52d6242fb6b2379e28b074987b474111527ac336dfa673828e5283347cfc52e056d9485251cde90493ea2389210701f566ce01916ae250d76549aafbea75a8
+DIST python-slugify-5.0.2.tar.gz 11728 BLAKE2B 701fb3f679cd4f714b5c57c14fb8cbfefa5b8268e9c4b877dd1e558e8a7dac325d69519b8e666043b70540908dcb250f561cebf0c5f444f9a3cfae34d97456b1 SHA512 79cdd1d0312c9e34b07dca2e898f177a85b31d3f290403375032ae962df61f3a9c4167f4bdf10f47afd17d544731d6961810f8a081ef615d76d8758c1207e6b7
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
 EBUILD python-slugify-5.0.0.ebuild 551 BLAKE2B ce836a2d2efe83962fbefa12a753263f51e2af6813e280f1474d75d262ea4744329d11735d4e33be1e09dd2e7290f41c2bb0c195abde9b34c9083663857e3fb4 SHA512 032ace168d060e3ac2758f83e759dae44d5da1d8edbb53e26e04310e09265b187a15665044e1b59aff95c588dd11b169eccd31ab8f805ef1f1ae759910bcd057
 EBUILD python-slugify-5.0.1.ebuild 535 BLAKE2B 547b6ecce9f1fb3da3cce0349dc5ab5ff4a578cbd89b0eed32176e15650ba364ca29f4ba650b60feb4f63c22e7a14f71642f30f73995b5de1bdafad6e53c8de5 SHA512 98c181fd8dddbff8501c5bad35cd50631908136f87634c04eb2f50f0d4aed2eaa9fa6ae7380b7d5c1e54381bbeb10448443ef044cf67098b1180059928026ebe
+EBUILD python-slugify-5.0.2.ebuild 545 BLAKE2B 31409c4fa610329f3d80722b5534ae4b9e9289480eb88443cfe341e76ff89a98dba3ce49d6b370f056590e93ab5d6e478563b4cda329b5b3ef5c0f1b4412d2f5 SHA512 b078896018eae4cccded2d333cf1b8b3e141fa43a9ccd69bfe453a0b248b0144418073f875892ced9e1d6ed7e8e313e2591e71556b5bf17122c6bbcc0aeca672
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-5.0.2.ebuild b/dev-python/python-slugify/python-slugify-5.0.2.ebuild
new file mode 100644
index 000000000000..99a88f6b9118
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-5.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
+SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 091be07f4df8..c6d81248cbbd 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-swiftclient-3.10.1.tar.gz 199466 BLAKE2B 4230f0fbff0e61a8172344df1cfc32f07628ac0b3784f5b8456d1b43b962e1d8561eec55c530ea94c615d46cd9454963fe0e21c54d1f4097016459e1460795c9 SHA512 f47444243f1968fdbba0643bcb4f05fc10a201b38ad83522e842bbad2221d0893a72147f9fbdc13e7f56469b049bbf11479fd9f41a9706119287543e0587f696
+DIST python-swiftclient-3.12.0.tar.gz 201199 BLAKE2B 36a5bc0ed7855b8ec8df51635ed6a2afba405c73809f3ab17c77e07dc362a2578816e63adf6c8da3b81ba8bfa8973326004c09bf980961b3c90987ecfdf95e30 SHA512 00e2b1b4d950396fba9232c251dbdf6949ea60e1f9de8f633ffcdeaa51339c5487fbccf9d9f337ef7aecba30e504338c592f9ed64d1d5c6798307a35b806f684
 EBUILD python-swiftclient-3.10.1.ebuild 1477 BLAKE2B 2487fb1cdce42044c8840e65f93fdd083cd9b51a14ff69735476835a1b910e70b7bdb3dba83bdce2c5018d8fefddf84325b30467849347ebf6e2c473285d4132 SHA512 333f25cc332dbee41e391d75563da463dbcd33316546ab51693db8ffd7aff72ee28caf6b9738525a64f6b68533e0ab3dd6738ceaac4d070ed6849fc426c446f8
+EBUILD python-swiftclient-3.12.0.ebuild 916 BLAKE2B 2167280c078b707213f98dc0dba4aafad35133988c6392b2cf6e60373477368dc9979b5c5aa15c36fca2db8de621cdf44a027a71ded236ef8cbd1c44928388a5 SHA512 9ca46627152c4f25df45b3cc6dd112fdc4fa37b74fb42187d0928ef363a0053403c5993bdf8190985ad6a95d29dd31afe7437260149acc3ff6af3651c9974ddb
 MISC metadata.xml 516 BLAKE2B fc43b031ba021a2a1cc6dbcb86764ef6f9cab62794220d4f3850050550a18a80dc112d0dd6d1be8562f1d6fd6d961057992e22abb4b4774c79bc69ac7c5402c2 SHA512 8858489aa10114c604eecd42e954d560a04d02e22c139f418b5d085c1be3fddac5d3e3c2ced39c2e4684d970569284ac988cb24d492e8997c3caad7e9ce59f05
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild
new file mode 100644
index 000000000000..061cfa612171
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 7955084debe9..03c63a92743a 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,5 +1,3 @@
-DIST qrcode-7.2.tar.gz 43032 BLAKE2B dc1ff428dd86485d2e2fe08b0efb367eb925551fbc31b4ab4f7f22a132ccc3fa0f7625a1e54f16df57f69fce3753883be0e46de6df84b13170d82d10c268866e SHA512 2ce72b2f6893168b96e1f6dae03b3250b8a0654afc9c0194075493d8ed93616acec7b61b9b95573f92c853cf227fff467edae7255aed10a9f7730e9ec5215133
 DIST qrcode-7.3.tar.gz 43352 BLAKE2B 4520ffcf2c4b144c20d00d06947c65ac9d8eb283ab9e298d9fe1de023aa32e47e3c6d4d9144f928a12607b28415f40d666b68b920d81e18524c95813768ee2d7 SHA512 e4d06ace4e8146e294b10b1397e649cc56405ddac35dae499bf897e4a7eb37b15dee3f72e6a7bac98dd0f238ac71d1e0bab5ada6cd180b1e5e8df9c6cb23f073
-EBUILD qrcode-7.2.ebuild 616 BLAKE2B 304a02a68fd2468c37985b8565d54cddb957d773410ab1a430a8f4065a88db6027ff40f6aa0386e8da383466563e96213ccdd27c893a618d888101345d911f2b SHA512 edebb4044c8667918842dadd34cac2b82583ee087a110dc59afad111452b3d7d92db442af03c346e37fe3e55150db96080e33adf74cb77176816f8ac758856a2
-EBUILD qrcode-7.3.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.3.ebuild 616 BLAKE2B 304a02a68fd2468c37985b8565d54cddb957d773410ab1a430a8f4065a88db6027ff40f6aa0386e8da383466563e96213ccdd27c893a618d888101345d911f2b SHA512 edebb4044c8667918842dadd34cac2b82583ee087a110dc59afad111452b3d7d92db442af03c346e37fe3e55150db96080e33adf74cb77176816f8ac758856a2
 MISC metadata.xml 334 BLAKE2B 2b24f6601d29305978e939bc72895aadd12d9343f6178c454f807b17e8e90fb645df6d16e098c6b36343a4ab45d776fe1e274a188f6383904784bdc5271a921c SHA512 b6d35afd78cc9abb2f0b5e75b3267cb8b6d8cd9230fad7c808bc64d31d480f640d4a8f94aaa696c46d2f230b6e645a02f157d72f22456f62902012d7a820bf71
diff --git a/dev-python/qrcode/qrcode-7.2.ebuild b/dev-python/qrcode/qrcode-7.2.ebuild
deleted file mode 100644
index 537e38df51fa..000000000000
--- a/dev-python/qrcode/qrcode-7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.org/project/qrcode/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# optional deps:
-# - pillow and lxml for svg backend, set as hard deps
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/qr.1
-}
diff --git a/dev-python/qrcode/qrcode-7.3.ebuild b/dev-python/qrcode/qrcode-7.3.ebuild
index 0185db078736..537e38df51fa 100644
--- a/dev-python/qrcode/qrcode-7.3.ebuild
+++ b/dev-python/qrcode/qrcode-7.3.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/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 3ccde7e54d3e..3647e735368c 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
+DIST readme_renderer-30.0.tar.gz 27065 BLAKE2B 974d6070e2704e293701101a99161b7a23b97799b0bb841bc196e603eb97314fe5dcc93329aea2c67921f3ad6afc8f66c6b3742b4de966547ecc5ba2027421a8 SHA512 fafaae9a9ed61338611c509fd907f6314b97d13a30fb5cdfa2b8dd5d08097fa05d8edd27fd880725f783cf96326dee40e85da60bb4948bc810162b53528d18e4
 EBUILD readme_renderer-29.0.ebuild 806 BLAKE2B aa480a9e0e52213dd141e5bfd858ca525358635dc69609ee17404588f3f9357bba7b5fe9ac0aa2a5584297ae287a2d37ae24e17a190535597212f32d379630db SHA512 bbd02c0d027c0095c4505929b7e96f620520d7a5f5a854081d9be7f0133da8c8b42184c436f9f2503fbc918beeec08d8d21542480b0c585039ca7322f24bb02d
+EBUILD readme_renderer-30.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
 MISC metadata.xml 416 BLAKE2B e7d5a0e8fe310d2c5e3afaf1f9008d80104ea6126a3288f5e24c8e3d07a31318f54493bb1f9c4f5863a30a6f806224e04add4e058a8d6b7d7c8a18d54db34fba SHA512 308fe7b95e6652e9e99517ff9ad202f40ca77dc86dc69a15b0989e8885ec9a6a96fef9f6d82325ecfc2d06f8c053f91c8bdd83d10cbe7304063bf52b2e9dfcb5
diff --git a/dev-python/readme_renderer/readme_renderer-30.0.ebuild b/dev-python/readme_renderer/readme_renderer-30.0.ebuild
new file mode 100644
index 000000000000..1b1eb632f04d
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-30.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
+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 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 1164f48d58c1..6ec653cbb152 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,3 @@
 DIST readthedocs-sphinx-ext-2.1.4.tar.gz 11218 BLAKE2B 9851da181b9d181715436dfb350bcaa2f8f6c5dbf56941d2f26457976cd5f5f1e32752b0fa39c65a7ca4f4f304e0e83bb9cd34dcc25a039e6f970d7ca6410a38 SHA512 dc3e70f55634e6769a0cd8778644389838884da7f175464e56c7766a1cef257bf6d4bd317a4dd4442fb46fc21714f5697991d1b2a764e40857eefae340b15278
-EBUILD readthedocs-sphinx-ext-2.1.4.ebuild 760 BLAKE2B 6e2bf67035cbcdb18401a56ef2eded7b3b1f62f03d065766091f7947b925706bdc9fc11cfcb503fc32fc167b1c349ef82f099127c54bde5af0e8e44bd22d4628 SHA512 c7fac79857010a9f397d8127c1c633bee08e3d70c69fd6000327b0eb2ee9da606810860f58dcec675ffc5d25dc8a74c27f09bb13ac65a0f5be389e4fa3be3cd8
+EBUILD readthedocs-sphinx-ext-2.1.4.ebuild 766 BLAKE2B 784fda831335d4b6e80218df41eb1d3efe1ea0fcf2c74a5f42e5057ddcd44f91645c1f588902890ac41f062668ce5a00b7ebff1b30a348b459c956b89ba97e1c SHA512 abf5e325c0d3b15b05618688e9057c5e07b6295a8b028b8798d7da4c0ffd22c5d53d18e2476e9c7a9d9dd0f7fd731c07f63996e37de34364e60cc50f4b24ad4b
 MISC metadata.xml 350 BLAKE2B 39fca03d3a995a65683f45a330e386123ae2efaa952f3bc0a6153708008941ddabff9045b480b85551c3fc26166db3aec9daafbe87a91d18dbb4041015d7ec66 SHA512 c116ddd2f8b70bb1c5d0bfc876e60ce35dff1fa7ee2c83a26992f96960beef17c0fb743a7ac5b5c41a3028422c2f342dd683ed503752f7f6390d9987ff8a3057
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
index 240addef9ffd..04c0d566a556 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 1de2c8f1bd4e..7460af3824ef 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -4,8 +4,10 @@ DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
 DIST regex-2021.9.24.tar.gz 703375 BLAKE2B 77fae095228ad2e83a77d04c337356fda7d5c9c9dbc9ac6645cbb128c87831ad05f9d2fd910163903e56a6b35f5a54bcce6f477aaccb1b5e297d7df414d3f044 SHA512 2adcbca3d2ec5870095a41d357aa219f108b0b39519f73edbf105e2cd9d5b429e19f9967a90dd1654fe04f415d21b59e345a1aa502788f74223a9e55c3cf576c
+DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
 EBUILD regex-2021.7.6.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.8.28.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 EBUILD regex-2021.8.3.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
 EBUILD regex-2021.9.24.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
+EBUILD regex-2021.9.30.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.9.30.ebuild b/dev-python/regex/regex-2021.9.30.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.9.30.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
+
+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 39f5cbfeb122..22157c94aae6 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,3 @@
 DIST reno-3.4.0.tar.gz 82815 BLAKE2B aab374c48c1dcf25ba7a78d46069c5d659762bf01d25dc05f597f02098ee10e7b8c518a0afad186ecd93602782a7c50294183b7e33075f8bfe57cc0bc3c1d016 SHA512 cbfd5d9b41beb1599438e249b8082175c8bd2b8dca62d8e6fd1ef742bf889adf6490e1ed0fa78d8aca663a0fb6bbe70742815a6512c6d51fb8073745b6860d65
-EBUILD reno-3.4.0.ebuild 1058 BLAKE2B 58eec7eb769e8eca274567e55664b88e032ba7eddfb8c59497b1545ffedb9ac452b8a2f9ba0441d1e6bba04d549731c8efeb83b7a48738e3082afde750ceddc5 SHA512 157584e6963a90652a701e9c146bc0286e64d32c065e738888f2b353318de328ff828335cd59008470e650a522e82c9425970475a8e408a160b27a807b46fdb0
-MISC metadata.xml 346 BLAKE2B 77099bd8f2e8e11b50ce5bbf80b20ec964fc935ade7708a6c80203d3663cd688a7db37d452a6a1c2012029642a486f7959056fdb53ce19eb8efc5cfd5d92b711 SHA512 6b03e24e740a43ad2c0dbdfdd60c2ea39518b933cc5743caa85c8461fc2ec1c17a0e87236cf5d7c55357652f7bc2343f683d21e902947694b28ab588bdd9890a
+EBUILD reno-3.4.0.ebuild 1059 BLAKE2B bfa15189d46b0a786044480678d0b7d8f23fb73b5b28e380744bd2da6a19ed7cc07a3b125bc52a5d0259f9556eb3d8457470f21d9051327a2836187793ba4019 SHA512 0b71ee353dfe6a045c593de4586b0fe8e93be6cca44c47ee63660a688b400b14c5280d01b1755f2887e08adb88874c868790f4a14db90f00cecd252bebd04057
+MISC metadata.xml 400 BLAKE2B 933415cb7e31bbcf30191336617ffb9adfa5c83c26164fca5f813015ad8cb9c5c6a88276e8b8ba37ba0dd0fd4e658861150fe80a6770a16bb419959ca1c9d924 SHA512 2dffa12ad580c59bc034d4788054a4184d713422ef658b031c0190ee8c5756f37db3872e1f3a26c60ecdf9138904f87552119ac5559236a7e4ab2081d7a8c5ed
diff --git a/dev-python/reno/metadata.xml b/dev-python/reno/metadata.xml
index d43a212c1f5e..758b8775b144 100644
--- a/dev-python/reno/metadata.xml
+++ b/dev-python/reno/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">reno</remote-id>
+		<remote-id type="github">openstack/reno</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/reno/reno-3.4.0.ebuild b/dev-python/reno/reno-3.4.0.ebuild
index 83a2eee78be7..6e2ce449523d 100644
--- a/dev-python/reno/reno-3.4.0.ebuild
+++ b/dev-python/reno/reno-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 28cd7a5adfe2..1e38bad14b9b 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -10,8 +10,8 @@ EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 EBUILD requests-cache-0.7.3.ebuild 1381 BLAKE2B 4d94dea5ad279bbfc023e63ce465c0a73a7500b5f2e509f022eaa7920252270afa23cf50fd3e653c45da168390589cb4af16d17f5b8bf83850713906600bd20e SHA512 66b726a60c236dca80c8d69403993e667667a394ba8c0a355cc8b864b7b32280ee5fe8ff4a8fae58ebfee808b0b409cb7474c32588f0acd7dd66f377e80196eb
-EBUILD requests-cache-0.7.4.ebuild 1381 BLAKE2B 20ef0c093e5e4b03cf9e400eac7637ffdd67d0e17b457065559944425c141fb6c61d11f22aadc98d9759c68fae1564cfe782ee1567d677965534a2ee41f5a5f9 SHA512 7dbc8a6767b79df253e0d5cd2a004383dca97a59ce5474e90a8efe05a926ddccf875a500804d0b354a5cd02bdf0bf163da46b4ce6b5a13d8f052e563b7b77f07
-EBUILD requests-cache-0.7.5.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
+EBUILD requests-cache-0.7.4.ebuild 1417 BLAKE2B 91a9076dca334281c2e1bd93fb4833c0bda261a5cf2ded726b3cb6d6927b3d5649c139f6672f1fdfade46335d451d00a41a7c06a80420145b85641212837ab75 SHA512 dcf597190926ca495d186a303740d15e9c8da072a92f9bc2e1296195140f583400371c97613bdbe0eaef3cb95aa2489905b19e28e983b2f8d27ad5f83d7af275
+EBUILD requests-cache-0.7.5.ebuild 1381 BLAKE2B 000016412bcc86893998e299e13e63054c56711436cdb26bdd07a7a0a3db19a4884b2c8f13d7c35fc49d2569d86dd85eb54209c2b6589df49ab928498ada44b4 SHA512 9b94b94e3db8583fe49c7e212af6face7623bcf8d5caba9ad925b89e716c851ccc1b860e60dc0c13cf819d16a0143c63358355205deb435518dca9e1a1d5dd89
 EBUILD requests-cache-0.8.0.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
-EBUILD requests-cache-0.8.1.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
+EBUILD requests-cache-0.8.1-r1.ebuild 1796 BLAKE2B f23ddb9186b8f0b33e628a8ad7a0ef23f07cc4f070a52247ff0e2fb33e4f3bfa2cbfa9b6795ab4626692d1d644b3f15387b2c736873d5420c65df0273e51b01a SHA512 98b2fecbbb8d59100d6dd9d7f830fd5887527368a4579c1172dc3ca8deee7bc8ccc01da4571f3af8dd091a19e2362c293150f8e2d6c0414a254d3948884a92a8
 MISC metadata.xml 470 BLAKE2B 83ea1b65050486c1ff410664b87a19e514102ec030ea0f3d4076d435503f6ad2dd16caf8ff0c947d064c93955a743fe45d14c4d64471613c9de65c33f6708b93 SHA512 54160c5daeea03d90c896e30f35ed6ce8e7a29280a5e1bb1d1b0c04b5899a48ed3261d400762bf9c92bb73ddb554bcaa533b620ecda691e43fe89c1d943b7b54
diff --git a/dev-python/requests-cache/requests-cache-0.7.4.ebuild b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
index 0c8b4192cde2..b59956b8c452 100644
--- a/dev-python/requests-cache/requests-cache-0.7.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cattrs[${PYTHON_USEDEP}]
@@ -32,6 +32,7 @@ BDEPEND="
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/requests-cache/requests-cache-0.7.5.ebuild b/dev-python/requests-cache/requests-cache-0.7.5.ebuild
index 61afa9af0454..81056830ae09 100644
--- a/dev-python/requests-cache/requests-cache-0.7.5.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.5.ebuild
@@ -32,6 +32,7 @@ BDEPEND="
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild b/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..b5921df49217
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/itsdangerous[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "redis backend" "dev-python/redis-py"
+	optfeature "MongoDB backend" "dev-python/pymongo"
+
+	optfeature "JSON serialization" "dev-python/ujson"
+	optfeature "YAML serialization" "dev-python/pyyaml"
+	optfeature "signing serialized data" "dev-python/itsdangerous"
+}
diff --git a/dev-python/requests-cache/requests-cache-0.8.1.ebuild b/dev-python/requests-cache/requests-cache-0.8.1.ebuild
deleted file mode 100644
index 61afa9af0454..000000000000
--- a/dev-python/requests-cache/requests-cache-0.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index cbcd99f065e2..13cad25c07d4 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 559 BLAKE2B f00080cc17d20d735893d2ef0e8273cd77ab302a2f3e133308ab92c72e63036c46fb91af5b6f031c55b864a7b51a3e10c5a138037cc4916361b89da0e20c8eb5 SHA512 9fd9d58474cf2b3b863113ce0b3e520e35b86d21b273f17492ab27673799ca56ee983ec54e7b7e1157d7f681e725c4c85e79703a725f97a26281ac44ce91913c
+EBUILD requestsexceptions-1.4.0.ebuild 498 BLAKE2B 10df2a6b8dfbac37f34db52c56e2f78ea7d856581dbacf4af11804d68befaa6d8c10d32a6622405a9052a315435679a2efde26554e7bd2d21e423b5f8cd4cf2c SHA512 ad163dba94a8bc89d2bdb76f586bec3ca1e5e86a6dda6f08b50eae3f88daf9af294f0226eabfb33004efde01f409f901d7e7eaadf09a8f51eb7883cee4f9f088
 MISC metadata.xml 847 BLAKE2B d56497e1b5b36d36f7155a4a01c5ff0bc591a1c2cf15de3108b8c0b9fbc46d583b1f035787b0f81bacdd3863bb0cc3bde1aaf1b8c953d1f30946bb241e0d24a2 SHA512 fbeaadea31ecb181c762d55714d32bce8039673e1d2e091354e2587631de7793e057a6501c475326060883e0604d4f7fd44d8c07884a2772972e057373427c86
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 4190db1fe6dd..737ec3344353 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -2,9 +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="Finds the correct path to exceptions in the requests library."
@@ -15,5 +14,5 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ed842e4a13d7..6f4cc3072091 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,11 @@
 DIST scipy-1.6.2.tar.gz 27187804 BLAKE2B af3578bc029c3af548c04144d7405ac8e6f8e057f870394e124f24aea9989120275407e5a7fdd29fbe1019d2acc295c1ce00872461ecf3a325000e8817cd559f SHA512 18b03f32e8343c5a6c6148ac0bfd4b5f2cc9ff5f74d5d41761ae9e773d6af8774c7b09a3fcc47122864eccce1dbbc17e9325819885d3fc3ab2baf98e7d3befa4
 DIST scipy-1.6.3.tar.gz 27187987 BLAKE2B 30f7171ca0dc0842f254472f4b52c0b0ad4389964a140cc4b94f9d85437c5a7da238c082be503242d433f1d3c65c3fd4afeb2f7831eea39ce303077406e718df SHA512 10ff25da84ce09ae231e781873902d8040d79868721d75a3f9facee177e7f46f7c9c34374feee6fe2253ddd968716d2993658ce514c4ac0c98d255c06a6ef808
+DIST scipy-1.7.1.tar.gz 36102628 BLAKE2B 67a414d863c61bf419fa907b9bed53b57beedc20d71d0630fac9719f02e951ea79b893d0803b385936a7c04a6c2f723d3870f0498f71e3c210ccd6ee75a009dc SHA512 81fea7e4f5fbcd537d662273507b6ac75bd4cf900567da8083ac86fb06d9f96b010d01a1697db53211440f0fdb2d89510313bafd3d383284d0ab9a08311dd102
 DIST scipy-html-1.6.1.zip 23946591 BLAKE2B d3464c342b1d4f43e17e214c7557737913bf4131f88b9d569cff106c75dc7ebf0d065283792fddc189e2a3ddc322f1b2b4f38c6d313569f28395e79680060b58 SHA512 73561f9daa303c6e967f9b11952c6239dea7ff1a2fa02434354ac78fcffe7a552aa0f1043a17cb5c35a442def499eff199856cca8efa1415449cbf54f0d4913b
 DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe023d1fd9f0f762695a0d93bc56e432e441e675ec3c7a7d6586a665f6127ce49d570f1716876e58afb402761f8e95 SHA512 119a2227a808c752a751bc7bec6463da739c68391ebac8d2451998d90ebe03b2af401adbf987f0b694244e715c0ef1fd86c2f4a36c48dbb1ff7cdf4d914875df
 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 4366 BLAKE2B fd4b6ed960d8cce4f035fc978bdc2270cc00480a292a9e3fca3d711b4f0361d3ad308d9c1a492c9faf1cfaee44ec12f457822650e88eccb2269307e3d8eaba4b SHA512 e57644101d43a91c8184778e965177df158d2a6844dd271cf049ce992a6e86d046ad215534cf3741148c24749845326cb6c0030ab8f93c7a000fdb05046a325a
+EBUILD scipy-1.7.1.ebuild 4250 BLAKE2B 9952ddb984511ff7ae5f75875f8f42bc5d3de3ae2e49003fc9c835e8cb1cfe28ee8b07102f3063e4d190aff358bb27dc9f0c8586519c6542c9de4bc91566ed18 SHA512 71586b4399dca8383dee6f92f892cef3cf3063109bbdff6a1863a2195b735e9f9431e2d811ba5c52bf36a3c066899984335bca09489e87c0402cffa817ef8ce3
 MISC metadata.xml 1039 BLAKE2B 74d7919c947e4efbeb597dba51ce74b9e2ef995a1e06c0db7fc7c13dcfd0c175afd0b9bce04907274e4eeab2dfcc49f0eca81ab71f76873817f3b9a1ca8ca196 SHA512 c0024d9accbb563f13ba22b32c95881118fec0ec0a68ce498a39d6bc63e13cf2c7db903132481e3b4d085757c5aba8bb4959780d67fd33db5b161a149e18c643
diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild
new file mode 100644
index 000000000000..d4ada5b74484
--- /dev/null
+++ b/dev-python/scipy/scipy-1.7.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs
+
+# upstream is slacking forever with doc updates
+DOC_PV=1.6.2
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# TODO
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	if has_version ">=sci-libs/lapack-3.10"; then
+		sed -e 's:test_sort(:_&:' \
+			-i scipy/linalg/tests/test_decomp.py || die
+		sed -e 's:test_solve_discrete_are:_&:' \
+			-i scipy/linalg/tests/test_solvers.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 2115c0d40e90..8276fea9d0f0 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.16.tar.gz 54205 BLAKE2B ce4f86f8bacb4f12408604822a32c9f63f96a155469cca1d2aa50cf67fc9e9576432f13ef49694a9d7ce21696aedcef27419fc0d3aad67a87d16c3bf8c0f94c4 SHA512 9498637d1354a84021f2c069a919ff157ff189d1385453397a9c43e522de77af9d628a90d649d50e9243abfc0b96efe4e38b615322d83133137bad94d448ef06
 DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
 EBUILD scrypt-0.8.16.ebuild 552 BLAKE2B 11d7b75f0d5a78a0dcd2430c7517e5ae73e0c8fd15811b8746d064fa40cff5792754be52096a616a27a86c11679065982e66d59c6dd58aa107a3760710c13929 SHA512 bde7fac5818e59d6985af755ddfa475f9ab22512cf6e28790ad675a1eaf4cae85841c9902d9544c43484ac2e5fe631eb20cf609d9a3bccead0884c7225f1926e
-EBUILD scrypt-0.8.18.ebuild 555 BLAKE2B 5cd5d8ad10b0ab3e7b64f74d4433ec4cb3982d6b3b0c52ab819a5014251523c47c0559bf3d2bd9b0928ec9e2426de31e3f5c3db72529492acaad45773959eb6e SHA512 350489c2d94f23fd0fc49cd8fe45fce2cd6ebbbbfc38d788ac932a4563ad8929cce5ac188cdca115007048e284576136109fb06f9f30e57c1ac0776c80b91d3e
+EBUILD scrypt-0.8.18.ebuild 554 BLAKE2B fba8c132cf3e6ed53fe699ea578c8d9e731750dc6fe2bec6326ec5eaf59c3891eed2a1afff87ad4fc14376872d7076e17c20398d3ea07700f3179f75802bfcd5 SHA512 dd12fd6f649410477811b9d2b66401fc7c4b19137f12622570c0185a6bfa9d3f5c9835c57f34f744a5a75a00e9336eaeb77493f24e2abaf0b3ed77f372709a68
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild
index 8786df021228..e6ba3ddc7a0c 100644
--- a/dev-python/scrypt/scrypt-0.8.18.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index fb8ec4248e68..cf6e605d79dc 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,11 @@
 DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
 DIST sentry-sdk-1.4.0.tar.gz 230870 BLAKE2B 8cad1f0046219b60af982d3a01ae67aa1b018c4c8815c2adae834beeea6015057791abff6e1213a4a5902fe62e56f232dcb0cb355927c2f986751145dc633962 SHA512 b1f3021b4a67c2c4e13109ec3e189d1e133f07ecad18bc3e0ebd7b99e90b53aa83cac2cc567b8b47763892a9e06e1795aca497f146cbaae15952c880f9c160cd
 DIST sentry-sdk-1.4.1.tar.gz 230985 BLAKE2B 0c193d5d564377d484e8e1ba2d30580ad373114e6a1eb3c4d38af6d9745aa788d1369836c4686b80503a027810273cd3a2d1833a6df18d32e1f352f6fb418c8c SHA512 b38ce6448553a05158690808ed4e7013c44f35922c1eb1662f3f9fa73e1c5f9d8a5385eccb8ebd062eae27b7e037ce0c204778ffd24b9ccf38b14d8e511d4cc9
+DIST sentry-sdk-1.4.2.tar.gz 231026 BLAKE2B 760d84b15ef6d002a3dbd92ce99efcd16738d4db9a2b47775d0da19649b85a0f3cd234a8ce98111599b27ad5c1e7eb901ff745d57c558f5603d4ea59b3ff5795 SHA512 227d5edb6e6585749df5e873e2c7c6191f96ea6071a22b44fb4901d5466218ca718ac81ec23a7c176c52734fad1f43331e58d670ee62c1892bf7768dd71f9fab
+DIST sentry-sdk-1.4.3.tar.gz 231054 BLAKE2B 39509b3f7b12e773e23881772cf2d3445374181f7bd23b3a7abe3cbdae012b03b43bcd4ce811a40cd2c7916cae378698ea5a53909b2f679d8b3f3598e675719e SHA512 bd5a1b75a437d28348f980cad0bad30cbcd2872fc9678e50d69bca73e0a08a8e663f0fd54607174122072dafad6055acc73db34c6ca92ec9d00efed41e5c1c97
 EBUILD sentry-sdk-1.3.1.ebuild 2386 BLAKE2B fb8db9b507bfecd18b8ad697b7c75af6d5638bf6b957756badc40db23c5294c00274c2925270331d025d5a3afaef415b36faeca3262648e08a73f5657f70fe32 SHA512 93ae19cb5116c807af0e1b81f53ca9272cdc5670f058cd5bd668971fecd3f27061ce0faaca56fb0fee491aad8dd794bdda9c83fd4c81168fc370394e4ff6a303
 EBUILD sentry-sdk-1.4.0.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
 EBUILD sentry-sdk-1.4.1.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
+EBUILD sentry-sdk-1.4.2.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
+EBUILD sentry-sdk-1.4.3.ebuild 2390 BLAKE2B 13290e8d859fcf049d750e6ab6c1733b0f7de4bf262da72add049ff0cdc15c80fbb39c2dc013b9842b8d88f016a6226525e3a2d3ae780a1b706b599406184f84 SHA512 4f71b184eb7069a9851222b873172e4c065dc0f6377995a7d30ffbaefea7efc23ac12b999d3c0fe5652060131bd99cf5fc1b4f0703593d66af262553dda20a17
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild
new file mode 100644
index 000000000000..d0881dad90d7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild
@@ -0,0 +1,72 @@
+# 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 client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.3.ebuild
new file mode 100644
index 000000000000..d0881dad90d7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.3.ebuild
@@ -0,0 +1,72 @@
+# 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 client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index ed00385122b9..50374c8cfc66 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.17.3.tar.gz 82434 BLAKE2B ae6f303a204f0c5a6bc7a10aa8da3dadbd4fc3a257abb15e330d13299dcbd5bc6be97506f6d5b48f3a3fe24570ac28b331644870d03aa30f80d40e69f4d2ec15 SHA512 b4ccdff3df2c87ed6f5119e93560ea7ddf60fcc64f996efeef1f6077f3a559c8f9ea77fd217348c1cba2de50e40523714899de110614953baf8385bb78d10af6
 DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
 EBUILD simplejson-3.17.3.ebuild 622 BLAKE2B 5477f8ddb16abdb4f4902dec056dd52b0794c5d45a207211666d5644b4ada9dd021576a3fd5a1586bf4f4c5e3099a7a21bb5baf59dc9a36f237e97f5cf774f6e SHA512 fef504464ee8d265e47cf01f4ff5110d7800c2dae7a9cf82750e3c06a0997a1b7041807e0d16d2b8f1bdf46333ea4291d63c3876097dd1ee88ee7e6f79a97c42
-EBUILD simplejson-3.17.5.ebuild 630 BLAKE2B 79f94d0e77e3b2f3a0e96602adfedaa74be0f3e701acfcdee8a4aa81f1a10d0002b9e306de82539a8f1f2f639f173d4feaa379187aef4eef449c0eb0fde5b47b SHA512 2ea2e35033578aec72b5bf69f73664d14c4b599d3795b3acb4008a19a49a634cd97d782c7365a1db72452fbf9ed9bc1fb232e1b90eb3a67820ab642409686f8f
+EBUILD simplejson-3.17.5.ebuild 624 BLAKE2B 977f8e1aae20533968ba28566c581a77ba159726b0ac8ae23cc76aa0d383c9705b235604b75a76f4b2bf4b8881d901ffd3299ba402dfc050e1bb6c7c78c78d6c SHA512 1ee4de325eb240a0b4ba9dc4cd324c812e54195c90bd041af83c752b735377a7d4134615155d28d66b795d4a88bdec5e031403cab3f5f8748580dae539d71de8
 MISC metadata.xml 375 BLAKE2B 2c3a0f98ee3f6c9ba41edf3e8e4d6536ac518a59234e6c602d46cbfcb8a5c760c71997b3c169dd2c0b3f9c5dcbea1cb36967e4d050933bd5e31d6f609a835e83 SHA512 6ad418641e64295566aa5418b9bead66e7ea84e0ca7aa454bfedf613cde7ed4d1cd17dff962963c3dda62ad9050e6348f9f53da21ba25b53cdeba2d91b8c551d
diff --git a/dev-python/simplejson/simplejson-3.17.5.ebuild b/dev-python/simplejson/simplejson-3.17.5.ebuild
index 4eeb70ccbda3..950b2eadf53d 100644
--- a/dev-python/simplejson/simplejson-3.17.5.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 43373c5b98dd..854b8d8bdaf3 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,6 @@
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6
 EBUILD snakeoil-0.9.5.ebuild 759 BLAKE2B 4b2243550b1524e10ac0aa8d29191332f1a8a348813f0a151ef6d305dcefc1f5b692acf288ace186e78d079145caa96bb2b384fb180616c37695d352ec36369f SHA512 d82ee34150f8871540f7a8a56ba592d33a6feb94368166267a85b9655d217bf015db279b7fb1a8b1b18678c8f758c015b050d53489a4b8e2f88f07809e0896f7
-EBUILD snakeoil-0.9.7.ebuild 812 BLAKE2B 9227e4927ca55ef75b5bd0652f71e4a18fe9e9fad1ca2ebfa2e3d50167c610815e3c9b8251a44509ba80599cc9fa44ba7b4ff37b7d75b2757897e5372045f0de SHA512 d5095d02f391de555e636c94458df8c0f2ffa6f5f2a5f503c8d653016be9d24335e0fd7d74d89549e1b2d8d30cad64818a304bac0c8b21ad0bb7afd6eb14b8fb
+EBUILD snakeoil-0.9.7.ebuild 818 BLAKE2B 9a277b1bf46db92b87bcb1cd0f1857e9d0251b030c68173160a09dcac89f369c95e3813848a71a95480882c245e7e5461f57170532212d40295ee4f6245a7150 SHA512 1cb6b88b93954674debfeccd737ca9c6c3bad94d41e968dd3cbe13f4962b3f066126c0b603b6e52cd0088014fa1efae107dbfac1e815690c8a3117a7e6b15049
 EBUILD snakeoil-9999.ebuild 820 BLAKE2B 781e02504b5010235d6c8688fc00d2d29999b6c80b62e04cb91eaf8e8309a95c2171d856b64acddc598957dd247a9d65975713394e06c5d460d6faaa114c6647 SHA512 4f10e304fac0f4f4ba1be7304b73d41bb9f78e458ff5214c732d2fc2526e2b7f532565b44f8ff63ad027231b9131de9d37e0e534ff36777ba42d85d6b8981bbf
 MISC metadata.xml 387 BLAKE2B 4c354736e65249bf938946eb845a8011161b5c7a3d8f30bb9c360bf762a9da8ef91bc7bc31c1aa6dbe709271a5ea1e6c4d0b5c540dc39c0dc7befb589b51c7ed SHA512 77684f8e5ad48a48eb613ec664905714a6caab10e7ab899b4877f87d88d5808ce4b734bd6f8610f294884a76bbe17d51444819ec58e34b70f48e60081e5c3ac5
diff --git a/dev-python/snakeoil/snakeoil-0.9.7.ebuild b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
index 797d24910001..036e753319ec 100644
--- a/dev-python/snakeoil/snakeoil-0.9.7.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
@@ -11,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 ~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"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 26f46a9637a6..74aa5bb17065 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
-EBUILD soupsieve-2.2.1.ebuild 727 BLAKE2B 029ed2264fcd1d9459fb0b3697bfe6badf5cf1250ce9da0f02a39d4a741e06e776929cb2c2ec3307fd138bda9bba1517e0c1abcb5a249699745264884bc11ed9 SHA512 c89404aee214f73d7c41bf49a4665ce558a3bc898460c48521c41d1ef4ec411e9c8126a4fb21c54ece2caef44937155e4476f4fb57cba91537a22eb8f5514c1b
+EBUILD soupsieve-2.2.1.ebuild 733 BLAKE2B 0d0bf38be91b79cd7a050325e55fa366cb791df14ad4cb38e03c812da43f8fcc6bd10c598b1d074f49960189caa51923678b8b42c6ae7358c8e9832b70cd15f5 SHA512 2d9f7d09f11957fec0a1d3a19ac1eca7e7dbb8d66a49735df5f3b64cf48798499798592292331356abd11b070f06428f4dd8d1fca2640c3bc3acbac2b63d36ef
 MISC metadata.xml 399 BLAKE2B de09909e906d138c664a0926eca614abf7953e16d5fb0bb0babed691906360cdb8c87b9a79ea5ddd2492b4e8cee561e5433d02ba47be5cf670fbde9e70dfed9f SHA512 0ca6cbc294f232ae9d0f5f0de3cb1c133f5742435d523a0481bd7449dd9a75aa950f08a668b4e1900e520461410e0eb864dc913361204909524805f1cb9e0a2c
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index 6faa3118027a..c7f078edb7b3 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 30d20f9f8556..b24285eabbcb 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 638 BLAKE2B c36560abf57d1c71fe65d725dab03cf47cdf5ebd7ae0462bfdd107eec43a7bf3e199d8c7543b75f84c52fef38e25f08686bf165be721cc46891a5d4a5f03f8b9 SHA512 49ad5147aac269a723972fbbb1ee5404205068f70b5f18a2c8504ffe93416e9fc19196e59b50479ff75e078511c64811fd66b17e8b39dd4669e51fa11ceb6456
+EBUILD sphinx-issues-1.2.0.ebuild 644 BLAKE2B 3015eb9f65e342c4d12214ee5e956196ce50fba5e73cdf4a82461791bd8290c56936ceb81531804793c83f60e809c4df361482473a53193227d6b2f7a8f26d6c SHA512 78a0b68f732f8746f6102f929c9ee9037e45d36f3efda39610c19ac8fa5c32de9060e1d72155185c615a45d2db15bcbd8dfc681ead7b2599a70261bfd6bb1b0d
 MISC metadata.xml 459 BLAKE2B dca0c83085ed9f180d31b936693309735911db589aac1b77f82b1a9be330326622f78a4432f7a7048bcf37a41ebcfe73ab2ecfa5edf39ba8b322e0899c6aa2e9 SHA512 c3ced9fc9bb009df9c5a3b567058f39dd8e4f075ca1a8427db8a3cba7fb1fb9766f6f6e134298533edbd0e14482d9f7c1b9d0a434484177757dc4add4115db99
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 4e5ae6d14abd..7f5ab0e01874 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index c0f3dd7e9953..d1c62293da57 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-prompt-1.5.0.tar.gz 21537 BLAKE2B a5bc69797ea526bc3d66b52e98b80cbb9958add084ea6a4d70a85cc06c69271bbe9e658eb517b78dd758178b6f3b93d92ea87e9432e5c28a61307706a3c34ee8 SHA512 b3d023388eb024303e9264e621ad379367916f8e3567192fde90b3f0d96c94c53d783c2e14970ad3d85895053b3aab9ece6d9573d3bab1dc894e0e04757f3a40
-EBUILD sphinx-prompt-1.5.0.ebuild 584 BLAKE2B 9e6178d9301ec099fdc97528da2be2e8aba50a2d26c8565c0ed95b6bb4b2a4a2994d16c87c6cc59cbc53ecc02d6eafc3fe0d4527c61c82461918180a85f050fa SHA512 953a78ab816bdc17e8c19f556ff399d57f5fd8308a26a8b64064cbc394fc8f738aae0eb426ee8489ac1885e67826c70d5ceb18fcd2101a200ed119dc64786899
+EBUILD sphinx-prompt-1.5.0.ebuild 590 BLAKE2B d632839fc119c8d6925e8278b89e373653d4e0a495f050bf81affe3e1f34c6df3c251cc74851b8fa94acea16b36c3a3a90479fbc325db712d7c34d036e334121 SHA512 16d64c71c7568418c96070d390e5138489df17e38e1eade37e1e86bfe23cb68f46ae7118ac5141bab895f36ab329ea8da2bc1e9c6a3e01786f872a603b7f65ec
 MISC metadata.xml 416 BLAKE2B 5c9110bc6a6c0c7acab6e9f10d8d84601a66c7741ba15612eb032272db9517f314eec8f86677e43fd7dfb1b032388b1db3b60c64e0cd9a6943498c4715ebf1e0 SHA512 5d23f08978f7ca0dae7062a4a872f1be37969144c128c4a1f2006798465b5dbf95090e14859eb6c7e1e75649170e40fe156e6b9cd5b1263464e88edffc760a15
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
index a059024b10e3..bfcbb80411a0 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index af7e2543ac48..03eec6d33756 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 520 BLAKE2B 04f25712723985141113cc7a4779c696881e749e01422d7ef2d27249b6f72e266e806b3116c21a66a49b61fbf82785acb9062dcd4a1a289322416e0e15b7f775 SHA512 af276bec715c5ac72e1e2d634609a623e175d8b21cf7216c5df62900032a51da550043609373863a5e302938bae29d5a095e8d9d87a14928a19876f760c9587b
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 526 BLAKE2B 7d66f4b584a96417af102f778ce1012d9086382fe41147cb573af2baa8b082b400b6074444e577d0332cf479d687fc2f61bc0baf5cd79fa1733e991df0197fe3 SHA512 5bb3ebe7feedc1fded395a3ec334e7b14fa5a68bcfb21d99ae9e9a268f0c3c5b1b81d72b1cb2cad5b258812623c302aea7a4c4a6354a4494ec3f35add85e7022
 MISC metadata.xml 540 BLAKE2B fdeed1d2431de100f1da6d4035c1ada5345e40b86dcaba03f0b26a20a8471a36c7b57bccdd6396d69e58d9eb2d111d1e73ab37b027a9a0c22c17677b74213467 SHA512 b6fb665852024a264370baba85170e4ab22f5176c4cacd86efaf05b9f3a5e9ea96ffb78d63cb8f2902926ed12f4dc53ddbd59992e71de1cceef28d8c8002c479
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index ac87f8f4ef2c..718f5fb3673a 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index dbd2fd5e3492..fb37e06b97a3 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 932 BLAKE2B 4256c1748e269645819d6d91da3ed1a227e29030aefb6b99414abc8ad5715cbb5c65b0d257cdfc7ac521250aa9fcd6c4e5c64d5daa34cb30ea30af3d9e9f5ad3 SHA512 ea4652e46b711e5807a9ddc8827eeee44034f1f844c2869cc28b1c16ea097a63a5a887d2689a20076475dabd28a221f3d7ea13d0668227aae06f1fe2218b6ffb
+EBUILD sphinx-tabs-3.1.0.ebuild 938 BLAKE2B 1fea69d81e0da1f2d4129909c9aad6a64faa7fff2e39d54dce36306ea6359f157623687920d688f868e0b845b23be9604dda6349b78f49181e9b63ea80f48ebd SHA512 0c34cd68d671ad0bb6cbe281443f6f3b3cf9f621416144e1b4a796192ef50deb0718d2ebe3b50d7ec7312b437bdf4ffdfd8a03e101675544a190c6a06c5501bd
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
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 eae215832298..00b5cf915d62 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 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 6b4883990bdf..25ee43885272 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 567 BLAKE2B 2ddf7639fa90e380e2344465db3ef24645cc7a1df5028755ea93d2aebbd171638da0ba7da0e32d00dfbe665d6bde02e1b7301bdcc743fc6ba9e3467f99fbf3a3 SHA512 5313a5d46cddcd6963c2d920d417b14dd6b4895208598dbba2f5d5a95d04d7007f65281493b5b738164dd4d0cb3dced045194d28f8a4332ac18b0f982eb59afd
+EBUILD sphinx-testing-1.0.1-r1.ebuild 573 BLAKE2B 60f7f65cddc1a4d4c0ac346e1f7d4f39efaf7359284ca275a9a1fad793832f5f0d85f20a03112d69fcb924502b74e09ebbd9691eea758ea55952e3cb55189a40 SHA512 dc857b6145fbc3fc8c4be486d34bcf9c9c2a37135011f76c32964ed4c8acc07f54e8b9a046abca140de1b57adee0bf003ca3f76c9078e3b57a0ae37ebbc4072f
 MISC metadata.xml 383 BLAKE2B 41e841d52facd1baa27b1792d1200e275c4925c84d45ab17fe3ed243107de05e0cd70b9e73227bf7cdeabee8ef03175da471a7d357228e546df35fd1c7de9d24 SHA512 2fe1d7bc1e88c836b2ed8ce0f2cd6e71b5ea52fd94c0581c29a285402ba8f81f62cdece2b86776a02a9082ce7ee52f0881088fa28c263c7a2a8a85b1614b7ae6
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index fede4df3aaf8..12fe9917ca1b 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index ed0365dc90c8..a0c3db82ea6e 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.5.2.tar.gz 7606638 BLAKE2B c104121b36c89f4d2b7c2fc12433ffd1a7cba9b9d532358dafd53061b2ca9ead4bb93b7b596394c244a9da51c0b9299f2fe0ec8d4ca102015b6c7dfb92081813 SHA512 dd46bfeb05b433970d8130c06cad6dfa9dbc4e9db2d9a8190b80232d75b4d0a86590c17d64b9b1dcd2cb1d042033f4d2c2ce2e5cac0239c6b86899628b94b274
 DIST sphinx_rtd_theme-1.0.0.tar.gz 2780623 BLAKE2B 02e72ddade0632423d21e512ab86fbdcc9f18eddbef328ba766f1b06a49c838808af4ee000e57c8f0f40112569b35c1b62c9c0c8853c237fd2ddb6de76d48a21 SHA512 06025445e1358c994bf0c15a382ec8f8f3f2114dfac19f340585a3660d91a279100c2d16ef665d9eb8d38b0e4ed264e96d3ac6814dd01b9430d2f8a0d8275178
 EBUILD sphinx_rtd_theme-0.5.2.ebuild 800 BLAKE2B cf10a015d3a3e64745ba2c645146ab1426049a7817d47cc3274d36f902d77f8656bf7445749643aa3e672cd3071eba5a3aec36f3a41d12093117a2ab72c91550 SHA512 72e27ede056229a3cf25eebc2c1d38fb463b4677bb9f465c80dd0c29a3d406fc28701101c3ed4ed0f0a02150e2316c68d239ac4d3845736150cd780d8ef64707
-EBUILD sphinx_rtd_theme-1.0.0.ebuild 814 BLAKE2B 882ac9c09eaf7d02dbd229e42fe6f1c9c26af341d336feb677858b9f218593eb858cb5c890a19ddefa37f8d6cdda38b2b51f15cf4124aea5134eb3aefbfe8e42 SHA512 aa580e5940942bad9b4ec255d60cf64e41b845ed06c6d3c74b14fccc516d3d712cae798bc7b1a5c688442027b78dbf9d85614c35be8b04b9fb542f6200d37937
+EBUILD sphinx_rtd_theme-1.0.0.ebuild 820 BLAKE2B 05a2093e81e0f6d795cfd65b29843c1439ca176030ef6c21543d7ab889e2bb26541bbd673b1e6d574976148fbef0f3ee80bcc7fa31540326e69d5a027a3a72dd SHA512 2ff9ecbdcafb400df76a80a7bb07b95c9d2169f301c5f90718a402baf82f9a7aed9d0629719f594cbc99d5d783e9bc79a12a99d2a1a6d2420d2335f4f25ad52d
 MISC metadata.xml 412 BLAKE2B bed5105c13db0478a4b6129d634b8028b80cfb4e7969705ed0a693286d7f1645608ba6e6066cd3219c267c097bc1bd7d1ee13531d91d8cb4fdf6a5f107ef2252 SHA512 a0e7ce66d5f68145471452e49c173aaddcb502c9ba35af543240e5fbe9b24c0bd94ecf5782d5d81c23b3e63b80cf0cab4e39d279fb635f17275702e9a56bd5bc
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
index 18cb43fd10f7..f110a51181a6 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 PDEPEND=">=dev-python/sphinx-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-apidoc/Manifest b/dev-python/sphinxcontrib-apidoc/Manifest
new file mode 100644
index 000000000000..41676f0edef9
--- /dev/null
+++ b/dev-python/sphinxcontrib-apidoc/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-apidoc-0.3.0.tar.gz 15396 BLAKE2B de726316daa81eae1a8012c8be4acf3850f910af562d23dc17194afc86b40daf632bd5cdd61153299f35f3326b181c3b67e75925f0d95ce4cea81e1766c7828d SHA512 043f9b36eaff7b3f6d23c834dd3947e2b029c66010b3862f1658f03e0fb6c4aac3304f49465dd515a30107a685dc704a0e319675c9d7b27897445a2c315d07a1
+EBUILD sphinxcontrib-apidoc-0.3.0.ebuild 667 BLAKE2B 1f874be48d40bb466a32aeadb31307d5cbf7378619d30d681a63ae352c70fc4c3e612cd6f98731dc31a923f5700c78591ef1c9df0cbffa08f94440f6120e09e5 SHA512 3e9635e530c3608dafb0555980c28b26391133f0baec06ebed559d8432d06db31aeccdd46e8c63bf3e17ef647e294236a91c207c802553cfebcfef993967b462
+MISC metadata.xml 418 BLAKE2B fabb68d078facdea61c871909c4a03a6ed310ef0ae79a01eb687fc2da1883d960eb78370649eb3a0794ec17c005fc7075a8f02cb4f41b2cd9df9fd83699f8264 SHA512 1d951354e9b8cd6a61f8cddba2082b5d9f5b7349e26eef09a8d2f54f7f0815d8f660e464a6fbb5e9e4f21a9fcdaa5a847cc4bfd05e6c01690e0def8dafc9880a
diff --git a/dev-python/sphinxcontrib-apidoc/metadata.xml b/dev-python/sphinxcontrib-apidoc/metadata.xml
new file mode 100644
index 000000000000..1a84b5db64cd
--- /dev/null
+++ b/dev-python/sphinxcontrib-apidoc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">sphinx-contrib/apidoc</remote-id>
+		<remote-id type="pypi">sphinxcontrib-apidoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild
new file mode 100644
index 000000000000..cea7e192a03b
--- /dev/null
+++ b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.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..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-apidoc/ https://github.com/sphinx-contrib/apidoc"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index d77e42bd4923..dd690714a9fc 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,7 +1,9 @@
 DIST sphinxcontrib-doxylink-1.10.tar.gz 20217 BLAKE2B b5b1128d8b60e91b655b2efb093afc77f10e39912c841d2241576c0ed7f1c6d23c92272ee988435958155b9506d22dd5a8b0373bda7059040b38869aea37f9ef SHA512 08beb65cb22b02ae253bd526da00cee322cc72fc00214818f3d5fa503d36725a08f67c6b46f13fec10b1d9963cd7c7ecf57109342d7a2ba991cdba0fa6ef8125
+DIST sphinxcontrib-doxylink-1.11.tar.gz 22043 BLAKE2B 73d137d2c7df594c71def4d422040eb46028192c13a38b7f765dcbda82034936e3985309254b536d9ba49a32e2d9df9c8eb7886b7a365bbc0440e901cb0250c9 SHA512 14a3511c6958d05f6209c292563068e58410e6833821c8339fa95c511ac2c8987b05097a423313345f2c7e9c1dfd17136bd8684520341160fdaefae1bcc2dcc2
 DIST sphinxcontrib-doxylink-1.8.tar.gz 20005 BLAKE2B e435a65f3931c91e0d7d44d1cb4ebc8e7683ab906864e37a0ac31fc6655dba60cf53ef3d91b9e0ce440e86319ec45e0d81cf43459e02ac7e45c8d1ecbc2a9881 SHA512 1c53af2502fbb493a5834ae3eb05428dd296300f8027b5dd8d93cd67a03ea572ac81a0c3c8e6ddc9017a0b7a0859757d61ea67b73b3ed69fb1db76244ffd6874
 DIST sphinxcontrib-doxylink-1.9.tar.gz 20175 BLAKE2B ebff920929c29ecdff9ecb02ca3d7d4992b0da8a34497d9e2dc4b3cd66a5996264e0ab459f69c0ec83bfe60681beac56f981ecc72e128a08f095b4b0296061c5 SHA512 78ffc2d2babe6502bc8818116cca7da079f6ea9ab3f43efa587dbe5efe15d2492be6e763850c9a01e6053332871277dbbd7998803d0ab54616e93878d51c92b1
 EBUILD sphinxcontrib-doxylink-1.10.ebuild 1006 BLAKE2B fe65507b178058c3c271ebf17bd698d634698ffe18edb7c22125fbd616048f1817eca1ef2357982ba09de2b7083cde0809e1804acdbe79f211567c5e79c3502b SHA512 9204fc1524ac37166febc1065a416c8d5044a4661ddcd0c2b7e9788ba5f7accdbc2e7531973be844e1ad37c5eaa85ccf0975bb9811e1b69a50426549be8e3744
+EBUILD sphinxcontrib-doxylink-1.11.ebuild 1050 BLAKE2B 203774a4a223ece1d027e6e3b92eb48e0cb4a1f7185a6438878cec6093282e73a9a5087afc8ebd27f1bd7065a6ab7269d179d0256386870c3f495d6633e09e14 SHA512 dfc9f172233546010608a3c3aa6364de03022e125861b9f96c0b3f7f2c4ce43c0b4084e4d022dc803410917549838756c83c86450e3218a01288cb611ce7b3ec
 EBUILD sphinxcontrib-doxylink-1.8.ebuild 1005 BLAKE2B 1e279cb31ee0e39b0a7d311841b557052898e47e6cd2da4950b6646e40bccba6a4567c3c50faeca472eeba882098692dcfd8137291dc1c127f3e3671d907dd0f SHA512 5fb0a084d169d3f23aaadd408ef5302a4ec1baf9f8a08f51b91dbc37e1ea6a10146dca827abccaa58806d38df562ea82e2cdd8b7cb6cd571e0363fdcd4a68c00
 EBUILD sphinxcontrib-doxylink-1.9.ebuild 1006 BLAKE2B fe65507b178058c3c271ebf17bd698d634698ffe18edb7c22125fbd616048f1817eca1ef2357982ba09de2b7083cde0809e1804acdbe79f211567c5e79c3502b SHA512 9204fc1524ac37166febc1065a416c8d5044a4661ddcd0c2b7e9788ba5f7accdbc2e7531973be844e1ad37c5eaa85ccf0975bb9811e1b69a50426549be8e3744
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
new file mode 100644
index 000000000000..8e91c69735cc
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
+SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-doc/doxygen
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 11617efba43f..ecdd641787dc 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
 EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 641 BLAKE2B 1568d98697a52f5f6500f1305be52917d466a7e0f77f7cd21821c5fbf28339cfc1cedcfaea55316410ba21bdafc147e619f17e607b272f517390db21ef6bc993 SHA512 8b2d87209af9d86def3dc27dad6bdda84b15bee627f3e88fa53bd510faf8c79c8ad88d530b1ffbe1831fb1593b92d07ce2645e222443535dadcb901de5c330c6
-EBUILD sphinxcontrib-github-alt-1.2.ebuild 668 BLAKE2B 7b8db503b33eab77ac3cfec7b435d19584c6ad5fc817c75cc3ddff23eabc1aa5cf192914311193653f6d0c40e4be3650d1494864e42c9706bb04c3a2b0ba3c7c SHA512 fb9d42af6edc96499929a026f27a63498a5fc81b16e7a9a8e9d260e1852033b3936e63c65ce1aa46719d0f66a469923605c7bdf6cc2bd703506d77c40d7c7371
+EBUILD sphinxcontrib-github-alt-1.2.ebuild 673 BLAKE2B 0df55e4995d6176c942c08d49e16e8d890b3347d04c1ffafd24b772cf94f93989e054f68376d08aaa341a9f0a85902bdf1032c1fc7395e6bc8d7211079635dd5 SHA512 ed75f161e4bcedaabfa079a94e1b782dc6de90741837a82ffefe13791e82aa0adb74778e40d3d6398e98f323cd0a2637719d9633e1a1d4285a15f7aaf86a741e
 MISC metadata.xml 437 BLAKE2B 74c212e371aeaf70f1ad5d4b4a2afb0cb6cb1f3ecd5f45934675d711e4b01a878656ad154f517bd4100663ec7da232443625c8dfb79a6b0779a00abce35528b1 SHA512 5fafca03639f467b05a5f7cf1ab5a019817b505504b3d4e4fbc711ddd0cd679f9416e5773f032760b089398e8518291d179e8146c405e5e189e9c26f0a2de642
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
index 8c09afc1dd72..f121d17bf14e 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/sphinxcontrib-log_cabinet/Manifest b/dev-python/sphinxcontrib-log_cabinet/Manifest
index 598c5408fefd..e8b7a96ee201 100644
--- a/dev-python/sphinxcontrib-log_cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log_cabinet/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-log-cabinet-1.0.1.tar.gz 4072 BLAKE2B 6e237bee5ddcd13dfa0cf5151446a1d3924534009cf8c4b11c064dc454e0687ed03e9b09052332bf8c299d340a3522718704d65ac0fd7bd5eb22d18403b3b369 SHA512 c8529872c4ee783330738babd5027e64a813698ed38fbc693b23e65e5bfa2be815a7e6acfae42bbe003e542002d7d298ee446cab5dcebb3b65d2a25691bde18a
-EBUILD sphinxcontrib-log_cabinet-1.0.1.ebuild 647 BLAKE2B a70f37a382668bd37b47a3c7b48260bb4f8e3723302727ed52008405e053c60d26f07634bf68f238ddca6308628b9029b6a4e4c12ebf48b06f76444c6782509f SHA512 e3ea7ef1c5a7a874c564ed3673aa05a9ac957e891a44fe19f7b01fa7086cc617b7dde546f862dab21a8f100fa3b4d0b6ebc960604b782095340daa4e17bc00e2
+EBUILD sphinxcontrib-log_cabinet-1.0.1.ebuild 653 BLAKE2B be9833722d2b771416642a81ec1ca3ec766724ecf21d59f6d0d108d49197c0471ed82c74631796f2cc7e09c8c5b8d41f353857404fb8179bccd9eead6e2e9f08 SHA512 e71aee8a510a2e767ef23f60cfe93d9b1e0470930760b502bf751c74b53ed3edcf6db1f1fd53ba7c60af5b6509c6a022b794053a67696f59ce7383a88176ccfb
 MISC metadata.xml 427 BLAKE2B 0eb6089bfd52a11b5ba031d7e6808283a373543844809bde35eab1a8320ab885531d516a09793c39993bebb03c1cd9bc6fb0bb40d2d425a0f213d9b6e5db76f6 SHA512 a58d1124d0153095c17bf1a1e002d7f3b25267abbe82b8fc7830fba79be8a01fbb83b708145672459f92b144fbcf71cc754f1990327feee1ce28dce48d32a8e9
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
index 8b023c460f55..933a7a4250df 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index e27910e10261..f887d15ef481 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1260 BLAKE2B 52b7a082399892c8eb9c1f63ddd5d13883829d23c3e1ddd51acebedd2b5f8cb02922c9c3f044193dcc375d5204cc6d42866135de6ba30bb06569bdd963e38f0c SHA512 fc9f20c2b47e9e93d4b464ea2630b6e69da9331b0e2a6ca98d2e4cb39350a8fed35a33511e20571e3c903e11dfe6c8cf8efe6002361d9265eb0189453706f5df
+EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1266 BLAKE2B 83976ed277ab141e8960324ec9684cf55f4ffe19e7edd703be7b2909bc1680a141cd56c621b275d2a075853398249cea27ab9777ea8bad03acf45013c7798c76 SHA512 18e5ba68d18bec66d76d5d125b193c179bc026940beb7cd09a37870f1867b501d6af10630339257bf81ce8b008417233a6feeb49de7a01e0b9bab54d20aceccf
 MISC metadata.xml 614 BLAKE2B 4029475965c4514884e0ca09ca1ba257806fa222367acdc77caf7878d8564f46a6050a06e7f43a5483d9c855e746818c037dd80889fba245c3626537722281d0 SHA512 014e0efd914a7fc32fbb8bb432efd5d7e4b2efd6e189ec33da2c409281e67529de574f7708c9963723d314d45d1daefd33eeabb9f25e5af389ac0d0ed6f37d51
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
index fdb6aeba3847..9fc9cb7ac243 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 14ff66c42462..2673c1432fe6 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -10,5 +10,5 @@ DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2
 DIST spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz 88791917 BLAKE2B bdcf52965b592f4a88ee988afcca71ed73b0499397c8c0b7ff36c38d4408f4b76ff285b3d9739d1c126322fdd8c1c6b93f3017edcaf30563da02d8f509d09fe4 SHA512 2717dad17db836330820578c9082505b7f1126fef2a76284d03a443f3317e3a9a294f69e50f075a29580c4ad1bfbd23dcd02fcef93f32645ae5d52ecfb0b8f10
 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.5.ebuild 7152 BLAKE2B 3a7c7d5c7b9dd05337129ddebfefc6e76f86f1f1033c22d23ee766cc094a157c8a28584f8490a4cf30c088d1fb40f018c276504a5feec7e3b81174605deaaef7 SHA512 bacd8c77fefd3ea9d80ce27d26a41a49bc6c673784576872935d58661fe03915120a1dee9db706f6d1e8dd62476a871101fe6939913eeb2c74c7ac7d869f765d
+EBUILD spyder-5.1.5-r1.ebuild 7224 BLAKE2B c65407ac7ab3b1edeee7fa7b0564785c69ee58eccf3fe83bcf97865e1a47367240e455fa8fa8647785dccef5c16e493f2400bfd01749a9171f0b3866f950c5d9 SHA512 d02ab7edbd213848183f9af6b72496621730a8c545d445d5499534ee459e0062db35af4913c785d8be566aecb6f7cde08ee2b974f459a3ccd345047d9646d837
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r1.ebuild
new file mode 100644
index 000000000000..f5b6758981eb
--- /dev/null
+++ b/dev-python/spyder/spyder-5.1.5-r1.ebuild
@@ -0,0 +1,190 @@
+# 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="a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c"
+
+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.1[${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' \
+		-e '/pylint/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'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here test results
+# should be checked for success manually
+python_test() {
+	"${EPYTHON}" runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/spyder/spyder-5.1.5.ebuild b/dev-python/spyder/spyder-5.1.5.ebuild
deleted file mode 100644
index 43cdc338040f..000000000000
--- a/dev-python/spyder/spyder-5.1.5.ebuild
+++ /dev/null
@@ -1,188 +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 optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c"
-
-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.1[${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 0e1738700afd..18b195e2f063 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -8,5 +8,5 @@ EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa1
 EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da7f086f15d8663b5f1ada31b5485b996403543a25d3794105dde8976911aeedcd8f61bd3803f0dbd02f2858641d51a SHA512 87037d20361db24faf4b55d975f54a36f2b6b1d113ee8c0cbb7ff410270812951160c53ec5f6002a1533498be28e9487178a15c916c9bada7539599154d8cf4d
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 EBUILD sqlalchemy-1.4.23.ebuild 1561 BLAKE2B dbd9e34b6ac33894ffe547827b8fad24fc3e4194457e7ca83a2645fc45f1abec67d3152f9a69cb6bc64d3949bf952ae17b4b823252efa303f4f48409b709cd61 SHA512 016509c20424b3cbedf3dccfa96a39d59427e43dea14cc938471c005903023f5d0dcd04caf7153319310880ffb0320539d8daa32c02d97e75a03ccf04b9cd93c
-EBUILD sqlalchemy-1.4.25.ebuild 1552 BLAKE2B a2ddacd0f8d118b3fef7f39d0e021139b30c087be253c9d9b00143dab86ec4bd4b367546f102e4db60fd6c17eeab15715adfdb20f56171667954dd3407e4bfda SHA512 955605361dfceec1832f26de69cab1e2fc7d5d7f7c43e2a10f47c610a96a28cec9f79989feb9f36573d637abb9d4e97c99d5d1fb84c7d3f250234d0a64e5224b
+EBUILD sqlalchemy-1.4.25.ebuild 1558 BLAKE2B cc6d1a53451ed1b8b6c3d538de7c525251cdd47b38156149131bb9539f173406e741d68709f3338615c7740912c891c26f8fe94dd40ffb6d0e5db30e202c2bdd SHA512 bb73b56dee4b05ca4db6af151efa64ab9705f5f7533912b824e68a9e1b487eeddf765ef778473051b8987d9823f0fe521f5af72a85d39d79d05e58d079486727
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild
index 0cb76d297ef5..4ac535954ba7 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.25.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 ~m68k ~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/stevedore/Manifest b/dev-python/stevedore/Manifest
index a322c6fb08e5..fab390dba154 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,3 @@
-DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
 DIST stevedore-3.4.0.tar.gz 513360 BLAKE2B 17030d1aa3cfb566e6f589120eeb6241a1bc0a0dbac0825c48fc96b16316348e7b5e87c6c7fe428faf46cb9e2abbb0da6465f404d5a1fb767fb07c5d8078e481 SHA512 a63897c65fe8deb1b900c4279ce38856863a2581f8e0dec3fc082d0bd6daa5f346bfc6af978b73c3ac24215953c1376a973b800ff8dbbdc1a99f52c99bed7d6d
-EBUILD stevedore-3.3.0.ebuild 1093 BLAKE2B f833683aa41ea93f9a286a5f1ba24b203017275b57bb3d211a31ffd230ed5cb632e1eca3ed71f08c900fdd62d3ac2e07500ddd2ddac0fcf327d937659a308d0e SHA512 f4027760e7049fe7901d2542fdb1deeec81a2b94bb2e3ce7e4c665c74559ecd7de41a0c9b1e035e9ca0017b8a713b9847cd19d0f4d959b01de4792dbc1cc853e
-EBUILD stevedore-3.4.0.ebuild 996 BLAKE2B 2c7267c78aae4c51f99afe9f0ee3850a04bcdf3c93d4726fa8ac8086872275f4dcbbeb5099dde2e8231fbf892b58abf3267cde346f746761386d22d53f448c06 SHA512 76ee1b728bceb7cc9280a5ded7b01beee3f7f4b94b7c23ffa603b6d015f68636ebcac3fa68908ff4eb8639fd97dad6aafa0229741dab412c87ce35f7f0ea24f6
+EBUILD stevedore-3.4.0.ebuild 992 BLAKE2B fcf642b1440ba51b3bccf63e7dfdaad9a178a125b55de91edc5022b0e3498cc94bae183124f6368269637400d702ea60e11557429428cf15647a5181e9a672e5 SHA512 3f7bf291620e8fc4dbb70683689fdfa8e02a645b84be2bf1f07435ca582682697946eb9e176bc103ed3259b28e440adc7953e3fedfbfb80a257acee3b0c79528
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-3.3.0.ebuild b/dev-python/stevedore/stevedore-3.3.0.ebuild
deleted file mode 100644
index 1368a1544750..000000000000
--- a/dev-python/stevedore/stevedore-3.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.4.0.ebuild b/dev-python/stevedore/stevedore-3.4.0.ebuild
index 6f453b4dcd0b..b2cb72704483 100644
--- a/dev-python/stevedore/stevedore-3.4.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index eb982ddfa231..148cfb4affaf 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,6 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
+DIST subunit-1.4.0_p20210729.tar.gz 112644 BLAKE2B 56e785c029f3f2896d0ed3d8005c37403e6aa32d05b653db0e3b679d2157820558e578b53133f4f79404a660f37a710aeeec03ff941fd7cd0819020a0d474515 SHA512 90b1ad071fb5246a7446a4c999142566b9d96c39838905e9020b80f2f0aba0b86dd5185bbd25ff7fc65f69ae68e1e53dfde5b2de05755aa97db9248c6faaa9d7
 EBUILD subunit-1.4.0.ebuild 2589 BLAKE2B 6910487596f619830a195e448eda159753c2a6c776c1ec128086f5fe5f859e028088f16b889559b7256e63668ed86d0fa92d34597442ffee44bc348f699f2a10 SHA512 6ec43969be84272430101edc9e645a182c02951cb5ca6df1dbfcd8b3b82ea262548979cc1a770a3d49ea3838a497e8456d3c82bf41e3bab5e8a21d8f81b996e1
-MISC metadata.xml 475 BLAKE2B 6773520b663ffb97362a99c1472833d54c31a51bf7694691d669138c69f9c3a27f020a05dd68d13e2c99bd4e7d597890eaca6d981b132d1ae01c89909eed63cb SHA512 2b64a01e91f6faeaf8f8455821d5edd1d2233056544ea0c0bce46f79346d6e974fcd2f3ecbf98d35cda6fdaabe555683dd13c1d77258a7a9a8b4bcaeb9ac0b7f
+EBUILD subunit-1.4.0_p20210729.ebuild 2261 BLAKE2B 54b52db12e896f057f7976e396a2444d9fcbbafb7847c965be837f18e16185142633f1dc48d476c4cc0fccc4b78aee9f5fb10a22718107826198b4a7b4e6be0b SHA512 28b9689967cc262e7c0211c6f5fa877e0e64a7ba6e92e63e20b6afb1fc75afca297eb3678bb16c619ecdacb5f0b78156e16d1bb15eb4454ab337b7be61a23cff
+MISC metadata.xml 536 BLAKE2B a2d8868bf91b862ea393f908c5ae6924dc70fcfa5e2d58692d61c1a45ae33bb9301c82fc032c5951491857da923bdba56f2ed11c149df7b11a4fd9037d1e5a23 SHA512 15d6a7804d14048e959dcaee03bcb2069110ab930368b2b9c31c78b610fd35beb1f714e3d109de2903dba62600b0013d6ef7f5794e828dcc6b34755e35d1836f
diff --git a/dev-python/subunit/metadata.xml b/dev-python/subunit/metadata.xml
index 0eaaa4c9575c..d7e73ee6e3af 100644
--- a/dev-python/subunit/metadata.xml
+++ b/dev-python/subunit/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="launchpad">subunit</remote-id>
 		<remote-id type="pypi">python-subunit</remote-id>
+		<remote-id type="github">testing-cabal/subunit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/subunit/subunit-1.4.0_p20210729.ebuild b/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
new file mode 100644
index 000000000000..2fbb1719b152
--- /dev/null
+++ b/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 multilib-minimal autotools
+
+MY_COMMIT="c87ffbd904627d777aa1430963dced92a36aa033"
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
+SRC_URI="
+	https://github.com/testing-cabal/subunit/archive/${MY_COMMIT}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-lang/perl:="
+
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/subunit-1.4.0-werror.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+	# Install perl modules in vendor_perl, bug 534654.
+	export INSTALLDIRS=vendor
+
+	# fails on py3.6
+	sed -i -e 's:test_add_tag:_&:' \
+		python/subunit/tests/test_subunit_tags.py || die
+
+	mv all_tests.py python/ || die
+
+	distutils-r1_src_prepare
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+	cd python || die
+	"${PYTHON}" -m testtools.run -v all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+
+	multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
new file mode 100644
index 000000000000..543fc5de2983
--- /dev/null
+++ b/dev-python/tempest/Manifest
@@ -0,0 +1,3 @@
+DIST tempest-29.0.0.tar.gz 1090497 BLAKE2B 520e9de1fc326d9a64d7ab5e93887f3bd455d9c47d29e0774bfb362b1baff6c1dd13fc6df2c756f0e73dd2b33ecb02ea61abdca9ea1ae68474ba53271c6c9e93 SHA512 03049d6cf0e77bac1afafad88b5b0fd22abaa40ed24ffd2c0c989dbadf277c09d703f0d9f7b34f4f68a4b5858b061ea9586ef66e26749b0822af0e426d1b81a7
+EBUILD tempest-29.0.0-r1.ebuild 1818 BLAKE2B 1d62c5f400c9266589719b13a7c325f13089e002b77e229393e6fb84b0ead1ebd73ee75dfd6a02d4210594cd94bea87ea15e12b90e17f3a6ad4fd1290a8e8872 SHA512 2c7f8beaf6de7d9f9ed278f38fe63b4eee4cdbae0b3ccfa6e45f396fc668a78ee0c7515835a019a311dbea5f6ae7f1172b359155341c42f55c2ce1939d3cae5c
+MISC metadata.xml 401 BLAKE2B 9a92d6bb9b20f86c1288c52b2a656367779e67602bf3bf1be4a21601f3141e4864916250418ca7bf1f13767f528cd4679fb6e1a18dca1143c3edde50b508cc0c SHA512 ba3015a097340042ba4580d59da46e12f6b34e2ee174c6ae775a5d7b71b4bcfbf04b52fcb871af76e0ec3bf592ec1485f1acdb4944a0a48ae77b6e8b958ac198
diff --git a/dev-python/tempest/metadata.xml b/dev-python/tempest/metadata.xml
new file mode 100644
index 000000000000..bbcebc294603
--- /dev/null
+++ b/dev-python/tempest/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">tempest</remote-id>
+		<remote-id type="github">openstack/tempest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tempest/tempest-29.0.0-r1.ebuild b/dev-python/tempest/tempest-29.0.0-r1.ebuild
new file mode 100644
index 000000000000..c8e27963678a
--- /dev/null
+++ b/dev-python/tempest/tempest-29.0.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+# A lot of fails and error of InvalidCredentials
+# The test suite expects full venv based on tox
+# Please test the package using manual tox run
+RESTRICT="test"
+
+distutils_enable_tests unittest
+
+python_test() {
+	distutils_install_for_testing --via-venv
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=160
+	eunittest -b
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index a8a41351cb9d..d2dc2446095a 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,8 +1,6 @@
 AUX testfixtures-6.18.1-py3.10.patch 6506 BLAKE2B 09db867dfaf8b76098681ce2b74731a8224b54e72b96362a34187e3e55309095bac8459d40b3c54fc6cedebe13c9f76ac9cc18ff43c2bf9e88b9dbfa369dff5a SHA512 d91b46005525cbefa2100eee25720b1229c6ca8213aaf36578635ffc82edc50aeef278d8e009d13bdb14ab791d7969b5fd39ae70fb2becce8f255edee1256792
-DIST testfixtures-6.18.0.tar.gz 121584 BLAKE2B abf90012fe79d148c44d72a8aaa5277c95a33933c7b753eecdcaeb11279b4439ad9ea394270e440d9681c22789a17738d367b66adf3d04cf6e6289713c1ead59 SHA512 e6552e6b1837ae4ee4754ce3675bdbf2a68d8e46b892382bd8320290050f2c296348ef6310ce3ff46962bf1978c351fe2cdb853a73c9f800f68818f81d5caec9
-DIST testfixtures-6.18.1.tar.gz 121731 BLAKE2B c31873d3ebbe47d5d3035d6aaaf674472efb32b061080df711ee558bf91d1b01d417ded4eaebf7436132fd7b9233437e735fa60dee47777d032fc1b610fd1de3 SHA512 088c6480eecc9862e91a0188ab45620be3d8f8898ebb284dc932155fffbd9f75ebbab9425fe4db8dee75ee8fcf82d8c27b950a3f9298e9f7ca420744c65edd91
 DIST testfixtures-6.18.2.tar.gz 122026 BLAKE2B 2b30c03ae71a300883ace52dc80e06c6b6610283687fa8df4ded1678991a47e8186de57060458a2fe98fc8eeb8fae8299081697a6471bdedcca2772405c91c6d SHA512 ee27d9944e8e8ec770199b115a50274f7167e9d3d3d866b0d0bbe7fec8a939b25a469ecac0158aaa486b129e078077c5822e7500ad473f98ba59862424413e15
-EBUILD testfixtures-6.18.0.ebuild 1107 BLAKE2B 6fc7510546cb7d9242044516a61f02aaf8c332f15d304427959b3472369aaa8085996b938e9b099b44a3b14b0600d5886e64769e201e163259138914f06962b0 SHA512 dc79e500f56f3c838951d2b94ac0b00c663901572ebeee920ff1ed81895d219e6187c180052e9311dae85406e986916eb92a149e2f213c3e9e0c816436dabd99
-EBUILD testfixtures-6.18.1.ebuild 1250 BLAKE2B 86cfce299416317e4c16fb549d15c4388eb8b28b250081b6247686bbd26fa5ff7319045bc2025a3ac20854550c00f91e1b57572100b82110846c8561c6d7ab36 SHA512 5654831168434f1a084df1b5c29ff1c76ba7f9d2e008f49649e319c26264bc4b1ce4fb3f07ceb00e2db111eb529cf28591c7678cf58c1a0cbe555bcbcfdb12ba
-EBUILD testfixtures-6.18.2.ebuild 1265 BLAKE2B ce3dff1e0accb6a201a4f8ebe79f828d61d6c99f1fdd0f0c361d0b4868232b505a91a8b2278c32114863c67ed45f46f8952f6b770419b549a5106115f7603fb4 SHA512 e3d8450c4bc118db2919cd0dbf6f628737deef71e25f30766c7d77749af1cb777de1ef945db7dc64c47ac679e916e359d59c861872393fdde07c80b0dea91c2a
+DIST testfixtures-6.18.3.tar.gz 122142 BLAKE2B 014cc2245d5fbe0d39310c8e2c21cd5f289d6ec7a6a561d055e86d4cd25b79f1aa535067746219e2382df2aeec050dfa24cdae674636d92ee61016fa9861e705 SHA512 e556e7cb28f122526ef19550b1e593b61f01923d0be53951344f917f89b3d4cae29e525ceda3d0290bc18c3641b509dd7236e7b55ae50da0157fe11ca9f04cca
+EBUILD testfixtures-6.18.2.ebuild 1263 BLAKE2B 27c4d3479bb86eb93c64b1bbd28e71e0b816214e2c6fab075d57180a10646edb6339227ae798ddb924b888075b6a2c1625b5b0ef9b7a308280cec3b7cb4e685a SHA512 d144f869340197962d99e4d306bab07189064f01ee9ec309b616ab9341ea73da35624c2db4daf034c601657af7496aa4db761c28bdafcc4e1ad8a2f2a4b93ba0
+EBUILD testfixtures-6.18.3.ebuild 1265 BLAKE2B ce3dff1e0accb6a201a4f8ebe79f828d61d6c99f1fdd0f0c361d0b4868232b505a91a8b2278c32114863c67ed45f46f8952f6b770419b549a5106115f7603fb4 SHA512 e3d8450c4bc118db2919cd0dbf6f628737deef71e25f30766c7d77749af1cb777de1ef945db7dc64c47ac679e916e359d59c861872393fdde07c80b0dea91c2a
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-6.18.0.ebuild b/dev-python/testfixtures/testfixtures-6.18.0.ebuild
deleted file mode 100644
index c8e5d0dc1462..000000000000
--- a/dev-python/testfixtures/testfixtures-6.18.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=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-	epytest -Wignore::DeprecationWarning
-}
diff --git a/dev-python/testfixtures/testfixtures-6.18.1.ebuild b/dev-python/testfixtures/testfixtures-6.18.1.ebuild
deleted file mode 100644
index 09d57b662b87..000000000000
--- a/dev-python/testfixtures/testfixtures-6.18.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
-	"${FILESDIR}/${P}-py3.10.patch"
-)
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-	epytest -Wignore::DeprecationWarning
-}
diff --git a/dev-python/testfixtures/testfixtures-6.18.2.ebuild b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
index c2e4ba7a58fd..0be51f64725c 100644
--- a/dev-python/testfixtures/testfixtures-6.18.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testfixtures/testfixtures-6.18.3.ebuild b/dev-python/testfixtures/testfixtures-6.18.3.ebuild
new file mode 100644
index 000000000000..c2e4ba7a58fd
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.18.3.ebuild
@@ -0,0 +1,46 @@
+# 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 collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
+	"${FILESDIR}/testfixtures-6.18.1-py3.10.patch"
+)
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+	epytest -Wignore::DeprecationWarning
+}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 38c5fe43e796..be6aac41f459 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,3 @@
 DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
-EBUILD testpath-0.5.0.ebuild 672 BLAKE2B 2bc7fb158c854e8459656dc71f4d23b7b2adbf91bb10a9c485a42bc1fbbf5da8414da49e508ceb8116342d744b5366f2e797c4872d0bbcc0c1705c9a018a027a SHA512 f9d26e9a3b881027d3b785059c33c643a2bf91f982ab45da76366507560609ad03ce4dc820cc19a33ae285547736846db740b40784da3d6eb96124dd503e597e
+EBUILD testpath-0.5.0.ebuild 678 BLAKE2B f7b345fb3547c9cf65ba2e35248c5b1e8aedbe3475a724357e757bd557ec49c0f29938fcb7b4aa2e16546c3010c30b4cef724c48f94a5342857ca7aabe3036bf SHA512 92ef31c4b1cfa1e7a41ba7b319b579703b747cda4b2b3aa73cd542bc03edc26cc4ef93c43761c2b0ebab863b08b7c91f4fcabc4e6d6e3677f5a654a01aa38725
 MISC metadata.xml 765 BLAKE2B be598f7b1de674f7aa6ae377a4f7ba5e52a69fcfaf03e077016425be6471374f4ab1c226fca1454453496fb3d1545f839be7cedadd81b3859eff036cda3fa84a SHA512 017ed9b6be9f7ffbd4754df8d5709111f86fe40da54edb0a67502f9912f3dbb7af2bcf21ea122a210a4dba5e7d451bc88f479f018360b3ec1640c89936d87fa7
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
index f4aa974c8674..c525350e0de6 100644
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND=">=dev-python/pyproject2setuppy-15"
 
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 4acf2bc61bf4..e73da17b008a 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,7 +1,9 @@
 DIST tikzplotlib-0.9.11.gh.tar.gz 97761 BLAKE2B 95454a9181b219e99970d06a0e40d518284ff62c7b06d9cbf5b3125b11a711e67f9df1676dc1bd73a9ec632fa01786890e3eef030f8a52ffe809835e3890359c SHA512 05fa8285f4912f2593a00ec5961f4ca94964c2ff8271158c6c1e0447f1f2b54088a76192bcda4f893adc2ad78b9240742962eee1e56043777b0df145808f42ba
 DIST tikzplotlib-0.9.12.gh.tar.gz 97773 BLAKE2B 85d85445e313a41ede8c2d61d8db0d92a8f4fbb0722f716845f0fff3204e603e8b21998a588137eb67bdbc4d8f31bc5bfc82e29fc803b3c54c416191b6e5310b SHA512 4754707727eda29796a49809473b840c07b2cb7de606089d79aeb05daa6ded95a3f110deffb13ca2640e44d91c43b53520d6f29b175e200862492cb986b6c574
+DIST tikzplotlib-0.9.13.gh.tar.gz 97787 BLAKE2B ef767737b8d222773f2d5e02dbf80ac8a48ea8a00077eb245e5817337805deb5b9be27e7ed76354808647ea1ed6b17d3bbca9b33799d294bd924c18b224e3621 SHA512 f9b4c46b3179626222713dd771dccfa6b0c34ff55658838aba74867c7cd5b91dddfaefdcd2c41824c9f13a795cadd6720240beaf3d504a7f735a2169c441b449
 DIST tikzplotlib-0.9.9.tar.gz 591659 BLAKE2B c8ed8069387aedc154ea1541c7e4f97cd43a74c384be4810029acf2dd1de348d732c004850b3248ba6a892451afec56fc4de0c6b05c3f4edc7b72b741e46b558 SHA512 3b6bc8b23693b1817b7f8969352bfe45f81762f86d30b9329c3c57fb1897ee5965f5759e357bbe68d21b84ac3e53e5ce80ffafccfac22d9a4a36ce104d5a2966
 EBUILD tikzplotlib-0.9.11.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
 EBUILD tikzplotlib-0.9.12.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
+EBUILD tikzplotlib-0.9.13.ebuild 1026 BLAKE2B dc8f843202329d079d0aa5a2b045ba3695d04ca58add84a0dd74c0729baff04f0d17d5d5d304cb2da7702cc11701bc46a0b233e5845159e3c68cc2fdcdb3bbbe SHA512 f00b13a59a7bf5e5e0ba96b669d8c827ca368b0f0f479db6cebde982519800fb53aa1576e13537ad9416eded1b23e6e8caff5e96952c961844483d8f843c3374
 EBUILD tikzplotlib-0.9.9.ebuild 922 BLAKE2B b4815d76979b0b54774c1907b447482c512e5aa56c3d92eac67b204580fcb157ed1b2d63039c6e67c578d31cd75cc300208e99c233c910214177d25830577928 SHA512 87cb7ac58c25c67c1337e0122aedd405aa29a0515cc55c9a6b833e11b0d00e21a6397a9e9f6bdbf427c4b2c2921925305b9de21bf6c35e52b3978de243fc4110
 MISC metadata.xml 972 BLAKE2B 58a15fb4ff395c481a755bb9d25c08cb149d4e6fd3db47cafdc4a477dfbb610f78eeb1334bb5742696a8e5e9ceab4f1653a668b93664baa8aa36d11cdf350e31 SHA512 2c363093ad18d3fac9413548e628b153540b4283ec5900cd6f375219408c00176ea9abdb54d576dc764aa713fb33bf8f0dbfc6c54a355f1c2d3dc7e6b5f089d3
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild
new file mode 100644
index 000000000000..ddf06a6ca882
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="
+	https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	local EPYTEST_DESELECT=(
+		tests/test_barchart_errorbars.py::test
+		tests/test_colorbars.py::test
+		tests/test_fillstyle.py::test
+	)
+
+	virtx epytest
+}
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 13e2b327e0c7..c3a96ddf31cf 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,5 +1,5 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
 DIST tomli-1.2.1.gh.tar.gz 122701 BLAKE2B d0280bb81a6e931a175c6ef2c58b4f36b1237f99a73331cbb95f98b9e68a98a4c6a635aa12751ac46492c2b1a06a821f1ae70cd0c36f268998488e824f3e577c SHA512 34f9529b137331b0ae03ac99170b3f6509847356594be14166bae306ea4fbbddff808ffe0c48d05434f72d223a2f35b511675217053029d287725b7142fbd089
 EBUILD tomli-1.0.4.ebuild 824 BLAKE2B 7355a32afbdf50eac4dbda5801647dd2bd160b3390fe20660dc73ee2f4e633dcba3b0342dd2d9e92fd9c9b5e50eff56d31afcfa77079cfc53e2b3826c2bf8572 SHA512 3fa25d4bfc1b2e7b209689fa58d6bd55fdd07ca4e937d811d5e0ac41573456f4f1b776ec068c754d3b00a6c8d79e07d5ec76fe7de53c5ba144f8848bbc156cd6
-EBUILD tomli-1.2.1.ebuild 844 BLAKE2B f486473d5bfcaa1000f1aff7b82bca34a279c359b6ac7593c560b3f5e82ce8985746138d1fa0165ce2a9dee60eb9e48c8051b0f8dbada1a3eef4bd0b8edcf4ea SHA512 72ff51e0e217fba09c28cebec2e069b40b11f950858429919ae88765cea1c8ff19757949cc01ff181178be9f11b3421a44ab25674bdc1a1f9fda77b2a4b907fe
+EBUILD tomli-1.2.1.ebuild 904 BLAKE2B 6420df7ae50f1a42d7332c0037db6254af264b8e3e691ff7929b7c7aee0f4e48a39f7f72d822685c3fea4f21705586da8ee3fd6742a9b7c6aaf86ba664918c21 SHA512 b6a596eded3f4990389226beac44216025b2a9f4bec2e2dd149a232132ecd3dda808e3278d78ef7678aabef7bd024467bdabbe67e6d386fd894f7df364f8cf14
 MISC metadata.xml 339 BLAKE2B b08685e6617443fa9014550136bc6c5a94980e9c067c7a37a90b573d00621364d5484843fc5c5ad73c361807d59dd65c95893fa984be3fe6da9e630529afa3e4 SHA512 b20def328a2eda3374034e9c597a746e396d8cfee2b0915946c349dbf19174821362fd5e1e8722319d63677ed7a14441a0e1afb6fa1876d2040db823eefb09c2
diff --git a/dev-python/tomli/tomli-1.2.1.ebuild b/dev-python/tomli/tomli-1.2.1.ebuild
index f30a01a6ebcb..f682c45cb222 100644
--- a/dev-python/tomli/tomli-1.2.1.ebuild
+++ b/dev-python/tomli/tomli-1.2.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index 1fb4c316588f..50966618de55 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1,3 +1,5 @@
 DIST toposort-1.6.tar.gz 11690 BLAKE2B a9a57fd182a3324d43112c3f84a20039f032d99bf2c35c6678a6a08c23b123f18610f460529dd39c769b935d98270a25ded2f1a483e4e6f06d3ccc501b340cb8 SHA512 8dc30b5d5a6f476756520236bc93840243690779783ec8f0b5ef0f72c64d774177b25d10d2e024cda968f81352abbc4f89f3069760fc3a86bd5ee387e7951928
+DIST toposort-1.7.tar.gz 10671 BLAKE2B 89da22e803c334cec77d5ac8ad6a9ab8013f7516555c2822bd6d511edf28230c85c2eaeabad3dc4a24a58ae3ce3850d407ad957d0e28491574557140a286843a SHA512 a585d1c103b2162fa3f37f6b0ef60a8709f08d9543d7fab619af3718bf9f752a293e50061d370fd08872b2d8a8db504cb9d9c1cce5446885b46fe8e833813833
 EBUILD toposort-1.6.ebuild 413 BLAKE2B f9f0958847ba209b9d07593b17b8f0d802fb2c1d95da6bf3465b782015c8bcab0ec6bcb11f1397c844e941c3f8dc8d51b6929d1bf31de95655cbf7b66ed7ffbc SHA512 56af58526ebaed5cd44ee0e1cc50dd1e09df469699a2c0277d0bc328dc9a5caaf9fa71ba6dea7856f36e9cca09fb0f6027154d63134a0e170ed7ed9978c250b1
+EBUILD toposort-1.7.ebuild 521 BLAKE2B 4d6875baf0dc19305bab782173d709fb144efc181bacc452bb6ae45ae78513ba088e75e05a2854bce4089b0a16851b6c342a5edbbd96e30a7857294d708d18af SHA512 b0e5dd3058eaf010a22d2337ad1c9a9fc3169e1410e5e207e0511864524e3b07ea08387d8ed666f338be4eb6650b59275785f52b78ffe2bc594941fc7c8fbc71
 MISC metadata.xml 551 BLAKE2B a8d8483b1a725bfdbb0c5ed3688bcd15093f0a51fc56cf8cdf30a836c98818a5ca5e7732e8045bd9cba76dde69aa05f2be45f9765f48b2177e9e8aa67a726880 SHA512 f2b0b6fb5f95c0f946149c1d959affa926452acfc21e46dda6f34448c8799df4fb8ddefc3856cb09420bed26f41c945ff309514bdc3fe87c77465784f3c57cf5
diff --git a/dev-python/toposort/toposort-1.7.ebuild b/dev-python/toposort/toposort-1.7.ebuild
new file mode 100644
index 000000000000..3002de7baf9a
--- /dev/null
+++ b/dev-python/toposort/toposort-1.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements a topological sort algorithm"
+HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" test/test_toposort.py || die
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 5d1969b5213c..d8600b9f64af 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,7 +1,5 @@
-DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
 DIST tqdm-4.62.2.tar.gz 169564 BLAKE2B fd3484db22eda5db7431fc337e23cfcf44882efc56c8b10208d799c156fefb5aa70c69c7063315d86d3ff881b97b62ac0b5c8be73ad3546ad0728f3f544cadfa SHA512 a59a041fa239e215e541f07c66292c27bfe067f3f2eac2916662b4ef1faa630346dec9558a7f66a3456b3d2ddcd164f9381cb89e5ac8350d0295367bfc248a8c
 DIST tqdm-4.62.3.tar.gz 167952 BLAKE2B d5732fc97256e1fc4f55bd1a0f69f98a87e7132cc1d8484baa12b7615da5a95ce20268515539c595c2b2aaf20f9a9434c17d581b3b90ea3cad3515150e469471 SHA512 1083ca2080163c98bbb55e124ce9d47c790e47c83cd8dad60e4c93773d1d97a50aacb5a25ddb8a2ae3691738e4f4942c88d55dab406c3e810cac18b8929d20ee
-EBUILD tqdm-4.62.0.ebuild 1162 BLAKE2B 1c239c6f6202c694f1acbda28820226d91f9905c055ca5639f3f896293078271ba79acf3e10dd5b8e4dcf9a6abd20bfc5a7bf2bb3c171122d724866d27e6f7ba SHA512 10d7735f0c6a7f22caaf0f59bb915b4bb0ce0a04531f15850316dbb5a4ff17aa614b0b37934324c2f7f3dc9e530a79dc6ef2d2a657c5888155da1fd2b9b54f85
-EBUILD tqdm-4.62.2.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
+EBUILD tqdm-4.62.2.ebuild 1162 BLAKE2B 1c239c6f6202c694f1acbda28820226d91f9905c055ca5639f3f896293078271ba79acf3e10dd5b8e4dcf9a6abd20bfc5a7bf2bb3c171122d724866d27e6f7ba SHA512 10d7735f0c6a7f22caaf0f59bb915b4bb0ce0a04531f15850316dbb5a4ff17aa614b0b37934324c2f7f3dc9e530a79dc6ef2d2a657c5888155da1fd2b9b54f85
 EBUILD tqdm-4.62.3.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.62.0.ebuild b/dev-python/tqdm/tqdm-4.62.0.ebuild
deleted file mode 100644
index dd8d2f22d61c..000000000000
--- a/dev-python/tqdm/tqdm-4.62.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=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	epytest --ignore 'tests/tests_perf.py'
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.62.2.ebuild b/dev-python/tqdm/tqdm-4.62.2.ebuild
index be993f734871..dd8d2f22d61c 100644
--- a/dev-python/tqdm/tqdm-4.62.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.62.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 6662687131f8..c20d6406e1de 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -5,5 +5,5 @@ DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff83
 DIST traitlets-5.1.0.tar.gz 135161 BLAKE2B adb948cd07a961196c3b02cd28c7dac274ba9152ddae0fab1d706d78643ff1f60e4478731d960e583eb6ad5088b2730efa31c6b3a806497ac5c8aa7b05e51502 SHA512 2b7aa7db355ddb5fa5dcdc091324b933cf7f8b189c033d43408af1bcda40cb242cd787f82098e042f1c65f07bf94b89d7d9f10019374388c47390565e7e3a467
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
 EBUILD traitlets-5.0.5.ebuild 679 BLAKE2B 443af87c2d14ca5fc2c0169a91c2a76dc6157b4daf7bae0723b88a8d2404d1f46babaa6887687b5918272081c4032ccdd5c525c09ec3856eb2df9d5c82bc14fb SHA512 c9f2b48c195c833e61c2f9d3ea99fe5b2be2c887750bde3c2378f37d8e7d0783573646e673763c0985ad299bbde1a3bcf065aab7bcb16918887281fc12fe21b1
-EBUILD traitlets-5.1.0.ebuild 623 BLAKE2B 0c473171611610848e537f46571d9f8686705dee9b7d0a16cfdba8abfcd0737bf0fc154057ec1ab39b8e7c8f68c201a8193444e4f005c1233332b8418e1ec7fe SHA512 4a0a78342381e7af1ee225167a48168a912b813b1827b89f19531a11f610e68ed8ebd312ceafcb6dab229b1254f57b30be55d324a0630368f538fb9a0bf80671
+EBUILD traitlets-5.1.0.ebuild 622 BLAKE2B ab5eba327954713550a1ffd4c625c7d2b59094075d70a8d2cd95df6c3feb1338027fb8da5bc257ddbdb5f5e9230a894861da610bc888fff50612a63e5bb8bcf1 SHA512 d5551fe0e6edfc8394af6eed663cae10416314931ee147bad69319a0f52b57cbdc7f70cb606fa3bc9e67736b58fa384141639d52949235da4fbc659ff53af9c5
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-5.1.0.ebuild b/dev-python/traitlets/traitlets-5.1.0.ebuild
index 272d716645e1..9d6273167a44 100644
--- a/dev-python/traitlets/traitlets-5.1.0.ebuild
+++ b/dev-python/traitlets/traitlets-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-py310.patch"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 7fcb620b047b..4aa64fb0639b 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,4 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-3.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
-DIST translate-3.4.0.gh.tar.gz 1147056 BLAKE2B 94b0b4f6d12f4ecdb210338a814e9f4bf7b7f5d31c992f03d581e8ec0ece849eb3e74c41396c29a1c756f0aed286d073e5bbea8ca4e7f74987bf61d6e3ebe24a SHA512 04694b3c277cb63e405a00c5c8c13ec63f232c641c7987e5e2304f30af05fb912ca7339fb42c1fea29c0906e75975b66261474e7fed16a1e47ba0b4265cbfeef
 DIST translate-3.4.1.gh.tar.gz 1147673 BLAKE2B 3a29b06f944752e9edb30c9b3efd681d7cd7f75fc9a320a3a8d9e74d497e43f1a1a4e18649174e4b28f1a3b2223d735ba411d32736b1fea36237ba95f8021217 SHA512 e2ff9b2c5de58c15ef7b11f1339be7b36ffda3368b91aa647585c9dc0f4c9f1c1ffac9165e0e963cb3c10fdf6ce037ed99d82b6156e7c104b4216c8d46dd709e
-EBUILD translate-toolkit-3.3.6.ebuild 2466 BLAKE2B 045ef0a99924176b23591574e9b23d226fbc593c01c5878537f64797e8cf68efb6748d00e4a4b72e1e79a142ae15c1b5d4a91eb163409330a047bcd09d87707c SHA512 3a5099f26e850b7da77dcecac1e41e13d4695cff3a2d8ca94785400635a1e79b13dc0d91c28f5144649faca8ebbbc70130623fa7e873d81112ac0d8ef7b3a393
-EBUILD translate-toolkit-3.4.0.ebuild 2510 BLAKE2B c3acc1248ed06cd0898e7af6ea1b4655b6c4a843b602cd96a7687aea44efbcddd98e231f50070a2a76faa09de76c2268185a6f5dd209c4e9a4eec9918b583cea SHA512 29e110afc60268334432ab3f90881438375475df7968936d2ef481c4c4088d6566f712c3953f68b29da5b9221070ad274893a46f0c854f3001e88894b4e4d66c
-EBUILD translate-toolkit-3.4.1.ebuild 2511 BLAKE2B 6bb1893bfde3e9beb3a4895f185c23c37298e06355694ff6bb37164ff2dd8ba3526c17a92982b3b1f88881f9f3630436b18e570da5295ae7f6ecf6453d9cd814 SHA512 698758ba4ebbe0d5f1eba8c4df65e21d41191ee7bf75fa3d1d1318d036bf785a9cdb15f1a454285b4dd7d3d79bccaea0bc0d57a16ceacc9b596bdbf381599d79
+EBUILD translate-toolkit-3.4.1.ebuild 2508 BLAKE2B 94484792689ffc6a1e1caa613e3cd9b4a54c3ee50e9646bf7751ef241ece1aee0882ed392d242c2f280f5fe951d187fe2875da1fc8185101c9caec6bce6f43c0 SHA512 af4cf76d013e186be0380e601ef2846e9159ce8159f5b22ee04945b546f3699bfcffdeef9cdffdd6c3e87c107a5bab80d44f334e5fe4468235d66c1faa00629a
 MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
deleted file mode 100644
index 56cface0ebea..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="
-	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest "${deselect[@]}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
deleted file mode 100644
index 44ac05997215..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="
-	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.4.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.4.1.ebuild
index 55a7a7c173e6..e7bab6c74082 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.4.1.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.4.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
index 964812aadce6..cb20a45650f7 100644
--- a/dev-python/u-msgpack-python/Manifest
+++ b/dev-python/u-msgpack-python/Manifest
@@ -1,3 +1,3 @@
 DIST u-msgpack-python-2.7.1.tar.gz 20631 BLAKE2B 10008f0653f969f1f5655c894be5b2497d692bf7ebf6d50de221695cab9c3a973c0870a8162efe6b61f2d9d4fb062c4130c07cddff8d64d6258d7d832efe4021 SHA512 0825b9edee28db2c954c9c0d64987a4640f11af52570c1ad834882a5fcd2e3a76eab3524cc3bb639cacfaf9eef27bf0a75656b4d02bca42b2d35b708348691d6
-EBUILD u-msgpack-python-2.7.1.ebuild 566 BLAKE2B 4046d41b4ebb56d9329901f85985e4b46374700106e71844600040350fc09885eba4f4995d61b8b7260fac3280fffb57dd8d4f873b5488ed231914ac6a4ecc75 SHA512 632ca0b9433d4f2f2dffe0472783f771300699ea3cda1bca3622ce6410d81da7a10e6f11c45f2c2ee6a84a6c181bcdb26d1ea2a79048175d085889be2c7eaecc
+EBUILD u-msgpack-python-2.7.1.ebuild 572 BLAKE2B a375e61f7ca33ccb4e0eba45b5c4ce08e3245f42f6d1148cf899ff9ac2c49288fc265674b07d275942b2ec86f3328e61f8b929100722cee9a0b480806c1ba9d3 SHA512 25783f5eb681258041d99e1701a55f27f12d592011b2b3fa22a6072db6ea919979cb4d687d9e6a6a57d5144bcfdfd5d9ffdd6fbc0d74805b25d09965d26eff42
 MISC metadata.xml 932 BLAKE2B 6c35c0276d1f132074198ec85c5b80967dda5eceef914b3e8c444c50926a83638a97754a483fbadd6246931af2eaf5de86c97d48ce6346da55dce1e577ea47eb SHA512 cdc35e790e2c454af8e82456fa438bfbe0c9e569001bd94d416b48d37f6ca8e78540fb76ad37c72c1cd632eff2f66d782e28265c5825f94f989786cebba59e67
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
index fbfbaed0935d..0d5f2a774b84 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
@@ -12,6 +12,6 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 50cff9bea8b1..26e4d368e096 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -2,6 +2,6 @@ DIST ujson-4.0.2.tar.gz 7129106 BLAKE2B 8ebf68c6bac65100baeee4f95f175ada09ba48b9
 DIST ujson-4.1.0.tar.gz 7129002 BLAKE2B 0a9b8d90ca977b3abf7a3dbcb42fc40d9b6faa120ea59aac2aacb83faadf36cb3c0ca1073579f6bc5f94c6bd45550d82e55e1859b0afc7b3bed511e63626703f SHA512 b3661c23fcdad2dbbac1d92b319f85ad3b7b575c1e773f5207cc83811974ed8de0e9780acb50986fcdea1c4237d5ded8d10a9bb641468b198824f5da15b8ae0e
 DIST ujson-4.2.0.tar.gz 7129419 BLAKE2B 478ff6a3de9603478e9b747935ebc966f980dc832252974dda444b2ccb53878b3565ebdf7e8c223c687304d5f95607027d0652956d1f804cf2d80df6ce19be1a SHA512 894316eeeafe80eb3328958f4336c1989c9591caf84de5a9442f9d028c85f67d08e7c295e74f5828abc93ad56ffa2d12b98ebe0ecf4bca27ae37642fbffe47e4
 EBUILD ujson-4.0.2.ebuild 544 BLAKE2B 0c38370f6a502b4b0649af5950768ecb08e52e499fe6b10ef9250d8e2e7b5d9151d3a6b8847c29ecd606fa2877ddf2b3f89992c4aa1ecd268b98bfde81028e88 SHA512 eb9851665382569b44ab5d4bd156b0b4b3751254670282f436f24d524d476e0f49e975357c4e5e15fd49134e2f4871ab68f554ffb45ca6af807102a4f862ffe3
-EBUILD ujson-4.1.0.ebuild 546 BLAKE2B 5915c5336df15af74275a32c137f2e57a89da5aa27150cfff4558cdc80150b611de42692ae5eb4ec012eb45bf9d52452b4b80473e922e57404601a6eac042cb0 SHA512 c151da103220e121531a4767ac66321c5d590c95d15ff0ce23a25f8123ad3933416ba569df854b5c327cd429d6b3b31d44af3c50ea2bdc75625e0416436e9a4c
+EBUILD ujson-4.1.0.ebuild 545 BLAKE2B 45ae9d804e9b469cf22c911e47b809f2084aae6968dd46471bb34aa7589b01711b6f83198d6fef4dd19c3be9e9f7da661bd4ed67480735d9acf8bde1985b23c2 SHA512 5c7c5bd49359b956eb4fb76a570b1eab593b66feb859c7a0dd2ffcacd8187c69b8910f4ed46db9bb67ae3c8ac1a972c5313898f412163b6442c0cf3f493e74b4
 EBUILD ujson-4.2.0.ebuild 548 BLAKE2B f91faf68acbc52928662d50da4f8946b7f96329c8714bcc860598c3099947e522395df8b262d9bfec2c3cfca05ae30c2f7068d97a2839b26ad619d72714d9c1c SHA512 ec30ca17e5252073e8374822a4df054d424859f12386a8db02e2d1802a7dd3b726b3da2d7a438f5945b7e8dd08da6aa7da842e9e1567bbc3606f352857710b8d
 MISC metadata.xml 433 BLAKE2B a29140bfbdfd1e2050148c8e7dd901d5e5abd06ed8ad82d47f898ef76f315ed54f48420c860536be70446e5418e424760e8270889690554376bfc3e19f1874f8 SHA512 431436a7aa950d3786d69462d540a7c2486a83e1da4f87c6c71ef1cf73ab2b079f06df0ac4538c2bbe4b56cac1f4b7499fed270b5c0c940ee7fd8bb377324288
diff --git a/dev-python/ujson/ujson-4.1.0.ebuild b/dev-python/ujson/ujson-4.1.0.ebuild
index 5573925c5eb8..630cfd49d413 100644
--- a/dev-python/ujson/ujson-4.1.0.ebuild
+++ b/dev-python/ujson/ujson-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index dec4bc62890d..12fb38e321f3 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -5,5 +5,5 @@ DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb
 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 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
-EBUILD uvloop-0.16.0.ebuild 1415 BLAKE2B ee8572ccd738b73253be93d0b440fb8d2c99a502fbd6c66a5ffa15e9fcd44d469fffc90742bbee4702dbf47a056d457d3f29cd8944e73e47734c2f7d12668035 SHA512 d67943ef019f211c6974aa63ea8cb29cb5b211bc3264c769031477f1484ae7676da85a89e6e0746e1c08b6e027a7cd0f6ef622d692b9ccb5a39f391b09fdedce
+EBUILD uvloop-0.16.0.ebuild 1425 BLAKE2B a68a3b809d65174c8047eb7242de2962ef98f16b7164b6c7931ca8ed60c84d9c1f588b0da0f38afe166b3ca35bc20637c3cdcd80722df6c877e818b6af3ecc30 SHA512 bd67e3e5a2610145f631977b204a8c454d9360fa50ef7f8ce1ca9d42ee8ab98af0d2e7a02bc493e823c6d55e18bb5ddd03b68d5f7ac5f4866a23a719e58a63a1
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
index ba76221f9f05..3147c753015b 100644
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -18,7 +18,7 @@ IUSE="doc examples"
 RDEPEND=">=dev-libs/libuv-1.11.0:="
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
 	doc? (
 		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 32b2c50160ce..c8cb224562de 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1453 BLAKE2B 57c78b7c380d3d4b3d232a09cc856547fcb3d5fe7c2dc6c103de91ea852c4f639785063be96ed11e967d510981e2bf19981f34d58a4f0695448fb2d8966945fb SHA512 cb794b9e1f28895294f103bc274340d49e8f7f33d8e45d7f8e47fb4757ada8931763d41e429313f13fc71be09c91c616ddef37ecf17c9acde11e645a6b1b89eb
-MISC metadata.xml 378 BLAKE2B d94a7471d130aefe6be2c2299319f9a5fd57cc129c7b2f3889ab4a864178b181b6444f2730d29bddf2a2ddc6f15236064e880b18ac647a1286420a965743dc84 SHA512 9774428122870650957af369e917433f3b4034a82f8051aa17cc4833a573940be5351ee5e8ad92fcb27df749cd2ab575677d872b1f0523ddf3392fc3045e58ac
+EBUILD vcstools-0.1.42.ebuild 1248 BLAKE2B b5451e3f6de775e826546b2ef23ed3c837599ffb485ee1bbf81e4714b315fcbae86c37368580feb35990b5806aacf9aa2fa0ddfb260a406245d17b9da9d9568c SHA512 2996c36fd3f6a61f138d8c4ae66650e379a9be383c101db6324434de4d3b440c2425676d10c8dc64d2c4d7eb12ba42adf2877de5bc7df8a4f4f36abcdd16de70
+MISC metadata.xml 402 BLAKE2B 4396bf3f04fde671260984d3d11d08891325305a4a83b3fa1a99775227de87eeb5c4a40e9e82b993f7546a65fcd5230408d6db6e317265f5c660511813e473bc SHA512 80ba7bb0fbb262d518711f23f03088871e04fc08769cb476c72681f8778f1306857217b3360b49df2524faa4a97dc4f9dab5edb6f95c9479ff02ca52b67f788f
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index c100430dcab9..4a8bec5b97bd 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ros@gentoo.org</email>
 		<name>Gentoo ROS Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">vcstools/vcstools</remote-id>
 		<remote-id type="pypi">vcstools</remote-id>
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 080412941179..beea876d5506 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -2,58 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit ${SCM} distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Python library for interacting with various VCS systems"
 HOMEPAGE="https://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
+SRC_URI="
+	http://download.ros.org/downloads/${PN}/${P}.tar.gz
+	https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 BDEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-vcs/git
-		dev-vcs/bzr
 		dev-vcs/mercurial
 		dev-vcs/subversion
 	)
 "
+
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
-python_test() {
+distutils_enable_tests nose
+
+src_prepare() {
+	# Those fail because of broken upstream testing
+	rm test/test_bzr.py || die
+	sed -e 's/test_checkout_timeout/_&/' -i test/test_git.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
 	# From travis.yml
 	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
+	git config --global user.email "foo@example.com" || die
+	git config --global user.name "Foo Bar" || die
 	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	#git config --global user.email "you@example.com"
-	#git config --global user.name "Your Name"
+	cat > ~/.hgrc <<- EOF || die
+		[ui]
+		username = Your Name <your@mail.com>
+	EOF
 
-	nosetests --with-coverage --cover-package vcstools || die
+	distutils-r1_src_test
 }
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 0287b3e22fb1..56169d34c024 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -6,5 +6,5 @@ DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2
 EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
 EBUILD watchdog-2.1.2.ebuild 1105 BLAKE2B 1761e1cf618be7b611c7483a13a3fc399b0164f064a138361bc4226ac2a7d329dd48aee62afaa4e57776f146c78a8ff960b556ceee0e42a1fb0791e2bf33f6a3 SHA512 98532227f30ee84a91005b303e959cd720aa2cfa508d7c7392a969482e7d1b4917b846a0f358a5f3103a0e937a224d0d2d2e1562aa5f2d249b72806ec9942d42
 EBUILD watchdog-2.1.4.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff
-EBUILD watchdog-2.1.5.ebuild 1058 BLAKE2B ec5fd44a03155d510f27e5eeee22370b7f4480f1ea703f2bc69289c80f3cd731d540aff6c232a1fb84b0fac8e881cdcec1c258276aab9023ad33e436f22e26a3 SHA512 8ea9694948cfb7a21cc2a8baf2814e94eee2cf06733b7d756ea615e0450d094237af2825e67d3d4fa2502aa08dfd88c7fdb70abfa5575b2fd1dbb00f555ea1b1
+EBUILD watchdog-2.1.5.ebuild 1053 BLAKE2B a7ed523caeb5253b9e8ba12f648601b68e568adfce137e4bf2b53c1b5b214730afcf6b07460e197bf7f2f9c6463fd24b3531efafbc98b122131047d461388e53 SHA512 0f654bfb015629ef6d7e1dafe2f55d886234d7d67f62d39141c779fb02f73ec6f89f31ca3c8e6fc485caa7f8d40ae0b43cc16289e98046827b945c1a45c33a63
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
index 86a4a9f86396..19dab80e9b44 100644
--- a/dev-python/watchdog/watchdog-2.1.5.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index b1df48d348b4..e7d1940ff29b 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 700 BLAKE2B 16c4d8148f7d4ff1ca45b578fdf6f3107284522c910f316663dc3ebffdceaf060b200a9867b1bfe87b484d146843be45fb8185c72832e9c10eede3a45e94984b SHA512 3d4e0e14518c426658b1fabf2d3a450dfca32c78d9600c85c37f5dafea2c32f4b5468d133c70ffa8bf77e0d27327e22cbc894ce8f4bb034b275dbb1766bc95a8
+EBUILD webencodings-0.5.1-r1.ebuild 706 BLAKE2B a1d6ea7473dd6ac90dd096517f665bbb6f4f2e1b6aa8daeb14bf3637d74dd985cc342205d7a29f95d529f00b4d580da27897af2a01bbd24176e297a303a46895 SHA512 ec1f8d4665ac3f9ab9aa23fd11a02262cc3e8fd7458916396112437f4263ffe1b56c577f949e641ddcca79b725e8b70519955c4dd0eb0670566dc2800c71230e
 MISC metadata.xml 602 BLAKE2B 6058f9648b5985ad53a8b14e9f0c961e2ab5b5b1903b17b9a56e18b603a09a92d30ae4757b899197c772b5c9e705bb310b44dce679ec9e0e580f8bea9b069260 SHA512 542a5b4a9daceaae9c5ec6df1ffeb9fd84f1e2c32a1d8d8a61ba65a05a2efd59a26bf9fc96a469072d90d128909ce6668e16d6dcec96096e604f129879cfe76d
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 58c3d8d1c778..58cd89f1f9c9 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index b89c78ea1fb8..d59d6a14c116 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4-r1.ebuild 938 BLAKE2B 2ff3e0d3b3a1ca02e06308cc5c2fe4de859f255389b610786f1c98e726d1759f54a41a578c3c44693abe41cf13a3851dc4b5266925da947262c04373f817b0a0 SHA512 f4f5edfd91ad9cf49576ceaad32b0c7249404831446570aec9579ba8dca805e4f0660cb09d1154a7b4053efec82338fae70a4fe3acbf12db30ec086c2aacc7cf
+EBUILD whoosh-2.7.4-r1.ebuild 944 BLAKE2B 3030574817d750c4aad5c6cd4b2459b4a6507aafcab6eea99353f7f87150ea965230c9740cdd1977d732324c58bd15cde66136a5a8cfcc90e8bfbebfe8d44b82 SHA512 ca6bbf33e15853fed1b9780067bb5d7459c8e4a8b50988178d27dc7d8b99e39060c0be3847ee68cae27f74bff746d2c35f900c377d3e880832005154b409f17c
 MISC metadata.xml 761 BLAKE2B 5d3afd52974b702eb26f977f515504376f882070bf446569394569c7a08729d360d0a36ec6be4105388efdc573ed0149c04c6663df4370230b03652ac8cf57c4 SHA512 40e03c23018f70b331f168e19b78b54f1ad74b516227c2d4a8274dbd6b9fb058bd073a041d897253838c8f8ff9bfcfaeb1f6dd5312c4c4d6592acfbca4099fe9
diff --git a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
index 5ae27273496b..527817542918 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 2c5876658398..43af1a506263 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 DIST xmlschema-1.7.1.tar.gz 372165 BLAKE2B a534c42d5405eefdfd0c595f1ea02a703c8f5a225f9a46ea4fe9885d09de4b87bc5ddb470fabaf3e01093012346247d34fd56495641815fe04f4fa1919f9f53f SHA512 4ad8ef9d91aa2e0b06d64aa06cc380898976c8c1b4efe049b67948b4534bb8edc3a3450cf5e242a004a039e8e29b23954138a0192ac6355fdeecb77e6284c3d9
+DIST xmlschema-1.8.0.tar.gz 379305 BLAKE2B dcc3fc5860dede681912f578b548bfe39feb5fda3dd7c5f0ed7f85fce247489d492b062b789acce6679cab835b31c1f77eb82ae43b83c5af5b749a4e93c991d1 SHA512 b4622030e959383729074554e80606dce6e731b9c4e3393c60a02d592acf66f07e50f12d65867fad31e18494e04a8bb1bdadcf22f110d91708e8a0fa89848e2e
 EBUILD xmlschema-1.7.0.ebuild 785 BLAKE2B 7aa3e9128a4b1d03602515a04dffc8d9e8e83c9a32733668bf4c42c921b23ec4bc8dc97e8ffb10e3377b79319e0929945ae8b5d3536ffa92da558413d8c319bf SHA512 2381069dbc8c3ff7c9a7a1c1ca50e1ead544ee8a81eb9bdff9869da3021420da50cb2cca72266142ee4f7a629f7090fd05e2347aa570dedaa08f302cb5cae796
 EBUILD xmlschema-1.7.1.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
+EBUILD xmlschema-1.8.0.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.8.0.ebuild b/dev-python/xmlschema/xmlschema-1.8.0.ebuild
new file mode 100644
index 000000000000..19b2c2736c27
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.8.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 ~m68k ~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/zipp/Manifest b/dev-python/zipp/Manifest
index 568ef1ecdaab..9952869bea07 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,7 @@
 DIST zipp-3.5.0.tar.gz 13270 BLAKE2B ba3b6f82ed0f1a902050ee8a89b6876a839d180dc048dd19cd31ddbaf89ec0494b9444f2ac082ed347e3183ccaf2e8342748737c2a29e1a2bbc492a0bc34767c SHA512 676d7e9a7fde386b57a213975121aba015461453f0809a97d39d030b06918a4c54ba1cad21877ddf007560941ae285883098d81d5e6f17eb4636379345b4513d
+DIST zipp-3.5.1.tar.gz 13005 BLAKE2B fe50ce8467dcb62a3685a56d3feab0b227832320f4d97ba7eb12a07a66065c1acee8ecb391812e2c772e7c55bbd4966743891f9fd80adf1138b289ed0bc06cd6 SHA512 7043d491a7f5588416973c4ea9d1fb5e47ee7febe423d01ee131662867ed1d616e2df4d2c87ad327ff1b8b297a8b10c6584cfce5de27d09a81d7a7ce4fcc4815
+DIST zipp-3.6.0.tar.gz 13047 BLAKE2B 2e3f5fd0acf9f931f5a74957e9ae29f12a42bc824eb36d769720282ec0413d90b0b45f0524f3b319ce614f43c061ae324fb29f7f2a83e7aeb393283827bca5d1 SHA512 8e21b0a757ed9ebddeca43d3e4b64549dc4e59f781704626b0b2b0a117752b84798a0484cceedd4684ee0459643df4d0f479e64a143c8d9337d2b66951a7b227
 EBUILD zipp-3.5.0.ebuild 1171 BLAKE2B f2c342697838816f4cf123b4c70fd3efde81224ea68b805f0982098ea67d5b7a4c65fa3fab0b16a9793bae3d874a778c4c21d3d3b3317c45bc64d66359e9119c SHA512 25cb668ae1061224a1b4e619c7467cbea67268f4f514e2cf37123dabec733ea5e8bba8b9e442fe6203bc7838256647077fa9606cb0c42e353bac2320a9d94b6d
+EBUILD zipp-3.5.1.ebuild 1165 BLAKE2B fa429305db0085ad1ab8ea82aba683edd5f1946298a6c3de23a1e4a5dd6f92fcbddcbfd87a2fb1b41b7f1a791ab68658cd7fea3264653367f5885a1bdb9eb790 SHA512 9fcd9bf08b339069773ddfb758d3e71863bd686647740888c26ee7912228490e6854b86818f59779c8f7df509fc44d09d1a320d7ace8c85e3f3adc90ea4a2407
+EBUILD zipp-3.6.0.ebuild 1165 BLAKE2B fa429305db0085ad1ab8ea82aba683edd5f1946298a6c3de23a1e4a5dd6f92fcbddcbfd87a2fb1b41b7f1a791ab68658cd7fea3264653367f5885a1bdb9eb790 SHA512 9fcd9bf08b339069773ddfb758d3e71863bd686647740888c26ee7912228490e6854b86818f59779c8f7df509fc44d09d1a320d7ace8c85e3f3adc90ea4a2407
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.5.1.ebuild b/dev-python/zipp/zipp-3.5.1.ebuild
new file mode 100644
index 000000000000..bef59282ca20
--- /dev/null
+++ b/dev-python/zipp/zipp-3.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# speed tests are flaky by design
+	test_zipp.py::TestPath::test_implied_dirs_performance
+)
+
+EPYTEST_IGNORE=(
+	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+	# by ensuring only zipp from ${BUILD_DIR} is loaded
+	zipp.py
+)
+
+python_prepare_all() {
+	# dep of disabled test
+	sed -i -e '/func_timeout/d' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/zipp/zipp-3.6.0.ebuild b/dev-python/zipp/zipp-3.6.0.ebuild
new file mode 100644
index 000000000000..bef59282ca20
--- /dev/null
+++ b/dev-python/zipp/zipp-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# speed tests are flaky by design
+	test_zipp.py::TestPath::test_implied_dirs_performance
+)
+
+EPYTEST_IGNORE=(
+	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+	# by ensuring only zipp from ${BUILD_DIR} is loaded
+	zipp.py
+)
+
+python_prepare_all() {
+	# dep of disabled test
+	sed -i -e '/func_timeout/d' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4d52d20cd74c..b06785a11edc 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 0fe7549938e0..e6b5e353c447 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD assistant-5.15.2-r11.ebuild 1272 BLAKE2B 64c892c98b9d05bbd7139af89b3d3ef6e8650088389e15502aa31fcde47ea76a5ca74e2b2db8852e6200ccda108869b2bc78e8bbb2c5c5b227c1a944d0748f4e SHA512 2dc25e1a2e8fc76ce1b7cdb2f9b20d8fa430dfa225bea37a0979a9d12efb157d8d7390447f00edb623fecac73827cdb3a62c0331f5decaeb2c809814531826d7
+EBUILD assistant-5.15.2-r11.ebuild 1269 BLAKE2B ef32a30011891811c4dc896d917759a3dc01c992175cdda3413aa66cd55808596b19d7c553377a25988a25f416fa0b04e865f116992b104170badc3f0df8eb79 SHA512 f592f2790cee0b0dccbbd555e7a24234f9f94f3ee4e819eb906b5751adafb6f10c3e49f7ea1595338e756f56aed48cf6c14f93fecf53081f6879f35849eada18
 EBUILD assistant-5.15.2.ebuild 1172 BLAKE2B 279c9a3c861bae74c79d52a8549b06167a7ca4adc3e4da5b2de0eada3414702adf36f0055790221e3cf725e9dcd1a959a6a507dbb823ddef061c7ffaff34ff8c SHA512 65a1a15cc074952f79a15adf8f57dca1283d246c34367e467e591af4c3ae3284539592efcf10edbf035bf8e450688205d5c3ab9ce3c909c60e7b83f0691ea067
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.2-r11.ebuild b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
index 1a3425517931..7f52c026f468 100644
--- a/dev-qt/assistant/assistant-5.15.2-r11.ebuild
+++ b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 0f1b5551b5a4..31695defecf4 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD designer-5.15.2-r11.ebuild 1328 BLAKE2B bed1aeacca8f6c6bfd0b836f8cc8ce659f7293566a308f79cbce8b128acaed60958563c0c8b0cf100fc7b2f81db6d0069f8ff63f449e93c2e0b458c71c8b7b37 SHA512 9b6a83d8eb29090c39448cb8ac9d9bafb3360a314cbbeb8172590f7dd0239dc7af26792678f77a24295da2f189c452e8dd23766a42890e1e3fbe2fa20109b4bb
+EBUILD designer-5.15.2-r11.ebuild 1324 BLAKE2B a9e5c78b5689b1f129a627d14f84a4e0a71e9e2ba18dca32cf95964ce220f219522909387f311a92b82c02749243daacef3e585e29305b8105d7de895657570f SHA512 d9fb5b0025c455141c44ae3740b14b0474c74777db81e715cffe0446cf7264b84fd4f346a26223faabf155c2e521ea48bec717c9f82335ac78869b07b61dabf9
 EBUILD designer-5.15.2.ebuild 1207 BLAKE2B 164db9e578cf8ec76a9b319c0a40abf63dc318e9f8b697920f2123cc10ab07b2fdd85245fff218a09e70f9e69726c29f1c2e7327c59a040639845f5df9580895 SHA512 89f7f89384daf7d88afdea95ce93552f3430f79f75bfcc4b233c20cf700c2c1db25fedd722183eb13e80fdcbc04dddcdeea999a8cc6524259f8d10ace7fd952e
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.2-r11.ebuild b/dev-qt/designer/designer-5.15.2-r11.ebuild
index c439cffb179c..b6d8f4d22af1 100644
--- a/dev-qt/designer/designer-5.15.2-r11.ebuild
+++ b/dev-qt/designer/designer-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 1cf8b032dc9f..cdda59cbc0b7 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-tools-5.15.2-r10.ebuild 767 BLAKE2B fab57351b5130bdd36088a879647bac6150d1dd1bc89395f0854bb14ce2f4f3d4aa1412b38838f251dd5ea93b2ea86a408e4bbcbda07fc3073040cd9a387ffc9 SHA512 5e37201d3c16a1f498c529e52f684e62ea8710774b8cb92b71abed55c13fefc6b5c7cc4a792f62c07d07ee4d3afa31b92c26d28ad54aeb20e74bb0b23b0a80dc
+EBUILD linguist-tools-5.15.2-r10.ebuild 763 BLAKE2B 12ed0c804c055985d923f87564fc85747051cd85e3b04be62af7e58766aaf6defc339b277fa81ffcd5494f36a1d2464c19696f78435adc6bef0a712d5dbb2a3d SHA512 58b8b8298280bb3ac50692a1631c85d7f8f1990bf755cf34c2d06c96f1b3022ec83811d1306058bc36bdb934062a8ac346359b71d3062dd2d53b79125acbd288
 EBUILD linguist-tools-5.15.2.ebuild 1022 BLAKE2B ceaefee8134e4ec654d8eaf3dde8ae085332b72a4e6efc61e31e71cbb3ab1bd593bb286beab9bb444329bd1c2bdc09c282dbe15fde7ca5fb1552e42f7771140c SHA512 597c04f3ebc80a32a601beeb9a760b0dfb1cced4fa5e74f0fd4687b775196fde21a26ed42182ce4b1ea3c409503de674dcec60142ce39ed09db522cdef4e2a7e
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
index d9508fdf3bab..639bf1ae2cad 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 0579eb39797d..35c3f57b6d9f 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-5.15.2-r11.ebuild 1073 BLAKE2B f48c0e3f513626923eac206ac01a046b0462962d7934c32bd535b16532d3afe02165cc8d6f0760961cdea5cd8ab2f3727cc7daf11cfcd2040eef4a6a28c2f5bc SHA512 0b6157cea4bea4ca85429f39f8a86b9139014d450ad850356f066777c3e72cfebc3bb036d148f49c310c3088546ee027830a3f62dcfac70681e140d526719ebb
+EBUILD linguist-5.15.2-r11.ebuild 1070 BLAKE2B 6d9ed2aab0e45b4adfa776de921e87caf616ba38ee3d0602e12fddcf47074a0dec2bd97e3d8c51275171a5ad1bab97de56b1ea302c3783a497c7806a57bda646 SHA512 3acc87a9c1ff8c0e5367b39784b9721348c0bb4df53ca8e6eecec109f5b75d8d494ed4ceef1d1636683dfc7b176ba77ffc7c1ca2ec3ab11f5d9b06844cc6af26
 EBUILD linguist-5.15.2.ebuild 978 BLAKE2B 9a0597ccbbe503e80793cb39ea06f12f98f9ea30119eefc569f01cc7540eec38c7088230133ea44792e34b66c60c71f1a26afe3ae2ad33e7c726127fa5c3ce0a SHA512 3cdb00dd950edc643b8c60d7f33600e76c059e36b7bad8c549f08ab504bdba58641ab9ec81e7b4d084ddccc71593ef984716e52a63a9a84f98692696b7304306
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.2-r11.ebuild b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
index d381188a7d98..adbeaf678947 100644
--- a/dev-qt/linguist/linguist-5.15.2-r11.ebuild
+++ b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index dcc727653ff8..f5c8691b4934 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD pixeltool-5.15.2-r11.ebuild 521 BLAKE2B 1ae558bdfb008cd3f1894edc2b3a9e30845d058bb9315601ed381c886e13fad5d04419cf4c80a50b5fa544c1bac06480fcc3b06d6dcdd58e592de992c46a75eb SHA512 bab8a80a97fa60b36cb2909c11fffc8f1ad526518dd81a7063c43de9eec7ba1afa35afe554349ec46c2a8eb423116fcd339107cfcca7fb0bd4495f02281a832b
+EBUILD pixeltool-5.15.2-r11.ebuild 518 BLAKE2B 2f0e3ffc946464b8d05f9226c0997e54d7d425a70276e60e76aa79e66f6d0bccbf4a648042335854d7950c5d7e71bb2275a189173d42198bbaa9363e0e676a58 SHA512 ea6618607cad3523e3b113e6b9d647fa628a6b989f43c48b75b6dc2db14b696cb9241b2a97eae69fad92ad21c43aa5cbc4dfb9c5c16be6792fc5f23f544f29a5
 EBUILD pixeltool-5.15.2.ebuild 421 BLAKE2B 4e1e63db67d042bf03d2ee606682fa210e7c48ab314a4f78e71c198e3b920c45a930826054c7f9ba6af5b12f7e881c4fa9a605c96910f0317b7d88e37dcddf58 SHA512 6e8c19d9cfe7e5b8a651817499a72b5e8cb4a538cdd865a68fdf0c388ed093379297143916aa6fd3e55fe9ec25345554e072917a8096fc6a05fec241da329a89
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
index 5e5a65259760..15694f09c002 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index b50ba5e8ea52..41592a18bc89 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdbus-5.15.2-r10.ebuild 555 BLAKE2B db001bcb6f8d8f8fa47030591ef900b790761879a58a78c2f7431241b044ccc9a404cd649c6b5fe6060d8419204cbf3e76dcd06e1969f6e4501cf3a3fd33283b SHA512 fea4dc86408a06354716ff420ae4b948809295d8e342174b4070c409fa9c82e44d9a8bc4d67398666d69ea8fddc3bfb7087c17f818533c4931d9f41b85c9c014
+EBUILD qdbus-5.15.2-r10.ebuild 552 BLAKE2B da2c253446a5346f185ab7b45d110478abe0c0fd114198dafbb36fa9184ca37c78700d83de0ab33bcafef1a2feec9117783ad1a5916fa44ea5b3a17394fa52c0 SHA512 98721df33c67dd0787c8e381a7d93cc93011569327b2466b378fa192d972a1ef1785c229c9bde18994caf52291bbdbfe981290dc8728d606a45e86bda7d1b23f
 EBUILD qdbus-5.15.2.ebuild 479 BLAKE2B 1bbd1e7fabca5b7fe69348b35f043c8b405a3531d4376cde7014b325175507a3cdc1f7957caa83b467845b72296c7d4dc583ab577cfd4e5065633baa8d721651 SHA512 a67672a40c2673e507842372972a9fc5fb74f6cfede0a60f1c1d8c1d3d6285e1de7ae73c82bb699111b7f9e753b1ff0694bb40d8e953bb1ca777283a3369dcda
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
index 5f75c39d3486..3819a6b0caea 100644
--- a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 49864fe3b048..0b4268cb3e34 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdbusviewer-5.15.2-r10.ebuild 1045 BLAKE2B 1aec72731ddf8defb778c13ed76d92966a1217cf5904b5f08b597f2d0232f2cefe06725daf30084ea39bb8f513aa9c63df2a409605898d6afa724cb97f3c2acc SHA512 b6064082070eb97e9f8a8d4029e73a865176576a79f00cddd1900d6a8913148f2cb3745b7decf12aab612df89637e562413e0ba8441f5b9c9f23addfb73f4049
+EBUILD qdbusviewer-5.15.2-r10.ebuild 1042 BLAKE2B 6bbeee3455096dd33047db64ae66caf764f35672b9ca9cc311700e888b1b0faa0aaa8fb3e694aa328eb1b0770b132a2d5ee84c5cdca72eafd35178b6f6763913 SHA512 178563ee4a2f52a1aa9325157cfad66c62c9c82e5efb478624e59ca1c8a118d2bd25ca73c4ce990630517ec1a4b1a008450be020ee9a797a525c34e78554f610
 EBUILD qdbusviewer-5.15.2.ebuild 960 BLAKE2B 1d2910182ed9b6830230106d2596c393aae23544651cec3fa4e9ed1b65aa3eab3a2a25c8080d034c6988aa1366d3e56c98eb70cac7f946ff7cbed96aff89324f SHA512 9091c3d7a17e3481458b9dcb4116f7e973ca4e43ae0d47aa0f28e8595f16b100c843c11b7779867150d5159e9b0cfa140d94e0a6995c4c65962f0538a6a3ca62
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
index d9955e5d350b..09d3b0f1cd86 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index a57459482839..602682a19cec 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdoc-5.15.2-r10.ebuild 887 BLAKE2B 1fe2784b9683ea141813326bf8d803b2c5cd5204d88498ec843b8ff65a636089a11b40648c19b458e2070690ebdcfefb4b609d7b38c4555ec1766b77cca489e1 SHA512 43c3e777efe2106ec062c9ea8026ad6544ec1c9c4100026afe3e1d925e9737223d084dba3a8eb9b40d1ce33923f3011dddff844cc51b9e345f9268e9ce34babc
+EBUILD qdoc-5.15.2-r10.ebuild 884 BLAKE2B 9e2fbd20d3e8e17452f25dccf0ac0118e2658a9a71d9ce38bbda5edcd9284daff970419d1b836e1c06e26dfbe61f4317aad2b829709f0f8c34a7cd5d9746938e SHA512 a6ad4bfc07d7a8d1a7a739ba2a4e9a088744e2cb2fa4af4b3035ece210a00d22cbfe4b15d556ff6e704906a09fcd587d4af65483922d7541a71f99869f59d4a5
 EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
index 1a250f857b1d..dd6896da342f 100644
--- a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index eb4a38a6b38e..d93fd667cc35 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,5 @@
 DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7
 DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b
-EBUILD qt3d-5.15.2-r10.ebuild 973 BLAKE2B 0175ae6e02e3c2950e39a7776eb017cd24f8d3cf824d72b0569fff5557b438cb25e0e8b0727fd7d5921dc60f745cf8599e0e5f68d56a0478a11a6b53056d1cce SHA512 8418a29631ff6b381cced37e1a14384aa2c1c941d827943f96e4a69f9b4bbb6c7d33662afc8cd2dd336031064a19920cae68bfb9541685913053e0c09c81cb38
+EBUILD qt3d-5.15.2-r10.ebuild 1000 BLAKE2B d6b708dcc748e395b5cb6cf74d36627f54322b46b237b52fbbc6dd87cc691c6b4dbd9fcfd1919f794f2caf460a8b59d8a299a9659ea75378c65e89f0da136cd1 SHA512 df4376ab76ca598655911d686aec0784291a89a14f59638a4eb239835d56a422651458765bfdf3c020d01125cef6e8444ec2f41d460cd71aecb72cc6451a721d
 EBUILD qt3d-5.15.2.ebuild 880 BLAKE2B bcd097060dbb5e6673b7f5c4fd314a58c0f4d3412ece2b8542f83565d9ee0a0ad0df189e7af927bf836f8c200ccdfa689c366408720c069e21d093ab33fdf4ca SHA512 77f8a1f095598e798479a1e7d62e6b40188bbcc662da7948898364b0b5cd61bbf8b560a271969ae15e7a9f4fa4c49edc064a85cea1e1ae04a0a2778b7bd43d4b
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
index 5d0cb68569d8..b621640f9277 100644
--- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
@@ -9,20 +9,20 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 # TODO: tools
 IUSE="gamepad gles2-only qml vulkan"
 
 RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[vulkan=]
-	~dev-qt/qtnetwork-${PV}
+	=dev-qt/qtconcurrent-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
 	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
+	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
 "
 DEPEND="${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index ee6abc9a0669..5297eb264a52 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,4 +1,4 @@
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-66-r1.ebuild 1475 BLAKE2B f3d1494004ab280f42e2bd439a3832012ebb69b175faa806135478f9bb95441a2bf18aba0ce988381b06ba04ea48448f4e2f0f56c9c34244fc991647c19ba92f SHA512 9d67d5c439565e31593babed7ea27aa838cba849bb592c0c6ba9ada00a68959b926c3234db40a81cb530f988d5c7d6a775b6b000ff49ef454c901812171a13b3
+EBUILD qtchooser-66-r1.ebuild 1471 BLAKE2B b5950833cea37935e202268272817e1bd6d8f4dc80dc88220d592f8536b2f101d4ef6ee6a552f158b969e837b51f658a0d97da2feb257a1784d0c64608562955 SHA512 a280f54b1c41068929d993cb973d07f4f836b14164f51fd884f3689c1ad2fb19621ba80253e2fdbd78355ba25f7d582f742446e3fdf3db0f4e2606463c8e0c40
 EBUILD qtchooser-66.ebuild 977 BLAKE2B a28e55c2c6f55082c93f8d7ba3e1e0d4b5cc378663ae94cd0026a46745625e1f7240cba603458ab756ced69950c3059a8bb63b94b7b45f96f0d783d542f9c823 SHA512 a10663af25e02e9f59bf3d9bf93ce5662bce5dd489382916e7396350d7dd738cea432ae8aaede433bee6a3db378e79d23ce0a8af063d7d5c2f99c5c6887c1765
 MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
index 46e2087883e4..69b3acc84d7e 100644
--- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 7d061fa60b86..a710c4dd2e37 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,8 +1,8 @@
 AUX qtconcurrent-5.15.2-gcc11.patch 1709 BLAKE2B ee8a0a0a591fcbd242406bc37a5b29959d4a82cba78dd5650b60e0526316a1ac511c2f4e053db29d365394f38cf481772e659f194576f58aa2cb4d50ba240c51 SHA512 895c35ee745ff34cc939463c1d0b433d4bcf53c78af3b6c14304608ff282cb77ef292c63a1368885c7b3db5ec7c4acbff1827a014f08a768fdc50fc87dc64222
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtconcurrent-5.15.2-r1.ebuild 640 BLAKE2B 6b92535edb473b634658302c1863569c147b9271e016a77c88bed6bec845612f520fb68f426476600e3473ff66c87ffb1420015aba12ccb606d8dd330639022a SHA512 01ad79d9fd101c42eba17851270ef6058f167204e515016b47bbf8001fffce94c23ee909c496ac73d5d38c0a71ac03c1ccf0dc006082516114343164b4e2d2bb
-EBUILD qtconcurrent-5.15.2-r10.ebuild 510 BLAKE2B 0fcb89440457be88a2b74faa4c2cbd73f7ee772bcbf6b6bf940b74f7ed62989a1e312271af795e6cee8098123acfe2e8b2fc8ca48452a6113e1a11cb3583c4f4 SHA512 8855c7b09da4234e02359b515f0cde02917d8482257c1883b22a6e4407e7fc82dfd762815f9579b6ba3e2322f33758c47f0f9f2bb7f1eb1b7581fcddd1067105
+EBUILD qtconcurrent-5.15.2-r10.ebuild 511 BLAKE2B eca734f370dec9b2af186cc480c05c952b92b7e44712f68c2bd05dfdce39a8fa0bbdd864e9f0881f29f60e2b1b3eac222da920ffd9993c611e3e5b0c0d1cbf05 SHA512 b77595336baf696b0f9c6678b55f0b5eea3ea8bea7e944a43e46edcd292f5194901df4048a12306dbe23b03dde49782b2e6b37c62b7a4f58556dab17c85d9f78
 EBUILD qtconcurrent-5.15.2.ebuild 593 BLAKE2B 44f6a1c8dac390908bb2d5d8f9ffaabd96333ffc07a680ec4ae65a0d4ddd737c24eb376d99afb9cffef954d7b0daa2fa4436c80ea839a43db71f4fc6edf30f7e SHA512 abca397ab254a2d3fcecf6d7ba04814f15184a1589c3fa2e26c8c4bb2fa965f2b9437ad2a0874fea44ea97490320e8589f596b26c91a0af17a10cbd30f16b296
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
index 1cff28e1874a..7488ab63fecd 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 35a29c637ba3..44f22411763a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,9 +4,9 @@ AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d714
 AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805
 AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3
 AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e
-DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtcore-5.15.2-r10.ebuild 2336 BLAKE2B ab42db398c5a6d9f169647393b00a78fe04fd94ec3dc901889952085d10442041014f4eff28e646b49ed1611bae12fc01245d65ea563d19ce217bac131b02197 SHA512 012e8b83acf01ec71ddacb9329c345574aa04e01bdcb3b484218fdbc032e42e13fca33606fddda31203ae46d034a4e9f04fe8f7cc0bfee9442a5e18f2ffaf95a
+EBUILD qtcore-5.15.2-r10.ebuild 2332 BLAKE2B ec2f397893771a029887b58340c21f3761c174635190e17226bd54edc3099225c00a5d6c830b405f9170f8f1823d846213d069b98fd1f67141b23f0e1660f1c5 SHA512 05716a689ee6b259574ce122f0d115462018602a975e219c0247e522ba048314740b217914aa39da68c8e2640aa8a2576f67bc67074bfaa02c35fa4115668940
 EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index 7cdf654113b4..5570c8d30741 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index cd35165bb283..042af408bed6 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtdbus-5.15.2-r1.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383
-EBUILD qtdbus-5.15.2-r10.ebuild 754 BLAKE2B bebd5ecb5058cf5c351925fe99fa38059fcc91079932daa9033af80df826b16443c1c0c1d54c3f0613420776e48bf756ac822bb66d6363a05948a313cd183d02 SHA512 9e99c9032d229b1158286de4154d8e30d6c50209f99d7a0b63aa8ac71493735f72b917b26a20012b3d696e7f1883112e55c63213802d43fc05eb937066e011c7
+EBUILD qtdbus-5.15.2-r10.ebuild 755 BLAKE2B 28fbd65e1ad97a4e49221497793e9143ee77c91eeef8a7f013a8a146806f7bc80d78d743e1a390e9e144c19daa407227f2ff5a36cd3dfc761ec05e50baffc81c SHA512 a7983c283c9fe4f713ba4129af9d69213c8e2a288f181f61cfa8af85050b298b841468d8496a17052a2aefeed4e3c72588bad0cc1d6a31ee3ec0d0252d6b9c98
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
index 23d8e42b7219..6ebb1d4d1577 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 	>=sys-apps/dbus-1.4.20
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index b0d621f41df3..0c96b39ead41 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,8 +2,8 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b643
 AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd
 AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-DIST qtdeclarative-5.15.2-92225b72.tar.gz 24341895 BLAKE2B 049220433ac3339b41a4c43267b54b02c2383571c5abc9e77377d7d404a95c081b874ad906340ccd408ca491c04e7c017dcb7dd1dd7794f73bde7d729f64e06a SHA512 b83345747c87ddadea6581ed2803f15900678ee004dc43078529771eb9de12d643567b9349bb531d54d086097d80f7bdd7a88b604b347e8bfea89039b211f026
+DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
 DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
 EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
-EBUILD qtdeclarative-5.15.2-r11.ebuild 1430 BLAKE2B a1aae7561add8916fb72363c743377ad8b31ea50465fc816be4da41477e151ae51d0e49f962f1984cda5bfd118e843c7023b05a38983bbfe542fb16c869c4fd5 SHA512 dedc41243bb59e5548f8685e8b5a115d28e03d4eac378cf4e7c4ef0abc47054dbd432fdd7ae6a830d58350d6d536720af672752917b29948ec9c342355a88751
+EBUILD qtdeclarative-5.15.2-r12.ebuild 1426 BLAKE2B 1a89658f717f47c0d89bdfe910b11a110209739e40e2386f470c59ae5367bac79ea9b31c966c59055de5bffc30e703dacb0da64a19119a4249a508358ae76df9 SHA512 a9844c3d223afc4dda2bdf2e0b010b52d4f8b16e754fe75bbf2d6400161354637b5bf57ff67234815b7a6ed7de65b71e7507fc521ea56b5d7eb1d8f1fe3983b3
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r11.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r11.ebuild
deleted file mode 100644
index 07b0ea7daad0..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
-)
-
-src_prepare() {
-	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
new file mode 100644
index 000000000000..6e86ee6070b2
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=1c33a9d045897ce755a818ebff7ddecae97885d3
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+fi
+
+IUSE="gles2-only +jit localstorage vulkan +widgets"
+
+# qtgui[gles2-only=] is needed because of bug 504322
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qttest-${QT5_PV}*
+	media-libs/libglvnd
+	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
+)
+
+src_prepare() {
+	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 16b32d6450db..0fb8bd7b5005 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qtdiag-5.15.2-r10.ebuild 803 BLAKE2B 7983ba8236a634dd86dea3db15d54d4906a33a0e1bdae0834c71abc2fbe7a41e954f053d760affb959f7dd79dc9fda14aee7dfaad143b531607a3f46c068432d SHA512 7dbaaeabfd616936ab1741a0c31769b3fd27c0fe4693bad7f170360db14dc8c700a0be7fa78b7fab0767b3311e612dc90828dbb897d7a7157f2cd82cc0882507
+EBUILD qtdiag-5.15.2-r10.ebuild 801 BLAKE2B 3b8ab840db0c237141f5bd01259871bc6771a71b28af609881839ca9c0a1c0f5ce6fedb4d2c764d2f797596ed622ef537932c6b567de5179c12ebe7ad86be1c1 SHA512 b348fcecb778227671c879937ce0da9b62cbb5c8588b44a9d6ddb3e87bdb8109a31a99f3a63fd1f8556d1ba5ad5aa3609457ee9b7430bef208e24f7047d991e1
 EBUILD qtdiag-5.15.2.ebuild 844 BLAKE2B b2fc4783c2910ef62aee3d66404b2c2974afcd0323dba3611c18649bf376e4560531c5d2b209acf9492c179865035939302d2e941dc52712db938dcd162c7891 SHA512 e421c1d18d168e132a99c6ecebd2a8004f1faa3eb9414470ce262995f177c5ce87e4315ef50cac38e39ac9e5f518db72ac39e41880dc30fbd9c841fb216d359d
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
index 5a86aaf571a2..34c84379c01a 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 4548e6e541df..6aafea17a342 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,4 +1,4 @@
 DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
-EBUILD qtgamepad-5.15.2-r1.ebuild 699 BLAKE2B 0caabcdc4664dab4e6f7dbbc5bcb2b3bb98f675730e791b2d3890165355fe5ffee29f7ad109710c56953fe7665ce7183a701638dde701980722a7e91b7022e0e SHA512 a28f98d7877210f57fee7896f261f044ef5baf00116a827febaf76ef6a0380a8a10283323e465af8ba6e84d43277c7f63d558e22cfde33f1c69fb590d5825590
+EBUILD qtgamepad-5.15.2-r1.ebuild 711 BLAKE2B a41760d44e6661082277b38aad6d26b2f8ba489060b58d83b5a68dc4de11dca5cf97a708984e227296cc392e793bf25d790400439cd7351e589bd80aa30b89d2 SHA512 4761581eae4b40756f472e1da1f5e1c9c25eec51896c2d1974d25ee3249f4c25f1d98c56af81ef45cfaaf5162a121d408010808073c64eb19a0783e832a12674
 EBUILD qtgamepad-5.15.2.ebuild 694 BLAKE2B 5dd4717b94e9f59004d45ebbd1874c9efc179cf2bd5f3795aaef22b60265d7588b21a18ef34de0feb430982051dbd42cfdcdc43613f5d5184d6e66a07765f347 SHA512 6832fc14111778b914d687cb4986ef682eeb5c2d8d47d1b2f98c9485260c3e2a5c22ec78b90ee5c9f863e292298b1f46b6f7176b1e9919adbf8bfe3c25e8e48c
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
index 70434d09b66a..240fb4f4e8b0 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
@@ -8,16 +8,16 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE="evdev qml sdl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[evdev?]
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[evdev?]
 	evdev? ( virtual/libudev:= )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 	sdl? ( media-libs/libsdl2 )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index c097d060ca97..949dad874a05 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -4,6 +4,6 @@ AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf90243868
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtgui-5.15.2-r13.ebuild 3989 BLAKE2B 6d98b22538642fd6eee2c7d1132062d2eb1f60c1d737ba9415a8dae4eda9ede7f7276f7e6d74a305c064b490f9f8ed5867e4336555d87431530f68b1ebc90475 SHA512 6b40450d35b50ca138e6a334242a40967f207af4491e6f16f24a01deef990555f050f327bec7418e41c4250849a000fa0100f5fda156cfcc505909ceb6424ece
+EBUILD qtgui-5.15.2-r13.ebuild 3985 BLAKE2B e6fce8538b37a35af7a9320b6bc81ad19e4e1f990a3f6a8524adfd259933f831e1fdc6beebc401f8b281a5da82760070a61dbee8f863430f2c7649326f419473 SHA512 e30d34d43c8cd2868b6fdb8b8e16871910b62d84958b347d5593a48e1ba84eabb2aef8c70dc7ad270fe150e1245f804dac1f06450e2453015c9dc09e7bb22e0c
 EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
index 906ca6ad4263..82f3e4966236 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 5e60ad2a474f..bd383ba6c1a7 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qthelp-5.15.2-r10.ebuild 706 BLAKE2B ed6e6379c7b8eca9d041dd88068fe8d6b9011e299a923d088a3fcfe3975971e4bc8333b2da5a28b918f9485dbba661b1fa1b21c58c8e3ea97457dc6e1645b52c SHA512 a57974b1659bcd12034e6aa142af02348dc4fd322a596e38fb41dca99facff4baaf36a363c0156621e5b10b38199f0eee75e2816cf6362ad20aec63ee869ecaf
+EBUILD qthelp-5.15.2-r10.ebuild 702 BLAKE2B 5e546ad17673780e6ffac79da89b37c80011ace1c6b31b3103387bfeddc4576e65825a54d4184cc0f963a2995155842abca19f4d7d35f0862b404ab4cc0743aa SHA512 792ffe7e225c6dce59436f2954b6c682a9741f5204457948a2e223a25b533f2f72a8166eea4da4cfdd775a273cae8440fac35211ba4487faafe6180908f4ad25
 EBUILD qthelp-5.15.2.ebuild 638 BLAKE2B 8333b21d25d777f2e7e2ebec3eda8c9ee440cf3fc7763b16d4246748e4bd937ef0edde019e0b104f86b8087ebb05186922f006b50bb4544afbb7fe5333ba4951 SHA512 6eebcd2844c14d5f9cb2b55f44cfeb8da425829fb7ebad7312d4ef9afaab3522ae1a082411a822c7d77b9dce120518dbd6d39f10e98b3857198c929cbf195720
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
index e946e8837d9f..752358908948 100644
--- a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 6ce16bf2fa65..fa2f5632459b 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
 DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
-EBUILD qtimageformats-5.15.2-r10.ebuild 738 BLAKE2B cca51ad9c31450265a5237391b88d63e0f9ecc9f57e6ed7372367fdf8e2f761743a047b0658a8acf070225029c4c8103a0dbfbbcd535982116a0bc9594ba8c76 SHA512 9757bf04a61843b4d9d54e972dcd31715be317eec6160f6371fcb3669e802c4f882a4cc391a2119e79875f6ce79af82ed4fe5f404973589ddd58ec49d661c0d4
+EBUILD qtimageformats-5.15.2-r10.ebuild 745 BLAKE2B 4eed2aec2b17fea3009fe4dc945178f642d58066819dc0291889200be87d68bb680938c959f8982ced16d445ba333e6fa4a2ff162d5ce4252e777af8210929ef SHA512 15b2a3d075ea013d2655c30421bfda58905f12cd1ce5a8fa54bea335af5159dc8cfec7961e939fffba13946df8185bc04b5a0a805b5ecadc3e7c1241d7de37cf
 EBUILD qtimageformats-5.15.2.ebuild 677 BLAKE2B c4c31cdf56a20dc88b7af4040528090da9cd7a5a15b89756037e800c2029ccb869c6effd57afddf039a16e65ad3b2abd348fef90dea165be2078f8fa29fbf439 SHA512 2ad09118bcf970992efc7881429074fa4128af92ca8008cd14242bf09109a78712e5330ed03c494cfc2f8789e7997f57dc3cd09e8dbdb626c0213e4f27db4bef
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
index 4931c3669313..2abdd63fcca8 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
@@ -9,14 +9,14 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
 	media-libs/libwebp:=
 	media-libs/tiff:0
 	mng? ( media-libs/libmng:= )
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 5efa17384c04..0788150a19fa 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -4,5 +4,5 @@ DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4e
 DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
 DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f
 EBUILD qtlocation-5.15.2-r1.ebuild 1177 BLAKE2B e9c5790ce4fc44188864161a0b7847a7ed3ea644bc63bb68d251a34b23735ee7bf84e66fe7dfd59dbee214c8137d766622920b130b5653fb760378ece611344e SHA512 4b35636ef302f41210086bf92c55db50fd0e93b04f00688b558462b1f2d5bcd81b3e426b18b2e170c4b1b6bb3cfc91014aae6d79a5d5cd609045d4630b7229a2
-EBUILD qtlocation-5.15.2-r10.ebuild 1573 BLAKE2B 54a4b5d1f273ec2203c9b905279e5c506aec22c4b2e8fb171209b327409b6ed5ac521842e03da390d03123d616a42de5e3623bf8d6a73765b65435c8bd2f7123 SHA512 15ae7d623ab42a2ef8022c811eb095d837f6c714f975eba66575ef08c0ea5474182d048952bc7b504c0eed2cb3f49d3024e987547f2834ee3f4b66f1139290d1
+EBUILD qtlocation-5.15.2-r10.ebuild 1604 BLAKE2B e03e24a09ce4047332cdc6d65da88ee88d078283867523bde64b8ada59077b65e59cb22cb477065b3766b5fe5fad3f3fb01741e08f745ae54f5b0fd02d720649 SHA512 a34e5276f3a6ac15a20bfb8a5ebc7fbb7bf14d48a085d5a840a126130723c49877f97e3d6690fd734253c41adf8e8fd534a62c760abb9a87a4cdd901b99569c3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
index bd4507627705..9b2d0f37d3bc 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
@@ -11,23 +11,23 @@ DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	MAPBOXGL_COMMIT=d3101bbc22edd41c9036ea487d4a71eabd97823d
 	SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 IUSE=""
 
 RDEPEND="
 	dev-libs/icu:=
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}[qml]
-	~dev-qt/qtsql-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtpositioning-${QT5_PV}*[qml]
+	=dev-qt/qtsql-${QT5_PV}*
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
+	=dev-qt/qtconcurrent-${QT5_PV}*
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e1e0313ef428..9dbe86ab140f 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,5 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
 EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414
-EBUILD qtmultimedia-5.15.2-r2.ebuild 1561 BLAKE2B 56234e911eecafeb404ea2169d4bf5c6d3efed4499b1ff66dcd5cc22a96cec010214c6383fe2b2d7f29abbc44170bd73379371229034cd05543f44330e905194 SHA512 fbfb974306297bedfc281117abe5938423ee618bd4c95eb188696d65eaefef1cf202be988db2060f59f9915d4e52f3fb8ba53a340587e0028eecf24bc9c93db8
+EBUILD qtmultimedia-5.15.2-r2.ebuild 1557 BLAKE2B 3ccfa55e403dbb4bc31883480fe6b3b1624c0cdc7cb8952e919a5d9c5f88d66efebe68194d52ae6b955fb6f277b7c6ab0112e20306ea69c6edf48888aaa17255 SHA512 5dd6a7ae6693f1e1c86874ece1746497d76ebf69ed7c7b413de7d6d0e0e2509f9457615024ab92f508876b6cd0dfe3ef3695c867d35eee1c8870af118ba3abef
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
index 8148aa4f31be..08b9b1a9521c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 3ef32e3b2004..f02663a15713 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,7 @@
 AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0751f68273e79edb602b90c96d9a3287dec43c1fb3cf1e3b5cf17ae1570e62bc59b330748938cd1ca2b9326062ee61415114d1f08211235dcdae7a6 SHA512 880cab4279a663e4709f93aedf875f2fd3c17dcfd45fe57aa9b75887fbee981b13ff899d9223a37186f2c93493823ca36d4128500f2943b7ca67e409e6523ed3
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtnetwork-5.15.2-r11.ebuild 1667 BLAKE2B 8113d59ac2a52e4c73eefac8a1124094e6170b03ffefa738c899d3bf6796e943cdd71c52a59e37836410fdad63529bef37021ed59d5d0299aea72044eecbadb3 SHA512 1b1c04abd19815465bc660f86c98f12124d2b6a3c26c9f4ffdb8ff7502bdd4a60989cc01cb735c7b3809c1a6d1755bd2b1aff26a7b60c85bdaf5b75a689882b2
+EBUILD qtnetwork-5.15.2-r11.ebuild 1663 BLAKE2B b4a6516dadb1b9127cf709bc25211459edf322120200e8e31b7bfba17d80ec2f8f92aaf48bdc443f120430bca1d5e68be8b0881f8c592e8ea6449bff30aca971 SHA512 a38ca5907ca1ba04e1cd327ec78540a8e65326e8fbc880340ba1fe9f8b82f4cefcf9ade6f12bf17b525a00b1ee0b44e9dcd23edba473b2ad3444771e2181c89e
 EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4
 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
index e7c99f63ba76..bc183a01e728 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 46caf56875ec..8dcbc2d7d4a3 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtopengl-5.15.2-r1.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d
-EBUILD qtopengl-5.15.2-r11.ebuild 726 BLAKE2B c77235fa727462bba6a2f69b6919a1d93e9ced71e597cf88b75da96c4fdabe9e11669534a5db3bb028259c2b890fb45f0f336bc96f412e0340a46b873d8611f7 SHA512 b21e51683a0957a455971df43ba1018edd460717739f126ab213d5b1d1052cee78643388563d7e980d0f27581790a2fb543d395f8469725e5ff823c6e0f12a1c
+EBUILD qtopengl-5.15.2-r11.ebuild 722 BLAKE2B cb6b4fae1d80bdcb46ea24bc1853a8b4de373a6dca3649b32eadabd20c70521e9b9931bd9e2fae71e83c9f79f9db7d22cca94f42233344c3024bde2def8a12e9 SHA512 1d5f8a5c85213699983d03e817a6e0a932d8a758189051fe1bd4d0f3066783e1bca056a866fe7b0f8d263fe628080a4dd91ff39448641249a2ccd98fa612250a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
index 0a0961690b9c..340303cebc41 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index b2800349ddda..b9e4b768ea6f 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qtpaths-5.15.2-r10.ebuild 482 BLAKE2B 81d89a4f006ed3275fef69ec376d84df40bf2f526f54a416f63b9d6cc3d9ecddcee601aac4369bca9b1d8e781e2a5257cce80ed5147d656fedfa032b0bdf9400 SHA512 2be9beba279ecf2141270d9c873eb50d07fe014eaa37e266666d25e841f9784be932cda62d1bea2346c52393fbaa1aead24a47e0168ec07b05de47d8e89b9097
+EBUILD qtpaths-5.15.2-r10.ebuild 479 BLAKE2B f4ff192c537ae3e38c832386d0f4b9ed79657f2fa0c40e61b112328de6d47eaf2696ff491a19d8083b9ee609333643fc87ca0180e4f53ac2eeb965f03013a0ac SHA512 0c00c1e345f550940d3176c85ded9c9d24ad02bb3d84a2d132bf58840ff43cbd1469963e19e82749f96fe45a78cf3341eff67e99b85106795236353e73286155
 EBUILD qtpaths-5.15.2.ebuild 397 BLAKE2B 2cda259a7a23d11676c72137944b339813b064ad8e61f93b717e276f28d244674c5494046746e4a60cfee876dc85b10067cea3711c56418f231bb77cec53a982 SHA512 47df5c78a84e07d26ad708c300cb2c02cd0cef90b5fc79471be652537dc58cbe9f324b3fbc3c09ce6e384abca73b465abb5919b0bd9a75937eaf709df444a9e2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
index 4496c1285756..f1221627b894 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 8dcd0bd9b8df..51b12f33703d 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtprintsupport-5.15.2-r1.ebuild 935 BLAKE2B 9e0b3c43b40a0613178bf7f982af94fe26bbfbb9206991c302d9de1bcd393cf23184b459630a78f8cd0807c28fee37d32761146c1305037012cb7839cc46253f SHA512 359e813b072edd78d404f0d889120a9b571cdfbd2f34a0b5b194e62da3d262f2769b81503965e83aa22dd6b81821fce60fd880b21d7a45033b451ada58f0ebad
-EBUILD qtprintsupport-5.15.2-r10.ebuild 852 BLAKE2B 1d15182024d18a1cb7030bacc39244091ccc7aa32d6cff16879e952c477decb4f67e687413f6962ba9232818c04a8740586405e1776f6cef93783ae46506cc31 SHA512 8ba709592cee060e56457f81f2abdd85236ad84b0e6f5dab1f4e8a166faaf03cf67fdff53108be93955ad2fe12f4b2dd7bcbce6e4638e9390273f46cefd69b1f
+EBUILD qtprintsupport-5.15.2-r10.ebuild 868 BLAKE2B fe65c7641902c6c1301b807b07e79a7e38c3642e046fed7933d9c1386681ddc3e8314d8bc3d79e000bf27fb598e4f422ceb4bb60d7c227397ab7a8d1f68442b9 SHA512 7262240e023eff99dc75c3ae77f436632159daed144f4a7dd6ca09a0b0ed783bbec673fc78c923b7f9f0806c79fe92ade719ce37ffaf9ea5e5fb6f247a48ef48
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
index d0d45ab1e674..eb51bc0eae2b 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
@@ -11,19 +11,19 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
+	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 20f8bdd74381..d0ccfae31222 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567
 DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f
-EBUILD qtquickcontrols2-5.15.2-r11.ebuild 698 BLAKE2B e568f2aea0482c89ee7ca388acf530387f6bacbf64b917a9934ebb54c84ce34952b2db069a28620b94ef77bf20384df370e9073e3a90c5be49ce64195e3f973b SHA512 42ae241c0082473e6462184856c83f0a03956d36f99bf070537354e6859bdedcdd49e0479f451cba4d6ade109720fa9e60c767ec67b94b678065afec9cc284cf
+EBUILD qtquickcontrols2-5.15.2-r11.ebuild 695 BLAKE2B 7ec9449ac8f30acd8f8f464909e50101fb9fd15b3535dab61d9739419d1335172fda8791a9bc1a2eca30a497b6e9937f3534ef5bd099bea1a3d8ad3297c97cc4 SHA512 c0317dd97c14333bea2b83970d1b03aec02aa3c7be0a5b64e958f7d33166cf54d8c9b0e496bb0a255f7bc8f98373e4ca3b7235dab8396948785915d36a07cb52
 EBUILD qtquickcontrols2-5.15.2.ebuild 613 BLAKE2B da66e8d09b01a0818ad23e32fd627b955c8cde3a86130c349da5f1ce301036eb2339b48aed95545275b290df55fce18c23598d7ee08e8b7db3cfa3c380e46532 SHA512 d272f73610dd55378ae08e9df01a3ecf59903924ef01c2e05c7d33976ad2655cbf747ca7ff70d8ddbb5b27561be7a37fa1548a536e9103a1068c62b46859b4ef
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
index d69f36c8cde2..19bc097b0b49 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 3efd5a2dc76c..5722412337b3 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,4 +1,4 @@
 DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
-EBUILD qtspeech-5.15.2-r1.ebuild 708 BLAKE2B 5806590e374d1dedc4e15fa6ce20ccb005b88b57e5d3c60ff2e53b8febd429d5723358dbe09c19437dd7eabdcb18c1a0692cd1c0b172e06700bf4d3c0bbf1475 SHA512 c3ddc274d5489515c090bd227b81736ba859d8446b0a1d83aaf7e0bd44044ee9c0083bffd222067e8fbb4b50a72cff6f67fa932a2e8901a638e917f6d5c4adb3
+EBUILD qtspeech-5.15.2-r1.ebuild 714 BLAKE2B 3dab8c2615c3d412fe02525b2db6831efbc544740c142a487caa09b161c7ae7f33229d325b2806c9bf8d57bec98dc3a6d49971c52cb0f5c24126d584d7e52a3d SHA512 16a689b9ee743e826f518ccd69ea6bc2adbbeac764fe247fe00808e733a78e804c0dcbea1109ca208fbddcfcccaee41a09acab1032738d1acfd228fddfae58bd
 EBUILD qtspeech-5.15.2.ebuild 446 BLAKE2B d8cf7215bbd9c6b02a30ffe0bf0a9ebb13a2a75b5abab9a3ebd73be44284a4a64ada8c752ead883eeb45319a12a325b84ef51a28e4970c10cf78b94fb64c396f SHA512 677c652115cd8bfc1d6a538330900d0da041ebfa4c331687a6ab70457d3055eed85e831da31602ab29c569e9c2aa7b5028b01a82952810e21c01b8411162c52b
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
index c2273fe433d1..996d482b76cc 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
@@ -8,17 +8,17 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="alsa flite"
 
 RDEPEND="
 	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
 	flite? (
 		>=app-accessibility/flite-2[alsa?]
-		~dev-qt/qtmultimedia-${PV}[alsa?]
+		=dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
 		alsa? ( media-libs/alsa-lib )
 	)
 "
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 648a4c166e0b..7aec2668103d 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtsql-5.15.2-r1.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee
-EBUILD qtsql-5.15.2-r10.ebuild 1306 BLAKE2B 411d0c6ef6aef7c63602e32957778d630aaf290f5d202a6c5e7fcbf041912cdf3f376f60350bc280d5f8b6884dee76b484e417f95387db1f6ea001c4109d4d1e SHA512 1414ffb49477493ccef6b383bef5d6214c3b42308de34c764c097a78d3a10414bd362a42a895eb11821e8e8d528a01dc68fd77dadbb533cf2db5331af6d302db
+EBUILD qtsql-5.15.2-r10.ebuild 1307 BLAKE2B 7830c4b3ebb5543d91112d5f14138e313afd8f0a3b455b7c54459d781658a82739eb850cb5a4a20f8219e4730fffed6ac16db2bccaa23f2a1d6fab8062e69fe8 SHA512 8c162941569cba5f4bc877b089bcf5d12b2097521351ebcd82cb7baf7d21ad98b87f44eb622de6a6d2338d08a5d0a59a3a03c91e9985aa7613d994d726a1e49c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
index 9d3b4783f467..b4a101fead07 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
@@ -21,7 +21,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 	freetds? ( dev-db/freetds )
 	mysql? ( dev-db/mysql-connector-c:= )
 	oci8? ( dev-db/oracle-instantclient:=[sdk] )
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 8087fb2369aa..bac552eab653 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,5 @@
 DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
 DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730
-EBUILD qtsvg-5.15.2-r10.ebuild 521 BLAKE2B 70e7e19749d0b4f3647a9cceb8c4a6f9b254e42ebb0f3ee9175e90757858dbccc610ebee8e14e0da693d9616072d3860669fe05802963e731c3e2eb6e1db7b0f SHA512 f8207f9f21291cc7a4e898a17343974f8cc87c3ab0c80d5a1766e7be19ff2a7e1de49e682adfbfda209486c2b8e6aa1d99a37777aa84bb86dabfb55394c93cdb
+EBUILD qtsvg-5.15.2-r10.ebuild 537 BLAKE2B f94dbeb0c65d7fec400a5565096cac785d70206aca66dff3ea22a6e317822e60fa567c2585d48409b4d2fc116dd6af9c601a29b85c8e21218d7f57f79354e000 SHA512 70145de58764407eb7baa55a003264b6f67e49b428aeabcdceda380cf4a5ca6215c27a2fa23d0fcaa83427b73df8b6a3f71acc8fc0f0195ed6a677aee20126c9
 EBUILD qtsvg-5.15.2.ebuild 458 BLAKE2B 3fa6e46aac4007ea9782431d2d2e617c759dfad9f213547498491040aec9e02dea2950579a30cdc6dd11c4ecf7cf7917e2adde85cf5acf93ba2c1ab8d9340fcf SHA512 64a55df0f387cfdc90783c82b99de271fbf7daf8e26a6c41f083a0f222b6099c28d2341aee009568f985653fe656c462a0bca2e695bf27be13a8b4edbf74a6a0
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
index 8ec99ee64424..926ce9db4bc3 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
@@ -9,17 +9,17 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtwidgets-${QT5_PV}*
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
+	test? ( =dev-qt/qtxml-${QT5_PV}* )
 "
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 39c637d1e4b7..a385c4411a6b 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qttest-5.15.2-r1.ebuild 691 BLAKE2B 3852d081c2279581918d42ca0642e73665b33614e8c5b77f779495c2699aad9f6ea433cc9fb7e5b6fc264f19df633d5dcb420c7d11d3a7712ad2c476be86d035 SHA512 ac8cb0afbbac1ebb7be0767d6dc298ae555d2ea4f8a4b7fc49035e7c6d935ce37ab29ad424e17280db95d55b285736210f2ff501cac8bef0458d2f5f338b8419
-EBUILD qttest-5.15.2-r10.ebuild 608 BLAKE2B 4770ddf9ce0ecd482012a0596ef9ffb6b66e6cc0aaa9ca5e580cde17f57578e926add02bf5eac0c4e6a4bdcc62e6aeccc06279abb616ae8b0057e07616359ffc SHA512 b136752ebb9b0b30a34d7294eb2d8192e951912485166230fc53f0ffb5834c265357f8e145756525149ec2ca8f0e2293aeed80681c8ea4ce9a4ab5c9065c65c7
+EBUILD qttest-5.15.2-r10.ebuild 619 BLAKE2B d913c51170711f5e5c4970ea39fd98b480c7811ab509ca73cbebb496bfb9272c73992109af0c3bd82000c7561caa79a0d6059f53c1c7912fc5d83b9a502eb82f SHA512 1b8739892e13a4e5dcc53a462974381fc35ffbcd8c7f75cf1a08804e047c3ba656a8c8c4374a87407232b29d395c682343a95079e7c1231f9a3adaeb98b146d8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
index 877cc61a3040..4aedbfe45bbb 100644
--- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild
+++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
@@ -11,18 +11,18 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 "
 DEPEND="${RDEPEND}
 	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
+		=dev-qt/qtgui-${QT5_PV}*
+		=dev-qt/qtxml-${QT5_PV}*
 	)
 "
 
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 9cc2cfee5c37..c952857f0d21 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,5 @@
 DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
 DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe
-EBUILD qttranslations-5.15.2-r10.ebuild 439 BLAKE2B 3b58acfcb36e6744a570eb8af313069bbd3816ad668bf71007775bf65e2e119dcb7fed31f242b850744c5c708e722718645cbb5a19dd153db3252990fa436ac4 SHA512 f53320cbd1e6c08030d33bde018f54db7486555c942f892dc6539b849f444d9160c493ffcb1b3d5c718737090068916a32b42b1598b9326ff57afa1864e4cba8
+EBUILD qttranslations-5.15.2-r10.ebuild 443 BLAKE2B 89dad765b4e783f91faf89295f5bc9ea0ab5362ed731427e5e2e7a69ca3b46d71e6f669fdb5863892f8c22dab28831ef65a547bbdd838b3d847be13f069218b9 SHA512 17ba8d9cca9b5a74d9b72271db5f9e7c5f738ab62543b7f43b6a69510f4aa1a9ae73db39ee5e344873d0a69c4e6dda1d1773577be2a6e3cf30629d9c08fd65b3
 EBUILD qttranslations-5.15.2.ebuild 379 BLAKE2B 7f9bc811a3f5669b63609c8ad81039049ac860a79f27378e176a8206e67bdf118754d6ff27a09621a2c951ca9b634234dcd1a8ee13508f1bffd8aa6278d8d6fe SHA512 b1e2c9b0af9d09683b6ffa9e4cafa8b13fb55ed2c14316aa2e8de5836ee8ae1007c23455c8f6a39474668ccb02b788e184184276fc565612415e8b37e47d7db3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
index f45c8d00c605..5cde6f916d9d 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
@@ -9,10 +9,10 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
-DEPEND="=dev-qt/qtcore-${PV}*"
-BDEPEND="=dev-qt/linguist-tools-${PV}*"
+DEPEND="=dev-qt/qtcore-${QT5_PV}*"
+BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 7780ef5e2de4..21c632cc0c99 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
 DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167
 DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016
-EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1280 BLAKE2B b8dc16302b35ef34fcb85c78565bf4efea41d5e2cd7bcd3ce39fde842a5ef2bb8df081d2143d0e4976fd4f10006d0dd91347923e8c65046e8a7c19766e543319 SHA512 8d071a4c9731d90c07c8468a5300c8870e9b6290ddff905b838a4cb74657499c10ba1752d23fa489aab0425349ca7f97ae4e9d25a396c29315daf5c047ef1bd4
+EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1277 BLAKE2B b07b01567cc68de87595489556fd2ab46a37ecf9f9c7235f742d40c7124bab595dabfe1b981bd165b04bdfabbcc0e6af6f2f7037ea59f7ecfa99fcaa9858ac7b SHA512 dd1787e5a12752a83be8822baa9c5072292f1d51b723ec21201d183e429f3c28c04bc6bd2d186565a5c78a18e0e4e41f453816c492fb2b89514ec1200b86c38f
 EBUILD qtvirtualkeyboard-5.15.2.ebuild 1208 BLAKE2B 9dd8f4af6e11c38e20eed246826c773dc39627d1c94841586124a89002a1fbe89aa948806b1462c0c283d6bdd46d472200ddf87e701da58fb5537bda67cafc22 SHA512 1551e08535a9e02bbd7beac31f6c73ff153f68dba53e4681432962d6a7e4cc2114e3515757fe34f209c1cb14337415ea80acf131751c585d575a5550a7d68723
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
index 5a535f1c9930..0ed8265c7dda 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 # TODO: unbundle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 693c3103e6f1..1e72e4bc5302 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,6 @@
 AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B 37091d2be8194d023af6463130879d6d4649f802539d77b897bca222bfae13761f82213118d41d8dbaef91b63c05ca4ab140cd071e749baf78852287ff522508 SHA512 5a4f287731231fe11e755648aff54bc99f25e3d4bc274eac94511497af9d2d0e287760d52a5f103554e505450ad304f378a5f53ebde9bbf742c8bbc2beab1f09
-DIST qtwayland-5.15.2-3c420cd1.tar.gz 829193 BLAKE2B dcd6f466184263b8988f5ae8e8cd47d22711ec791d5f7afdc156ce6de31488f6b37970bac00edbbe9a485b3627f86f865e45d9515e48eccf37cc12a831d7740e SHA512 d4e247d08ed17a31073005b4bef818571cd1268f8b4a430dd366f680a0f652d3aa321ea264efc88628405ac254693bdc1b34d32a2bcb14f4d987d5380e4cedfc
+DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
 DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
 EBUILD qtwayland-5.15.2-r1.ebuild 916 BLAKE2B c319d05e9293595a50613e687f2242da18a8b49af854f9c4f46356642472762cd7659d6ec0f3b3c41eedc5d40a631001c88dd6435aae9eb94c32d7ee4233d322 SHA512 ed27a404fe9fa2a9d2ca5216cd017c9fcd2ba40f7d55758a5337ddc9040d3df9d5cc0c3610561551e0b640cd5902cefd2cb978f7e2003fa77aab4e0b57ae59e8
-EBUILD qtwayland-5.15.2-r12.ebuild 923 BLAKE2B 8714d001f3dc1c3aab3503eb9dc1b1715793fe00dc69eaf1dd6c34fd0e3941904711a5351e9b062d7a03d7a6acecdc91f58a7f12026da1e16f07a57cad0d2ed9 SHA512 044c855aec9a16740aebd8b2d86d27ef74ec91017afe3353d33fa85b3785e7041392ed05213f42b79f94b4e2f5c7ac19b3052af3bd3508210918bb5678738822
+EBUILD qtwayland-5.15.2-r13.ebuild 919 BLAKE2B 7a774b6d9ef319dfeb980a48cdca23850a0c56b3bead03070f2714c7a5a45713c51a64cfb6a036eb7ddd3779c7072692b884d2196919743372d5755a4dd2629c SHA512 eee79d64bb5e3aec8924f62695ed0a51e5bbb1f4307b67c9266ca3ece4412b65098edda5be6da9b9bd8fc6926909403ba6f7d5c2461c4bacf3af2c705bbb9f8d
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r12.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r12.ebuild
deleted file mode 100644
index 89a557d9935d..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=3c420cd180397e3f42c8a436a7f1b11465925bdd
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r13.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r13.ebuild
new file mode 100644
index 000000000000..65b2a358dea3
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=efe6edcaf8eba601dff99ec6ad4457c8a4442f86
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
+	>=x11-libs/libxkbcommon-0.2.0
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 5e4d4bc7d659..c7ea449014a8 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
 DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
-EBUILD qtwebsockets-5.15.2-r10.ebuild 607 BLAKE2B ab417ea7326832382d00a9133ee2a63ec051a8f5fc5c3b38dfeb379d6bccce1b92b35cf32409fe94ab82a0584ac4f2fb22a3cfc646bb66523fbbaecf11bb71af SHA512 2d99018dbf4e75e19f5f3ac5c52d8e674c5e198a7fc3d0572f2b5bc0781c281068f1b299dc22cda28b5614889a9af41dfc44a57ed58c7ee146567e87cd35efa9
+EBUILD qtwebsockets-5.15.2-r10.ebuild 618 BLAKE2B 993d2330acd21c8b20739e8a1fabe5ed419387f9605ad125d73b34020fa544fb68bced4b39e82a2d3ba57d0aa294a8243537fc53b175c37df03ca7bc4cd1a4c6 SHA512 8bee6a4053591699486b1c71806389f319ad81eb139107f4b4f8348d804c7ef84b21cff3e24615be976d2398b7bf8de95dca5848aa0a5cb68af83125d85e0058
 EBUILD qtwebsockets-5.15.2.ebuild 545 BLAKE2B 048aa5d3965f2b03d73cfc0dac6d183419c2dc422f3cc6f8f7e88ce9d916a0995b0aefa1606c3876ee12fc74721fb7bbb60b6e81858042df7fa176c6177ac9d7 SHA512 bf768df2dafbdfe3b866596c5e12d3ab47da1248413e92cd46f032499f5bd2af4911f5d6b2ff8aa7a6fe338304d165a31cc4b27035d925747a85f4002995ee67
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
index 5910e9c5d92c..5b6000dbc97c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
@@ -9,15 +9,15 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml +ssl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*[ssl=]
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
 
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index baeba0761226..fd900e5e0e0c 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,3 +1,3 @@
 DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85
-EBUILD qtwebview-5.15.2-r2.ebuild 450 BLAKE2B a1fa18df102f9fcb7aff5f6f7d6c661c858a08244bdd3db4cd339aeb55fcd0c0062b7e0a04cfe1c1a5e37a75a40a3c3ffb1b6b51e7898b1b045c84a84bae3def SHA512 e081d839e2603fd09dc9c6e8c65d5ec4e2df37298db9e6b9bcca6ca8701061567d0ca3e91582617ab91545032b1426a22594b8bdd5d1f73c35449ce9b8c4dff2
+EBUILD qtwebview-5.15.2-r2.ebuild 454 BLAKE2B 1a77a9737d81ebdc5d2e48a4a39ac3e86433654ac6813616f4385ab2cf123c56d75b3a125b2f93c42e2d8851b513d164924ec9190d5649be51e6f9f4bd93b4c8 SHA512 258a38caff68707a51f8c1daaad9fcaf6cd38f309e455fef97280351e76252fd970dd9740a2c047477399f781e0fb5a3944038b4247465ec116652142358b32a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
index a1b3c1180fbd..29f8f0036120 100644
--- a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
@@ -17,6 +17,6 @@ DEPEND="
 	=dev-qt/qtcore-${QT5_PV}*
 	=dev-qt/qtdeclarative-${QT5_PV}*
 	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwebengine-${PV}*:5
+	=dev-qt/qtwebengine-${QT5_PV}*:5
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 490777bdd76b..671cf8148247 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
-EBUILD qtwidgets-5.15.2-r11.ebuild 1235 BLAKE2B 4180eb9f3cada8e31acd7d15d60e5ba4abe3b3c2230a898a8206522b9c3c684659dd8f430c1ed935c785f52656ecb833595fb973d7f6412b93e5d85c1d53c5c0 SHA512 e671386c5f562172e415035f85615177a0ad8c1d38827a700d8db0a39d4c2cb7b9990bb5793ed0e98a59ac53a3f1b9b26289268ea9b1c844c1392789893f630c
+EBUILD qtwidgets-5.15.2-r11.ebuild 1231 BLAKE2B 1d24a8a4455c67fd1e26f5941b0bb3fed9213a0e01b51545e6aade9cfdde40a3de8b213842c7221409cf5c7881de257e1cd7e7d3c2c9d1d0e69cc803eadbeed9 SHA512 0d450aebc38408781387c4094e1dbd36bf4e1b1508f9d043e020a249ee0c062342fc0a6f5e8219e1e5b7af70d6aefae4336d8820fb73ea7201bcd5bb521a90b3
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
index 4c5ad74f9d8a..c7862b854eb7 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 69af775207ea..643c9b79c282 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,6 +1,6 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 EBUILD qtxml-5.15.2-r1.ebuild 646 BLAKE2B 97826addb6a8226423dffb1e2cbbb9ee05e8f036e5969f122cf451f7642822609974d9478106a1e338672658473c746699f5f52ccd3ff6c979b618ecfba3c916 SHA512 bde3c112a69299b9e5f0588f6909b0364b34940b31ef2104d2ee4187f0cc7f7d999724108170d2fc705cabf631eae00145547081c28eefc425a69d992934de91
-EBUILD qtxml-5.15.2-r10.ebuild 563 BLAKE2B 0eb2cd0df2820981fc556843afc9f4627b26fbe2245c71731d5e9ff13fa38e1899adecd8c30505edfdb99ceef485e805848dc43542afdd930c9f7f8d6fa20919 SHA512 c81279277373e0fda7c987e599527105d616f3475e316fade72c57e54b7dc6fcdbaa80eb344748e93c008ab90aa90a9ce0bb62ca180e84ec4d1ea63bdacf8b33
+EBUILD qtxml-5.15.2-r10.ebuild 569 BLAKE2B a6e6bc471e73d20603a276824a08f6dcac8454a10fd9de2240b2644eee46f632dd4aa7eb91dae3abe6cde0b1e44529f1792985b352aa8462fcd0722af1203470 SHA512 311d2107abad7de950fc17d74fea64989888e3529033fbb16945634ffcc0cd4012242c14fea13b6b855f1caa9c74e35737aab6a19de3f522b79f2d01e4806735
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
index 20df4c58c38a..268662f96c95 100644
--- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
@@ -3,23 +3,23 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
+	=dev-qt/qtcore-${QT5_PV}*:5=
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
+	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 790703cb1135..e88d0bdf0bfb 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
index b83018d32077..bb2e62fc89e7 100644
--- a/dev-ros/poco_vendor/Manifest
+++ b/dev-ros/poco_vendor/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD poco_vendor-1.2.1.ebuild 789 BLAKE2B cb3a750d21f5004341dbc5f0d477ce4b813c2f78dc980741c8e28b10b84cff95e7bd70d757bad5afd38280509500f954de12d887791cbdd1833dd77cc5276fba SHA512 62e429c6e5e91132c4ae3c7e294a91a9e17d06dc215f026a9c127b21729a41fc597a03de6a727822722cef9721b08cb75db4e6c3e16912a2fee86069c06f9089
+EBUILD poco_vendor-9999.ebuild 1066 BLAKE2B c0fc132d128f0ef8f14ca3cf63e02eb33621742cbcb0455d10e0763c70b5ac1dcfdb2c81393ebdaddd4428430bdf182d0572d3bcfbe094515be2bd1aa36c9c4f SHA512 f7640ba4516c2d44ac0ab115f895084b40823161e2e6330a9fb175dded116bd1a8b12c42b7c99e77fec1c63398c0e42a65dd64291a65cdccdcead7eb3cbd3169
 MISC metadata.xml 331 BLAKE2B bb0bfaa70ddf2d70283fa683421b1641b3439ed560f135cc5ec1b4b238fbecc31268a66dc338b60cc1cc8183bf12e4fcb5406ccc42b8bcd98e3f433008edf00e SHA512 f615d33808e4b759c621f93494d007fbc438a81c754e96f60badcb7796f5ba0d570be8d925f40a1d5da625b7a33eb148ab3233a16403681bed562aeb5c4e9445
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
index 8665d91b1561..09425e587d23 100644
--- a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake shim over the poco library"
@@ -20,12 +20,6 @@ HOMEPAGE="https://github.com/ros2/poco_vendor"
 
 LICENSE="Apache-2.0 Boost-1.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
 
 DEPEND="
 	>=dev-libs/poco-1.6.1
diff --git a/dev-ros/poco_vendor/poco_vendor-9999.ebuild b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
index 2a917c2d62c6..24ec7a182e2a 100644
--- a/dev-ros/poco_vendor/poco_vendor-9999.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake shim over the poco library"
@@ -20,11 +20,6 @@ HOMEPAGE="https://github.com/ros2/poco_vendor"
 
 LICENSE="Apache-2.0 Boost-1.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 057a7779f8c9..48c11233fe34 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 4b9aa1034c71..a7dba9f8f2b8 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,3 +1,5 @@
+DIST eventmachine-1.2.7-openssl-patches.tar.bz2 14837 BLAKE2B 5f3280c053bd67c97db53814db3bbfd9bb3047d0fdae3972494a88bc9062e0f20b5684da8ba4264299a4fd5b0c159ad0d006fe78f6f1e8c0e9cdb531d98e3017 SHA512 9294ae918a51c2e7db098add3e793a2a57e40b223b7ee7113664245b5584af7b7bb180cf1dd83d0c30a316b6598a0a4507b953603c95482c42738099d33419d0
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
 EBUILD eventmachine-1.2.7-r1.ebuild 2755 BLAKE2B 6006a88f33b374d9f3f42058936aff9fa35e9f361d657be07bea276cf56bd21100b38f0c0b58400e648fb401c0f3730099f9a7d5281a51b657539098ea297f0a SHA512 c0bdba172d5027f228235649cab1ccf59f4562f88bf846697e1ece2dfa7688607ab62a40265b307946cfcf5625147d6d5daf950b0f73cb8746bfa2165d291116
+EBUILD eventmachine-1.2.7-r3.ebuild 2852 BLAKE2B addf84993bc7122148912cc550734b3ab2d43214c4583147cd2b8b5b5a4b29fe2f9a6b4f5998f2edd844746d34149d6f3148904d315f96198657d4f056a239f9 SHA512 a5b8845770ea55dd0180ed74f1bcd28d19c44bfe1ea6894bc1f69853ca770a761308cf360daa4005b883e104287a3230afa5cf0c9b6cde59bca0ce3d29b05d79
 MISC metadata.xml 524 BLAKE2B d3048a3c18741a93c913e9424e3d080ac9a68e568d201e313f6c81ec2b0b6851885989674dcf2fa3902152e0b93681b1e14330f8073b17ce389081884e168c21 SHA512 59fcb4e1c2cf8cedd8f1b09e8dfbe9a6687f8f581d115bcb905a9263aeff44171f824c7dae24bcd046d4a7a2a930e9e4aa204ef163bc8ab1b15c5874f36ce457
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
new file mode 100644
index 000000000000..ce7cdf3ce6ad
--- /dev/null
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
@@ -0,0 +1,85 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="docs/*.md CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="eventmachine.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/fastfilereader/extconf.rb)
+RUBY_FAKEGEM_EXTRAINSTALL=(examples)
+
+inherit ruby-fakegem
+
+DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
+HOMEPAGE="https://github.com/eventmachine/eventmachine"
+SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# Collection of upstream patches to fix compatibility with newer OpenSSL
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-patches.tar.bz2"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${DEPEND}
+	dev-libs/openssl:0="
+RDEPEND="${RDEPEND}
+	dev-libs/openssl:0="
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+PATCHES=(
+	# Collection of upstream patches (rebased by Fedora, thanks!) to
+	# fix (mostly test) compatibility with >= OpenSSL 1.1.1.
+	"${WORKDIR}"/all/patches/
+)
+
+all_ruby_prepare() {
+	# Remove package tasks to avoid dependency on rake-compiler.
+	rm rakelib/package.rake || die
+
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Remove the resolver tests since they require network access and
+	# the localhost test fails with an IPv6 localhost.
+	rm tests/test_resolver.rb || die
+
+	# Needs a tty
+	rm tests/test_kb.rb || die
+
+	# Avoid tests that require network access
+	sed -e '/test_bind_connect/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_src/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_dst/,/^  end/ s:^:#:' \
+		-i tests/test_basic.rb || die
+	sed -e '/test_ipv6_udp_local_server/,/^    end/ s:^:#:' \
+		-e '/test_ipv6_tcp_local_server/,/^    end/ s:^:#:' \
+		-i tests/test_ipv6.rb || die
+	sed -e '/test_for_real/,/^    end/ s:^:#:' -i tests/test_pending_connect_timeout.rb || die
+	sed -e '/test_connect_timeout/,/^  end/ s:^:#:' -i tests/test_unbind_reason.rb || die
+	sed -e '/test_cookie/,/^  end/ s:^:#:' \
+		-e '/test_http_client/,/^  end/ s:^:#:' \
+		-e '/test_version_1_0/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient.rb || die
+	sed -e '/test_get/,/^  end/ s:^:#:' \
+		-e '/test_https_get/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient2.rb || die
+
+	# Avoid test that deliberately triggers a C++ exception which causes
+	# a SEGFAULT. This does not appear to happen upstream (on travis).
+	rm tests/test_exc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
new file mode 100644
index 000000000000..4b5a42f24b63
--- /dev/null
+++ b/dev-ruby/excon/Manifest
@@ -0,0 +1,3 @@
+DIST excon-0.73.0.tar.gz 216100 BLAKE2B 7830ac608c25ac42dd5fac85d2e4fa7a06713ba49340693f23886aa2e7bb5f29cde956eac99a13f17c1f7ef987f00d0cfb3bd306c5bffd16c1bdb469be4baa60 SHA512 a58556510d8c53c7d4f71dd4846497ee8ab17bd087d5ac9248784fcd1f1dc2e46bf4dbccd22ad8e467614428fdeacc7af6768380922749f92c7d78b849e08eff
+EBUILD excon-0.73.0.ebuild 887 BLAKE2B 5c09388ff51ba837541aa865729b4100d70a055ba109b1f590da2c77ca1f5ba6284e9d6738b342b6170c9c3e4d21414a281af73b4674ecd4e40f6c72c9464f9e SHA512 f052fc3de96f0ea9209226aaf4c503419af2c788982a03e6231c6548612e9f5dd960842a152671213bc2a00833bab814d0b1c43cf4bfe29430b1a17ab1fe172e
+MISC metadata.xml 448 BLAKE2B d571a600d11154abf3426b7b33e338035ffad7cab94fb848b33bc60e0ea1997bb3b24b8b01c5bd7dd112614045e0ca6ffb09ff9e8891137dee7d8e31a73a7e6b SHA512 6721ab6317c97ea10eb08a0de3a3b19ccd5bf2933532fbd9bf6d7df0b7d236083d01303500f8c3ed1485cadc11e2c8548326d4fb167cbd6e511d7fb4fd5c134a
diff --git a/dev-ruby/excon/excon-0.73.0.ebuild b/dev-ruby/excon/excon-0.73.0.ebuild
new file mode 100644
index 000000000000..30a8df2cece3
--- /dev/null
+++ b/dev-ruby/excon/excon-0.73.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/eventmachine-1.0.4
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+}
diff --git a/dev-ruby/excon/metadata.xml b/dev-ruby/excon/metadata.xml
new file mode 100644
index 000000000000..cfac6831ee83
--- /dev/null
+++ b/dev-ruby/excon/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>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">excon/excon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 7df41b461f35..44e478314ba1 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,10 +1,3 @@
-AUX net-scp-1.2.1-fix-common.path 674 BLAKE2B c3ae5c5b5773855ad0fb20211cec90399e065be5dc6741b948304cd4d19a4ed70bd59bc3723cc82ea1455e18440eaeebbbe368939a39cc96075c517162878921 SHA512 4f1c3e747ff7e9cb9777706989e5e1dd9fca9a9326ff3a586356e8b8227c6d72e636f07e7ecabd483d01e7cbb215d2d3feebcecff8904aeee5643eff26739692
-AUX net-scp-1.2.1-fix-download_test.patch 621 BLAKE2B dc6604f8586948f27fce437a0d88a27e361fced5590c08ad49200ac96549688c43b5deedfc3be26433dac77a883cc0d1fa5b0f9182c6e344c54deb996cf222b3 SHA512 9f43d8f26053017c498f5927b00611a1aa45b892eca199bb964e1473e119591a97b325628e5904a92b25c2d433da105a00b7ba18aebaa96e471610ecb4f99ea9
-AUX net-scp-1.2.1-fix-download_test_2.patch 997 BLAKE2B 46d00f3fcd5b8ceb7f6925d0af5ea9e09ecdf83bc8f73626e7933a16ea2fa89e9a190b85e912a2bfa58f7a10dcb17f73bc19f568a3ce330036b703a37387fa68 SHA512 4540f52db9dfd2e549b7f98f7f3bbfeabde448fcdde4a801c16ad0e07e82f8e49acb0e753f8e43909487347d359047d91f1f8f963fe94ae20e929e2770e29d8f
-AUX net-scp-1.2.1-fix-download_test_3.patch 559 BLAKE2B 94ac112439548e66a9d1cb2a5ea6e83184aa298510d7022823e828317069faadabc74cdd80e684869b4ad2ad628fd97b43cb7e521dc5e15331a80632a6f93641 SHA512 a5de2e35c73cbfe3204c3ed1d1148fe124da8115a9662d3a942433001202cc5ba35f215090b3bc77dab7871aa0a0244e8a41727fa6237eb462b233ffc56ac70c
-AUX net-scp-1.2.1-fix-upload_tests.patch 562 BLAKE2B d6f6aaad4dca5c54158219f1a36bd20b5225280c36b90095b6f7d37ecf789465fd348c4a96bc8f5e298f40f4fcaacf224b0d680a62eed901101976293947a24c SHA512 9cbdafe10d985e7fec3368e344df526e51179db8fe24e172d367fe506de8c733c05fee8ca90e9d6d9d91b900fb056cc245146a4b4e7eaa8ad5021db6992994bd
-AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d3657f71b06a5561e44e8d408127fefc83bf1e05097f835522719bdab0bec1139fa3332fa55d23d386ae4528318f8cded62222a8ddf39dfe216369e510839c SHA512 45b93d1a197776ee6afde01292e9b87d24d66685a72fc5311fbd504ca429f0cfb14fb9fc1f21dd9092024de17e78e26d71e8928448bdeed279eba14393949c26
-AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
-EBUILD net-scp-3.0.0.ebuild 1044 BLAKE2B 4b912bba9210feeca1e1ac81819f7b920f380bb98729a80e470370bb6f947bb3c77201a4f9019cffd3d1d30d3bf01c6153a76842b25aad5ce48c3e8ab21b255e SHA512 e479a59f0cf1ef81d87c8144d667303ebf66223e9b610ca6300fdde2802c0a2386e9116ba484551f7316803b633f4588563a0ab26f2a0512613882aca4715339
+EBUILD net-scp-3.0.0.ebuild 1075 BLAKE2B 22d944d5ac6cc21a52a015c4cffa5b79257fd61cd755e2eb71ccbb6842e71e6964755cee00c1736940c631e0c8195538fe888ae665270390d4e85edca36e27d4 SHA512 23957869864256205298eea94f51b95401a31f0feaa3cb2452a3d1c72df4f3f3b18d8fedf0ac94dac1b75f27f62ba8b6abdbcf933ee40d8ca1412b9de7b11f54
 MISC metadata.xml 342 BLAKE2B ba5eb772d406d96ea5c4c0fdbc0ba183e44c26e950f55b54174519f25a0555a05e0eb1d1e09dd7fd91ab3a6732480225016c18e538489c5c65ad68261d3d21c4 SHA512 3bfa5a64b5bd0121a284d48b56a3914173f2562c84dbbedcbc0bb309910f68e1d3434037f21b962947c3f7cd162509bdaa9b04bb4ff550b61a4e26274bf078cf
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path
deleted file mode 100644
index ee262d238cbf..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-common.path
+++ /dev/null
@@ -1,28 +0,0 @@
---- test/common.rb	2018-01-21 16:23:07.384173147 +0100
-+++ test/common.rb	2018-01-21 16:20:34.084172782 +0100
-@@ -1,11 +1,11 @@
- require 'test/unit'
- require 'mocha/setup'
- 
--begin
--  gem 'net-ssh', ">= 2.0.0"
--  require 'net/ssh'
--rescue LoadError
--  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
-+#begin
-+#  #gem 'net-ssh', ">= 2.0.0"
-+#  require 'net/ssh'
-+#rescue LoadError
-+#  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
- 
-   begin
-     require 'net/ssh'
-@@ -14,7 +14,7 @@
-   rescue LoadError => e
-     abort "could not load net/ssh v2 (#{e.inspect})"
-   end
--end
-+#end
- 
- $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
- 
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch
deleted file mode 100644
index a138fcdb5573..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- test/test_download.rb	2018-01-22 02:08:00.000013728 +0100
-+++ test/test_download.rb.1	2018-01-22 02:11:49.820014276 +0100
-@@ -70,12 +70,12 @@
-     end
- 
-     error = nil
--    assert_scripted do
--      begin
--        scp.download!("/path/to/remote.txt")
--      rescue
--        error = $!
--      end
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+    begin
-+      scp.download!("/path/to/remote.txt")
-+    rescue
-+      error = $!
-+    end
-     end
-     assert_equal Net::SCP::Error, error.class
-     assert_equal "SCP did not finish successfully (1): File not found: /path/to/remote.txt\n", error.message
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch
deleted file mode 100644
index 55a8e5f16bcd..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- test/test_download.rb	2018-01-22 02:26:56.440016436 +0100
-+++ test/test_download.rb	2018-01-22 02:32:46.076017270 +0100
-@@ -116,7 +116,9 @@
- 
-   def test_download_io_with_recursive_should_raise_error
-     expect_scp_session "-f -r /path/to/remote.txt"
--    assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", StringIO.new, :recursive => true) }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", StringIO.new, :recursive => true) }
-+    end
-   end
- 
-   def test_download_io_with_preserve_should_ignore_preserve
-@@ -154,8 +156,9 @@
-       channel.sends_ok
-       channel.gets_data "D0755 0 remote\n"
-     end
--
--    assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-+    end
-   end
- 
-   def test_download_should_raise_error_if_gets_not_ok
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch
deleted file mode 100644
index 12df02c1f00e..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-download_test_3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/test_download.rb	2018-01-22 02:35:45.200017696 +0100
-+++ test/test_download.rb.1	2018-01-22 02:38:40.000018113 +0100
-@@ -217,8 +217,10 @@
-       channel.gets_data "E\n"
-       channel.sends_ok
-     end
--
--    scp.download!("/path/to/remote", "/path/to/local", :recursive => true, :ssh => { :verbose => :debug })
-+    
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      scp.download!("/path/to/remote", "/path/to/local", :recursive => true, :ssh => { :verbose => :debug })
-+    end
-     assert_equal "a" * 1234, file.io.string
-   end
- 
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch
deleted file mode 100644
index 73c34359afc2..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-fix-upload_tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/test_upload.rb	2018-01-22 08:15:30.996002204 +0100
-+++ test/test_upload.rb.1	2018-01-22 08:18:09.328002581 +0100
-@@ -155,8 +155,9 @@
-     expect_scp_session("-t /path/to/remote") do |channel|
-       channel.gets_ok
-     end
--
--    assert_raises(Net::SCP::Error) { scp.upload!("/path/to/local", "/path/to/remote") }
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      assert_raises(Net::SCP::Error) { scp.upload!("/path/to/local", "/path/to/remote") }
-+    end
-   end
- 
-   def test_upload_empty_directory_should_create_directory_and_finish
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch
deleted file mode 100644
index 3431f06b7cff..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- test/test_download.rb	2018-01-22 01:47:38.932010818 +0100
-+++ test/test_download.rb.1	2018-01-22 01:49:14.552011046 +0100
-@@ -205,9 +205,11 @@
-       channel.sends_ok
-       channel.gets_data "\1"
-     end
--
--    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
--    assert_equal("\1", e.message)
-+    
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
-+      assert_equal("\1", e.message)
-+    end
-   end
- 
-   def test_download_directory_should_raise_error_if_local_exists_and_is_not_directory
-@@ -223,8 +225,10 @@
-       channel.sends_ok
-     end
-     
--    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
--    assert_match(/exists and is not a directory/, e.message)
-+    Net::SSH::Test::Extensions::IO.with_test_extension do
-+      e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
-+      assert_match(/exists and is not a directory/, e.message)
-+    end
-   end
- 
-   def test_download_directory_should_create_directory_and_files_locally
diff --git a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch b/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch
deleted file mode 100644
index a23164ef8185..000000000000
--- a/dev-ruby/net-scp/files/net-scp-1.2.1-raise-correct-errors.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- README.rdoc
-+++ README.rdoc
-@@ -42,7 +42,7 @@ In a nutshell:
-   data = Net::SCP::download!("remote.host.com", "username", "/remote/path")
- 
-   # use a persistent connection to transfer files
--  Net::SCP.start("remote.host.com", "username", :ssh => { :password => "password" }) do |scp|
-+  Net::SCP.start("remote.host.com", "username", :password => "password") do |scp|
-     # upload a file to a remote server
-     scp.upload! "/local/path", "/remote/path"
- 
---- lib/net/scp.rb
-+++ lib/net/scp.rb
-@@ -395,7 +395,7 @@ module Net
-       def await_response_state(channel)
-         return if channel[:buffer].available == 0
-         c = channel[:buffer].read_byte
--        raise "#{c.chr}#{channel[:buffer].read}" if c != 0
-+        raise Net::SCP::Error, "#{c.chr}#{channel[:buffer].read}" if c != 0
-         channel[:next], channel[:state] = nil, channel[:next]
-         send("#{channel[:state]}_state", channel)
-       end
---- lib/net/scp/download.rb
-+++ lib/net/scp/download.rb
-@@ -129,7 +129,7 @@ module Net; class SCP
-       channel[:local] = File.join(channel[:local], directive[:name])
- 
-       if File.exists?(channel[:local]) && !File.directory?(channel[:local])
--        raise "#{channel[:local]} already exists and is not a directory"
-+        raise Net::SCP::Error, "#{channel[:local]} already exists and is not a directory"
-       elsif !File.exists?(channel[:local])
-         Dir.mkdir(channel[:local], directive[:mode] | 0700)
-       end
-@@ -162,4 +162,4 @@ module Net; class SCP
-     end
-   end
- 
--end; end
-\ No newline at end of file
-+end; end
---- test/test_download.rb
-+++ test/test_download.rb
-@@ -158,6 +158,37 @@ class TestDownload < Net::SCP::TestCase
-     assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote") }
-   end
- 
-+  def test_download_should_raise_error_if_gets_not_ok
-+    prepare_file("/path/to/local.txt", "")
-+
-+    expect_scp_session "-f /path/to/remote.txt" do |channel|
-+      channel.sends_ok
-+      channel.gets_data "C0666 0 remote.txt\n"
-+      channel.sends_ok
-+      channel.gets_data "\1"
-+    end
-+
-+    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote.txt", "/path/to/local.txt") }
-+    assert_equal("\1", e.message)
-+  end
-+
-+  def test_download_directory_should_raise_error_if_local_exists_and_is_not_directory
-+    File.stubs(:exists?).with("/path/to/local").returns(true)
-+    File.stubs(:exists?).with("/path/to/local/remote").returns(true)
-+    File.stubs(:directory?).with("/path/to/local/remote").returns(false)
-+
-+    expect_scp_session "-f -r /path/to/remote" do |channel|
-+      channel.sends_ok
-+      channel.gets_data "D0755 0 remote\n"
-+      channel.sends_ok
-+      channel.gets_data "E\n"
-+      channel.sends_ok
-+    end
-+    
-+    e = assert_raises(Net::SCP::Error) { scp.download!("/path/to/remote", "/path/to/local", :recursive => true) }
-+    assert_match(/exists and is not a directory/, e.message)
-+  end
-+
-   def test_download_directory_should_create_directory_and_files_locally
-     file = nil
-     prepare_directory "/path/to/local" do |dir|
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index a544e4500fd7..2a3098587cf8 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -20,7 +20,8 @@ SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 ruby_add_bdepend "
 	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index b92cfaa03f83..e38acfd70358 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,5 +1,5 @@
 DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
 DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc947214ea33d57770b5f2bf2594fa5b29b8dd9a417233de0ed243a12cdc547e5e87861767c5bbc65adb90cdbe58a484 SHA512 1d92ad19cb8bf80aec4ada23c49b91588c722551695cb0dd7b2954001fd71b4b4c030f8317b86766451847273c6116baa041c03e2415df2b0f81b20551dd8566
 EBUILD net-ssh-5.2.0.ebuild 1032 BLAKE2B e19af0235144a5bbfa6e15c3a94789cfa6116a77a56b64e70040546849a06f8072632dff3fcb55e29576317438ac48c715aedb9d093933775b4759426e020d71 SHA512 03ef7ae6bd2ae1537c11ca88f250dbf0eb79f3d0a9db1dc30f386cfa165b6f4d1095e848da9c156cc31185fa8b5374c739c289558fdea3e06a06507106852b12
-EBUILD net-ssh-6.1.0-r1.ebuild 1231 BLAKE2B 56e31d1a651b9ae9b5db8b1933d06e07bd17bef7623d99b88ba085c3ca0cd55cc5706c05225b02b140e2916670143f9eb187e3475fbd1f0590b05929fcadf928 SHA512 7892cf258a259135d913b0cd0f0585cb1f0545119f58f9d78bc7063f0a2ebe0fec0f235ef89e70441b9fc71dad0a8a02f686d174eca73042e1d6d76ae75a63e0
+EBUILD net-ssh-6.1.0-r1.ebuild 1258 BLAKE2B 5d58072a3d8b197601865a5cf2c74e31ea9ef1b63f3c446f73fd311a11fd5107bdc4198172c6450ce65cbca41248e3ff3000125f3890b317da926133d432bfad SHA512 301572ea0e6b4d1c9e6353e97bb5b00832622a08cd3573766ffeb5d1ee7c7152e9113cb39d985f4297d37d493afae47c775c7aeb805e9d9cb9509e66a8fcb1b9
 MISC metadata.xml 429 BLAKE2B 12f25e38fdd426b0814611f3036ef401703666e1ac651d807e587187f641736627a35ba117f8707208f07716f31d4df8b471f38dd221fce79109eb2aaa749dc3 SHA512 4c760e2d9799444907f4b05c26ae95b6c18eb108786ce90a5b51c58cc903f4ec90da060556cab72fb80741c3786613589a4d403c64f9b411631d6c4b4ea982de
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
index dccb52657443..0a8dc086232b 100644
--- a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
@@ -21,6 +21,7 @@ LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="ed25519 test"
+RESTRICT="!test? ( test )"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index 650e7c2ac61e..6084349307c3 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 743 BLAKE2B 265332969f16d9d3b66f4aa1bd87edf789c72866ee236222d45c7f99bf3f7b3bf8240a821581b6dc08c3e3cd05ccf9d6749c5163b650ce69ceee094f6d81ddb5 SHA512 37e27ef27880dbf7f70f6c1d5f5d2ac98b3318b947a544670567b19b68eb6cfcb238fa7c2077bd601e1277f0df127443ddf290092b572c7b81428b0bbf08f164
+EBUILD pastel-0.8.0.ebuild 742 BLAKE2B 9667ed7e498f6900ce261c5ce23aa765b857614c96a31e9110611e0f757f743f8ac9a09bc5cf1b611ad9d8ebeb9802823e86c7546ed936f42c88019e483c019b SHA512 e7ffce16fe0f28888384404c87c580a19696ab6733f8447f7170a46959c5858bf903f5ab6c9a0714df7940d14558065dbd551c0937b34750a4fac560beee48f3
 MISC metadata.xml 335 BLAKE2B e64ac8fab5af3884ede2cc3ffea05ce1f1921b6ae57f31610cedb99538d5f8dd52d0a2b90aa7ffd1d967a4cdd39fa8fdda6e3c3b67d21c59e10f8fc79439c5b5 SHA512 8f1f6b4be2e1a720b11d3e0e4bae20116df2560aa9a04e0e913751ac8f6ac878a7175069f5c928e1eb0284563b5e84c60bfbab67e06f1161c21c2402ee8c6a63
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index 9b7f000b59dc..91d40df6842c 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 0a6fecddd9a6..08a1a0eba30a 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,7 @@
 DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
 DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e1e332049311001f4d20982222fea463e4eb79ae12152c51269ee42c883cd966f479225f26c01b8e7a70f870d5ddf SHA512 5de30466e27d853c498f210dbe168c52d0e5efab5b6388c88de5667e40dee151041d6a1a9203780230dfa03bd2fb920a50b1301d05d12a31f4d31f8352218821
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
-EBUILD public_suffix-3.1.1.ebuild 827 BLAKE2B 5cea074caff09428eb037645b9ee9fbc1499097cad1d6d45cd37fcef796535a8644f70162dc378d4d66c4121b9e20cebf18b6111455f9e9fae37d93a760c010b SHA512 73eb8db8107e5dca6e4a8b21303810aac7ae7cc8984b82b05e755c6da40a91b97286fcdd41f8e5030ef8da0651387011ac6010c97f7d2910bc27de407885c1aa
+EBUILD public_suffix-3.1.1.ebuild 874 BLAKE2B fd5a479bd94cf040749c6933a6bd012763dcbc11fc200897544c85e1a7ac83839c3f37a3f75dbb34ca4a3e050b6c1c68716ee18cc137e84c0955b67ba731997f SHA512 4a019c94279f7befa531d27969399080e2b6873c24468c4d7eee36c5acba71f0110c53e2fe7505f24e28b153a6a72516d4cac40e0c9e61a4c2f156c8b1078fa3
 EBUILD public_suffix-4.0.5.ebuild 809 BLAKE2B eee66cbd7b89bbc1157e54a6a4531f3df7cd0bead94108f1d2d6c610aabd739f7765de946887100ea883840bd20f0b2d328fad52492e907c324ebab71b38ebe7 SHA512 ecb60e099f6b8e279c05722ea72ad01b88decacc45e01c8a0c0ba58541daafafc4d3f6f385adf4cfd642a45e9759a00e625d2c5a127b07ed658476ca09b5904d
 EBUILD public_suffix-4.0.6.ebuild 820 BLAKE2B 00176d535596ca14ba4abbf0513cac0450638c8ac1d609461db83c414d5b5483ecbf1cda197ce455b60110a70a4542a8353a21ae0d76524c910265d5da981165 SHA512 3f66d94c94ae7d945f830113adc5a4f3b9c70388e1572336bdea59cab41b67c66e8e21c428b9db611f338a00db8dc1e6a8d23dac55e661c7dda3ce6629ae5c0d
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
index 36a858c24618..954658807691 100644
--- a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 
 RUBY_FAKEGEM_BINWRAP=""
@@ -18,7 +18,8 @@ HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="3"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 35ceeeec2201..059bea88bcb2 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,5 +1,7 @@
 DIST rack-cache-1.12.0.tar.gz 262794 BLAKE2B 63668875cbfba5a6012f43fcfb504e99e357301b8c4b26bfd007b6d22fd9cd3d2f40b096505f9b9523c49ca2a7c980fa15c95187284a339604ca8acadfad374b SHA512 67101c2fec86db94d177c4cc476a17e5bda51d222ac8530fe6cdef8fb196b3b7ffe301003abbc14430c4f4068da0627ffcdd498fd79faebd190571bfbaec3ab5
 DIST rack-cache-1.12.1.tar.gz 262878 BLAKE2B c287c547496f0c4659f16cf45aa4c562cfccc5d6ba9e71a10a6507346797bba7d9d1e287ef1fe3d8c6bb6e8ef148d6c24d90e92db1ae53ea2f7d1ee91e3fd148 SHA512 f850facb28f302db819b6d67fd86e0dd18ae8f5d132044582bbcd6792b287c7d4a29219a47e708b5047fb373b5857632597d9743b4ba530b1258d29924ca4cf9
+DIST rack-cache-1.13.0.tar.gz 262945 BLAKE2B ea0dafe105c8c1e10815c39b928c5a86bf77a0cf3a31f085169028cb633dddd3db761138fb85b7f5da6c3374e749e898d97622994ad3a7b4972befbd46d31e3b SHA512 049302994663703ea593e01194e1c5c3b95afc889e628906e65302dd1fe64fc280bac9d26855db2fc7af1e287201a47c7f6a52329a3151b3efc775c0585d837c
 EBUILD rack-cache-1.12.0.ebuild 1323 BLAKE2B ff939775fc834b00f29263e132517aed7ed4b3c4d057998a7c0d88fdb8fa86f51dfd805bc37a98f6e0e0cb31337324ef3f23a7a4e9254c29980a4c033ff8ba7a SHA512 ea49ce160cdf8da409fa5b53a2b03b4cdebfdec6ef204d025aeed7d4860259267d00c9e289c6876975d8f8bd63cfe6ee95b5377d06058ce9ec7b6b3c5f90d0a8
-EBUILD rack-cache-1.12.1.ebuild 1317 BLAKE2B 3aaa88226504143c303a92a63efc07f079da07cb2056523992d2b02b72376a5f7f9f82c590bd4445a3a7c467e83f17594ba5a12d24847ea495b201499ab1269d SHA512 c1c5aa66726190f34d1515328ed39034aaadb8ff497bb9063d25a8f1521ff200229ab5bb558683291f6819be06beb5127c2ff66d23b63252b6a49e3559cd6886
+EBUILD rack-cache-1.12.1.ebuild 1316 BLAKE2B f41ba982000f52d9527da06c78df720c64c941b4bbb47c41cb849707d230fe13ab8c7545e7578287699ae8bc9e0368ac48245017f4c1ec13ea467905666cd768 SHA512 e55cbd7b1e8c4159dfd84635f55677cf4fb9105f98589423f68b9aa274ed9083de472c88dd8e86dd7ea780b261f4f2727f989f677c5ee1700e77fb253fe2bd7d
+EBUILD rack-cache-1.13.0.ebuild 1280 BLAKE2B e9a566e140caf36c2f0d65ed974b66a03f2d1b0533aa0f657b6b50d6ddcbb6798d0092f9f64e6988e097dd10afcda501c86f26f266949eaf2a7a453ddc641b85 SHA512 62ccf8dd71ec0a89b8160360f344527f9111446463a3ebf6f7d341901cfc7eca2bff9b7765c83c11b789ad3f6257b9f7f10f2c951ea5f2ef931bc1344307ffa5
 MISC metadata.xml 336 BLAKE2B 8ec6bc6a5c4e0f07711f202690dba8fc84111f8173f5593a1e02ebd33e410e9e6381a6887e8cfb678953a3e7f24696228766693544460e87411504de9ed601d9 SHA512 48d46de12b863bd4a04d9f7fe0eed9801d6722e14b3f63073cc154133f7ec108a5643de5a3351c1074e530a1716140859c50cf631a1a6f8f2b57a17802943ea1
diff --git a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
index 096eef9e410a..bed74014d5d1 100644
--- a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-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"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild
new file mode 100644
index 000000000000..d55a9fd4627a
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+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"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/maxitest-3.4.0
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		test/test_helper.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 33f6c678efd8..95dd69f87d83 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,5 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.10.1.gem 15872 BLAKE2B 1ddf4fe8de7cdd348e007ac29ab7b41667092439f9b70eeae49d7e917351c73512e43a7ccf6679af1c9225b19efadb6a1581f63e1958d2a31d61f2bce5a13664 SHA512 7831a6228f2d6363e634b8d6b4a12206f19b96098e5dfba1d27b1e994a7284a5cb58cd0299d861a6ff275fc8248c0e68faaaf786d6222ad68f3e6b43ccea29ec
 EBUILD rb-inotify-0.10.0.ebuild 1022 BLAKE2B 33d6137fe2260e512f2011e3a8e9a66c8cba92d0256ae897fe08601fa89681fe5f399d9c9f0d95a4f2b04e183d5860a309bc81172d8afe21bda4a5c1a06bf60a SHA512 54a8293a827b9c1ab73d26f4296839d8fa1a79c647ef807ab21e56daccc27baa5dad13b0a68fe3d6c42912ec6431ccbdc8bc1bd6e843d4023084a1f43761c283
-EBUILD rb-inotify-0.10.1.ebuild 1000 BLAKE2B a5b3764fe00abefa6ae82504502b54d461b839a66db0fc89c9da1429dbfa0b8f81e6baf0334fa05a2a1f7786cc5660597ee626b4c112b1c043c42d3b23371daf SHA512 787fa6d362d4a4c4ab69218c4d249ab515767ca7a8fbd8fa75b0dfc45d06175205f7b396f0344091a180d8102233b693fc8f737a2b15231d7d4cdc18aa893f12
+EBUILD rb-inotify-0.10.1.ebuild 999 BLAKE2B 9997965b4647b78909d401a0b27ad7dfb9fb294abacf59f547fc80a159228d1951770123fbe2358cfdd4d4f11bdeb2827749e99ea75fe185c76faea00f08ce0c SHA512 0f101cdfcaebe733679e8f1d45ac09262289ca59f417aa0ec75445d107a476807884f02f6a3c7aa3fcd5375a2f8bec33cc0cc932f6b56f277997b90b056ec0f5
 MISC metadata.xml 342 BLAKE2B 6f4587e7af70218aed1523368746721fd9fc5431a52adf87f2ecd31fcd3027564744087e40b0e3ae5282e2b7391b2e0bbf95121b691730796a2470c276d0fffe SHA512 c9ed5a3b063886bba917410aaf1bf45b5da718c29299197369e29e4c5a567df3ef5791f934dd265b9904a557a4a9761d8df5ac5f817eedae74e7577ccf88b5ee
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index c5a0ae251b0c..3fbe2a1e8e9a 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index 96fc1c70c8fd..8f636d2d71e8 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,3 +1,5 @@
 DIST roadie-rails-2.1.1.tar.gz 56419 BLAKE2B 6a54797c77267a61ab63d72743fbd3f98d4137d917ddebf0335c30d03e5efb9e2907679237eea168384b54ea93bbe9be3aad4dcbf6364d411ebaa6e2ba7638fb SHA512 ceffe9746cded4f5dca83c614dc6ffb65203455775df9f56a402837018c0a322c7edad37ca05c72bc70fa8d19cfb4f9eba5b2fde1cbff7f8b28312e95140f353
+DIST roadie-rails-2.2.0.tar.gz 56005 BLAKE2B b3251d095074dcbaf6879f8344a9f6d1426abd2824a667f8ddb1d6be186c1c89bc3425972abc62495038b263780339840b792a961809e80d181c043e8f558012 SHA512 4042d549f19adb48144306d7f646d7462b72c3775b41e6ad68ffc75aad8704c28f828bd2928fc9cb3a97d0a2ebee86446b17d2ba31d3b1b163e668cb4d85bb0f
 EBUILD roadie-rails-2.1.1.ebuild 1152 BLAKE2B 2f45b36d39da532391e21c071a8b163d34e5ef9b16f2a81a34bba365ce58e352ad29c07b25ea0defd2e7b1fa2a57e7d1d6496323aea58fa9fded841823d5b7fb SHA512 26bf371328d17e0966e57314a89662fb57783d5c8f42365a34adac82eea2db33faf1073a23095bfc50f8e107a592e2a86f94fa22ef08b1095d158c7d5b670077
+EBUILD roadie-rails-2.2.0.ebuild 1521 BLAKE2B 9583e05c5ade8d94d1cb781f6ae739abad31c60f42f4208be7c495f9a5ad64e97088e90cf186c9a4757ed7fe6f4b041e6e5a2646d9bb0842fe447ea8c3c8740b SHA512 12224ac81e3ee15951139ab6c5bea4fc8894b25b92a0a16d28685bf7bad07af85b32e8d59079ef56f9c39826cd0dd379ba16bfc3ccbfa22a3a8c6b22552527d5
 MISC metadata.xml 335 BLAKE2B 6ca09a61dab3b094b39d25ed398ddf94202e32c9173a7df990d8929cad1d19f12619c72f2cb69a735b2428c16c3e27183d3cc0efd213e419f6c4474264eb8a11 SHA512 f2b96e715dd1be8143e1562aeaf866198c9756af2137708a20b602831184e32e57056f9f9cc0e26001f2831c2764ce34510145879451ada4f37735796593bf4b
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
new file mode 100644
index 000000000000..fe6ad76611c9
--- /dev/null
+++ b/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
+HOMEPAGE="https://github.com/Mange/roadie-rails"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend ">=dev-ruby/roadie-3.1
+	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		|| ( dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
+		dev-ruby/rspec-rails
+		dev-ruby/rspec-collection_matchers )"
+
+all_ruby_prepare() {
+	sed -i -e '/codecov/ s:^:#:' Gemfile || die
+	sed -i -e 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid already removed rails version
+	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
+
+	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
+	# Fragile test which is affected by dependency versions (unclear which)
+	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
+		-i spec/integration_spec.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/rotp/Manifest b/dev-ruby/rotp/Manifest
new file mode 100644
index 000000000000..88a7f61abf17
--- /dev/null
+++ b/dev-ruby/rotp/Manifest
@@ -0,0 +1,3 @@
+DIST rotp-6.2.0.tar.gz 60000 BLAKE2B dba270201593425c9282aca71efb33ecacda916996ebfffc703dd865a6c6ee3b3da4098497ce036a95157089d8d736e9413d0aa9fd0dc582d4b278ce811e05d0 SHA512 938cf9feffbe7e86f542c6dde4cd87b57e2ddd2696303e69cb76bc9fb04ffb40c9a5ef45288f23cb096d9f6706e0b48ad89907dc9322594df10c8c0521feffa1
+EBUILD rotp-6.2.0.ebuild 858 BLAKE2B 146db7bc372c6ffe03d9041d9b1d5e4edecd3d7d48abf87dc6ea405186144b520416ae3009967bdfccbd0afa20b481ff349d9d9e8ccd16eb57a6541e071b1414 SHA512 60c9f2573964dd69c0d33b14158434da4e536aa817f137fe79802c3d599b08f8d191040ce454c6c42d332e764d19d78e219ad73383e82728f9eb5d91a14ee50e
+MISC metadata.xml 525 BLAKE2B 573d42b41ba0fbca4405ab859f12793a175791b2dd3ae72eb69b9a1c85460ee6f235fc76a59acefa68e05ede0ec5872ff3878caf9086f576a9c1d588bc6d7cba SHA512 b3d84c83bdd186ecebe8adde73d27be759440a3ea36594fce4656b5ad1b4e476fdfaca85e76e8ef9b36490e6990cb3da3ef612010060b96850f6330e6315ebe5
diff --git a/dev-ruby/rotp/metadata.xml b/dev-ruby/rotp/metadata.xml
new file mode 100644
index 000000000000..e6795abd2b98
--- /dev/null
+++ b/dev-ruby/rotp/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>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mdp/rotp</remote-id>
+		<remote-id type="rubygems">rotp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rotp/rotp-6.2.0.ebuild b/dev-ruby/rotp/rotp-6.2.0.ebuild
new file mode 100644
index 000000000000..cf584132bc38
--- /dev/null
+++ b/dev-ruby/rotp/rotp-6.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby One Time Password Library"
+HOMEPAGE="https://github.com/mdp/rotp"
+SRC_URI="https://github.com/mdp/rotp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl"
+
+ruby_add_bdepend "
+	test? (	>=dev-ruby/timecop-0.8 )
+"
+
+all_ruby_prepare() {
+	# Remove simplecov
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	# Don't require git
+	sed -i \
+		-e 's/git ls-files/find/' \
+		-e 's/{test,spec,features}/spec/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index f33ad748816a..2b392169ef6f 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,3 +1,5 @@
 DIST serialport-1.3.1.gem 25088 BLAKE2B 391188ff8a78f3998c82b17668a1aebad737643739c8087c4f32ce719dbf7bbf5f29cdc0717ab16f196020a227afc4fcfc29409331b2aabf5c6bf3382ef3496b SHA512 cdce9e13065cecf6d090d716626abb399bcc2a079be7bf1fe7755a20360218550f2f31980d62d8aae1fcc62fc62d6f7549685f865e30d2a5f40a617f5f197ed9
+DIST serialport-1.3.2.gem 25088 BLAKE2B 035e7bdb8ef321fb67ec63283c0e4c8fbf8f909ea3495994716b95cc55f212561a09a87352aed67290d96b54bb26b7802e5ed37c27e67291d768d7eb6d30850e SHA512 ff78fa04183108c2e9c5eb4f0caa9f8072a693a2a120ca084476b4125ca32ec67a6fb268bedda3ca142a9a397dbc585dffaab88f339fccc12e5ad03a09d4c28c
 EBUILD serialport-1.3.1.ebuild 992 BLAKE2B 15d5890577655e93615c40d4552c8a4b66b28ec4a9cf48e02629d43e6baf0d5ad85da3108bb82989796dba27b741a373b5957526ad1504e97afac499cbd3cc47 SHA512 7f8f3868b2be64d531a596acfc0ef4f6e22bf2449d03d74680eec2ef906bb4bbf146907a1592c21065658e7738e11e74ff4dd25bd752630ec44ed30294ae3031
+EBUILD serialport-1.3.2.ebuild 756 BLAKE2B 57e11b0448a65b61a4e6a447cf7bae674a510e9f7d452b3678224db5654ba0025464545da102e09deb4fd195b2a739e291d030a0b6363da0b08acee82f1d1b63 SHA512 a715755e77fbd02e74bac416c9ed008eb3e8684b4a5b9a0cc7be62f96c58806575778a9c77e8d9d9295f8bb9763d830b33bab999991bba2602060619f9e90eef
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/serialport/serialport-1.3.2.ebuild b/dev-ruby/serialport/serialport-1.3.2.ebuild
new file mode 100644
index 000000000000..49a58625d129
--- /dev/null
+++ b/dev-ruby/serialport/serialport-1.3.2.ebuild
@@ -0,0 +1,34 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/native/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a library for serial port (rs232) access in ruby"
+HOMEPAGE="https://github.com/hparra/ruby-serialport/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Fix the miniterm script so that it might actually work, we'll
+	# install it as example.
+	sed -i -e 's:\.\./serialport.so:serialport:' test/miniterm.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc test/miniterm.rb
+}
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index a867e7f4bcc3..719c4810b0fb 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 726 BLAKE2B c58612fc297edf04d4bc4d2be5d5d5374a94c2c5d761d7bb4916a8f99fc118cd8b82274eab0c989865d53696bba41551cb51d56a6112149bcccb84d6090ede04 SHA512 28dea90e2cdd3fa7155e47319e3f8ccbb693bdcaac1b466d0ff24e5e569b2582e6e12b84bcbe6ccf3da64cf703adcb6921866d8e2c25f8885c33b65e337ed9f6
+EBUILD tty-color-0.6.0.ebuild 725 BLAKE2B 50edf9f593cc3c985a0d8641cdf64d658d8d96a8cc9bf52b77b8a034ba9fba947a13b97d146d24e2843c9ef3a1272e6a0852f3f299c6c9102e023d4f2e8f9f0b SHA512 cd6530673fc3e131431a4db38ec89e05335c41560430dbdca2e696b430a6d43def3af2d0bc25572fa7ca07153d79be287f2835e01308ae0fd246d73ada9bd0e4
 MISC metadata.xml 338 BLAKE2B b5af92054df120ea06a7a65f578595bc74e561bcfe17d8ba4ef02c18506a420f5a0804a7661ed6357ccc2ea6b4730528e8014327ed2cd7ef997d7d7f0cfa6dbf SHA512 f54e668c43bfa8aa103feeec8af8513240a5204139c88b40b4845e1bc5b535f299900c8861a7325efae7583f39e6a4625907f9a2b9e5f000a6f85f4ce1e4ae7a
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 0c16e59453d1..a28299e6386b 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index 7533e4e20a74..02245b1eb078 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 771 BLAKE2B 9d0d117f2dc0a1ca8e3280fa1591d6d6de4c9ab6d08a5fabc0d2ed5abaeb90535bf1d65c5eeeab793794364f0a3ed5cb3b48cbcbe4707ef68cb733671174ce51 SHA512 14f7350cbd5432fc41c67a557b64c55270f3704e9a2121307977d9fc4618cc14f06f4bb3d15bdfbd576ec539d00491a20d944bd2bc9adcf178b61dde03ce02a1
+EBUILD tty-cursor-0.7.1.ebuild 770 BLAKE2B 80ea5ce07cb666c79fd884bc4409ebe9c4f0a738fdde11c6051eb8b4d4b21f3a818f32e08c684db41e8a82ed3be2ede6476535ddb1e58f3817404b86cc685c4b SHA512 df48ce0608f9bcdb72581d0f634eef7f1156cfdd35d122030984b866bc8873d23cc7673aeaea6b838a43edf65c731cb7361711a1e935e338135e600ef6fe2602
 MISC metadata.xml 339 BLAKE2B fe18cce74818bb40c2414d8e9c2ffc6642133ffb1852b7003a4d8cb84098a26662ec7284dd991d1ab525378ab9af81303cc5c2c6f1f79811a3fc49d867610d88 SHA512 f489e49c37ba066bb3586fc50ed7deceff038d684f15e34a545de37e487cb55961d88d10d8b05b009e049f215b21287acdf080790ba15c78e9a2442897637192
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 e15b775b7618..fa2f0e21e8fc 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-editor/Manifest b/dev-ruby/tty-editor/Manifest
index 50a3fd6531b8..8faa3ddcf146 100644
--- a/dev-ruby/tty-editor/Manifest
+++ b/dev-ruby/tty-editor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-editor-0.7.0.tar.gz 18140 BLAKE2B 917ea287b30588ffdf705d4ea06c711884b4dc7ba348f9acd08f0cf4e71c854ebcec6f7b8285e9fc1d45225f8ccb295dcb23b9493fcea2ac831c352cd7cc3680 SHA512 c5d6a781b0be00ee14e6fa30ff0bbb26fd9548726ff0e101163a8b4206bec9c7ffb520679041c1f174c2f65d76ea71177718a6fc5e06e8191dc5510aafd33175
-EBUILD tty-editor-0.7.0.ebuild 783 BLAKE2B 321f77e248bd627dae20198d60abe34e4e09b501821208da5aa67ef787a820acc17dc9f97350b18a2210434114853ca86f34cffb8d390cf525feeab899b0b302 SHA512 0396ee2d18d6011c6b70fadcc6943d0eed90b5b1178779cb486b6b7699cae19c90a74b7e82c003d06ee185292aba453dc54ce75638f59233bd78d3a8ddfc9967
+EBUILD tty-editor-0.7.0.ebuild 782 BLAKE2B 8147142a06296491cda023dfe62c025d87421dc2c5aa5a65c52270903050fdb5e03545749aac2dff3015048c4b65a1656deb42512256005aa5616e53edaa33ed SHA512 e6c1099a38ce1a6396b70537633bca47762f71fc46aeeac3e93bf7493f982f4cb07f1306fabc63e7a3af763477c6fb49abb6fee9d8dbb5f0453d14cc996e2742
 MISC metadata.xml 445 BLAKE2B 9570fbd3b58099e60ab39f3b448ff667610cc8c24c364b4b9eb0ed219800bc760ad3fa5bab18f692212b4830066ecd0b56dc295640c1fdad54ef5410613406f7 SHA512 665f2e4c590b25ac1649906832153f17bfbed365633c1440cb3745c468b870e4ffa5d2cef824ce211c92bc3caf10060bd560c0dec87bfa833521172a985e7da9
diff --git a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
index 823b812203f3..b87eb7c22a6e 100644
--- a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
+++ b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/piotrmurach/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 
 ruby_add_rdepend ">=dev-ruby/tty-prompt-0.22"
 
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index a667180574d7..22fc3bc54497 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 798 BLAKE2B dbfe41fa43f9b405af84ffd5e7421ff090110690543923159789579fc224b36d9805cfafeeeaa8a747925a7e995ce740c38dd8f0a1e9d2083d01488138fb20d3 SHA512 e104e451e756adc9e52e5349556633809f9f1234c7b25679eca637c7cf591f3ae9a7bccbe9a841a01a7ab48ada258ed406096b768774a489dfc47b39b317aa34
+EBUILD tty-prompt-0.23.1.ebuild 797 BLAKE2B 93c10545b8846fcf7a3d83e848b78f4c54c2ab1567e6b2db41683ff1d2c580e5469c54ba5308ea6606b6a3ef8faaea5a86f821acb770c2ab68bfe70a55ffc4be SHA512 5a302da968d389183501c9be8f1c3de44ff1eb3898553c38b85d28727b344f134c71906e9cf9af30d8fe06257c968cc62c15bc08872f13953f933542ca00ce3d
 MISC metadata.xml 339 BLAKE2B bc595203d2c93cddf7ed31e92cdd0ee86ed74ee4d40fb2d36a14a50accb24871a493b15351e3b00876abf47833611c71f6e2c0ea22b68093f7b8140203876327 SHA512 42289de16764b35a85485d581debbd4896dcad29c6c57a0a0f897602d06708e2c25c42e811c2fc8caa000f8daf30b1dddee781e8f4909968e52bd51535d44e66
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 1e908885132c..2c855c1bce84 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index f8eaf0d18a8f..72a2a4068ebc 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 873 BLAKE2B 3347e5cdcb0703fd318064223d9cd5404140d8126e6fa7bbc52d20b020d48151bdd2c5af475c402d71f7496734a7293fc167cb9ca876aaccf965c68b55b7bc42 SHA512 36c0597f95abe116b70c4945abf7231bd093a6fc6e071ba42683989bfe9d7f3eb842dffefd2df83843abf46e8640b7059b03b83a9844264e2f75fa053190c2f1
+EBUILD tty-reader-0.9.0.ebuild 872 BLAKE2B 3313a43a838a0062772307a7436ab322124b1069b254a2d04a52aa3441874b63244f3ae10f6ef5b1368a074bcd8067aa0cd74940a624d477f9238231ce7b9e60 SHA512 cec807cdd5a3a0c6e0f5eadfd6052b1174241e700e984183c0c08e7ef71679c9898807e07026f973278ba57ce0366e9192b86a40b4b7ae96f8d88c7ff461ff7f
 MISC metadata.xml 339 BLAKE2B a3e0cc05713c588e4b26fce8a5975467daee7d90d9e01afede501fb829c7898fc137b76747e00252559da605607b4eceaa9e44721710a5c2d21782f05fde8eb9 SHA512 83bf2cee20f0dd32baffaac2f46fba0656834de410d743cd476c5800126a3d767a136114b0ae200938a7c9c73f452fbeebcc14228ff4e788f393b50856a9e320
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 bc67dcf576f4..326f0d7163fc 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index d2e7cd6e129f..da16d9c688f3 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -2,5 +2,5 @@ AUX tty-screen-0.8.1-ioctl-test.patch 1650 BLAKE2B e7e6e59a494d4e450ff5c7e4c6f0a
 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 853 BLAKE2B de0863ffdd4f37ac5de5b1d1743d11614ebdb52ac6d046625dbd46afb27eaa329e7dd656b6ba5755f9655506172ef86dad26fc72b12211c2ca95a00090ed28d0 SHA512 8c557d4f93f334501914167e57ffbaa33c26eb6e3fb26c468db0e0360a600d6e0768a027c7228b49e1173e28ec66466c9d7ec6f87a2dd6c6bf9bd86a8b662b44
+EBUILD tty-screen-0.8.1.ebuild 852 BLAKE2B 90d7382f7edc2048160a2373600e9173d15ba52ad4e56141f6c80fa69726ca78e761a1982211cb7fd10384f49141ac376b3acc93abff9f5e1f411ac4015ed242 SHA512 b49d736b771a888df4a6f5ccd47aa73aed787ea61bbab253468f8a374087abf6a025efee01296c5481e25268ac8d187387b227c08e97e222a4ce1497b23ca5c2
 MISC metadata.xml 339 BLAKE2B 9f3e4ed8b89e91c69c11551c7b61384934543cd9b56cf389fb6f423722ae5e00f6c269cef8fc8b413d31da1b2967656504c21128da60055878ca20406196e52d SHA512 1a82d0b0fc5c7f3f3a8924289d3c957c3f956f01e36434ca654dea5f469a149b8a8324c4709bafb1707400dc57413ec42e5a4d74f9454cb0792b6ea45873e6b4
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 f69665e83830..14a4e759c105 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-ioctl-test.patch" )
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index 9c297aa7f432..46a3542d0d2f 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,3 +1,7 @@
 DIST vagrant_cloud-2.0.3.tar.gz 14854 BLAKE2B 823b9ffbdb6896422e32e697075c7e9ab16ae7a299d6672eb497f17034737d2d017bdd416b56191149044afe97ee06533213311bb5e9da603e9eefcf824c8df7 SHA512 4431aa446d9bce2e67b121159a8345562b41c86937b2b1677f0397494521137fa66c997009632011caceeee9565a5a2b54d4ef6ef1ea9d4ac74ee35f8c149f5d
+DIST vagrant_cloud-3.0.2.tar.gz 34177 BLAKE2B 299014b569deac667429d90b8952f77a835669e17cf724ee7f5b6fd135c1a3f16b9292e203a75baf50cf117022d0ab4d31f797c432a07386097c6bcc338ae2da SHA512 c7e5050a0f3cefe95ad38e0734317a93939de0b54251163be1a52dfc413cdb08a4bf44e1c73215f81a0126552242a1d9f2cefe8fa43d9e60acf41ccdbed0ae80
+DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
 EBUILD vagrant_cloud-2.0.3-r1.ebuild 811 BLAKE2B 869712f0a86037df81e293b66702eaee26c10214586e0a998e76da959a85763bfe5be20bae6803419353b90a0a6eb4ea8be31e04e71ff57801ea093836ca35df SHA512 1ad8ad24da9f87dd080efdc29db127d3f6c75f95334410f3db2cd351cd6299b8be46e9c7658f193752419770151f066cd0a485b89bbadb989ae0b9d5eddc9c1c
-MISC metadata.xml 256 BLAKE2B f14d6b85b70e116142c3a238692220b6c45c7f11efe8473875a52e40fca1dce96ba15eac2a33672deeeffd80615ab1b4c7a62c7c72f85cd2d57abfcc5d78c8dc SHA512 1caf3082bbc8bdc014bf1800559dca57cf317b913d6d64eadc3fe97c8c5d0312dbb20dc43ae8354baa5a0f58a13390182e24f81898f8ed44e5246047cac6f7d5
+EBUILD vagrant_cloud-3.0.2.ebuild 920 BLAKE2B baf0ef9263dcdf872aa2978bb62187d68ea1bead04049e94af26237a3f03f9a26c9a6f4b3bd12589092aefb3c81dc63041f615a2eb395160da736bb0cdf35ea3 SHA512 334260a27a1dbcee7acdb49675f7482f1cf134c6d7056b2a007653f7b0126e44ec615b876c1479166ed30b2ed39555f87918f86da4d182c66427b6dffd574df8
+EBUILD vagrant_cloud-3.0.5.ebuild 913 BLAKE2B 741a60ef19e7e18a4e08d88b9026ff897e95a32b01464edefb7e9cd9b384669f9d3d742d5ab8029cf4ea29c66e18105a19b63ddc569f84a9c074da07e2947f66 SHA512 b468e7a26a9ee1da4bd0916cf74e5248cb89c2fb8f02481dc289eaa9512cc4ee0568cc21afa24e845b67466d6b04fe49b5b048542c67ccc504853fd2306eb62c
+MISC metadata.xml 461 BLAKE2B 8c2cf50a097c308798cc3631fa3bec6f32e3d36d7b9c3c27445a43783a504c9390ea32ac5b1f419e197616728cf419d451490d3e6299ebb85eb6ae6b71542650 SHA512 c26dac7d5ce25b0f73794e9a7aa6dd2492d4b97ced106b2b76edcf4eaf9b83aea37940e918c2b22cb2f8ef019467bd30aaa9d08895aeaacccbbbb37fc28627e1
diff --git a/dev-ruby/vagrant_cloud/metadata.xml b/dev-ruby/vagrant_cloud/metadata.xml
index acb950994f87..3cb8a3040b39 100644
--- a/dev-ruby/vagrant_cloud/metadata.xml
+++ b/dev-ruby/vagrant_cloud/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hashicorp/vagrant_cloud</remote-id>
 	</upstream>
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
new file mode 100644
index 000000000000..4e3c8bb9b807
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/excon/s/~>/>=/' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
new file mode 100644
index 000000000000..2a3a347153c3
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/excon/s/~>/>=/' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index 9349e67e743e..484322889363 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 565 BLAKE2B 03fbbd25ef34a2fc0b24754d36a181404cfec55f3f7aa2ac0a94d41d9d6d691102dbbb1d308ba50d45848230ff4393bf57cde93e894ad7d3ffadc6b4d2aa75ad SHA512 ecc4caf3fd09e45efc6940867f9c2f18e71ffa47ed63a6800a4ec04eb26af15d33bd29b08dbda31de85faaf888bc4f76ca53e0b8da77a8c5a614bac229cc11cf
+EBUILD wisper-2.0.1.ebuild 564 BLAKE2B bc79c10bb4d04433882ea184806e75d6eb4b86ace851004ad27db6ee7a133252cdd2abd9135c957b5fbd1fe3f80afd4cf50c95434509613f5ca60f3dd686be73 SHA512 075957efe7b661a65c9b55c0e2d4a01f896f1c92377773646a2ac2fa318502684f3b3b5f2f1672499a40007a9c8f796f354643b71db3ea3c5b5ab568e20480a2
 MISC metadata.xml 333 BLAKE2B e762b1f26553851cd58f0fd7a87870bab5ac26592ab5fad0bd2c9fc1addd229bbc4e6b05cad225d115577f3f59ca633c65a00a52c348dc7ceeafd062557a470f SHA512 7caf69e35a8ea5ccd4ad8c4f9e455dc060ed2377a8a95d548c80823296a95b7562fc272bbafcc9adcb66430b5ec82ea732a1fbfc935fbe70292e6096f9c31f3f
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
index 7cd053cb7cad..2c32dfb28df6 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 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d60a68276c53..2be0392d49da 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 362fc9b83a2c..996948986e7d 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,12 +1,3 @@
-AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
-DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
-DIST android-studio-ide-201.6953283-linux.tar.gz 926213072 BLAKE2B bdcca29e75348230c37a141423faf27eae75f299ded1abb3aad12605cb5be144c222d15b998ff16203a035311a6a26d8ae4ee28f337098c78377c5df4e7fcf08 SHA512 554d53596280aa96349ed0b3808599cf315c4f1a439ff57cd2368c6a68b57afac620b86d742c2f2ff72d718a62e33f4353202b3bc3671c0fe934cd8d79f74c0c
-DIST android-studio-ide-201.7042882-linux.tar.gz 925365363 BLAKE2B 337db94154a44ad95545b1f6ca48d9f95773663607ed2de415ae04ae80ed10670e9906b0bcac539d539455964a41c2af117557c4ec0af58b14fcbd175aa44197 SHA512 c7829df5296172613c8bc01d699c7581d27f7604e182143bc8ba4c8503771b4e290d16c4dd3498f1d5701eb8d54adc7a61b2a0967454d99f5ec2a10d697e5b56
-DIST android-studio-ide-201.7199119-linux.tar.gz 925388022 BLAKE2B 64f33e97a0428e332fe6bd9800d3710055a4f2657000cc0d799d6ee05b070fcfca80a8718ec0a5ae5affc05def401e68920d1dd6146c967ff011361dcc4d57c5 SHA512 5757280749f35f149cd776ad7c67e03853a531ca0fc633f2138c18052c09fb9abec6d330bc104f4ab6dd4970cf1dc23e797e14d2b0067ed75208227aadba4403
-EBUILD android-studio-4.0.1.0.193.6626763.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-4.1.0.19.201.6858069.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-4.1.1.0.201.6953283.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-EBUILD android-studio-4.1.2.0.201.7042882.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-EBUILD android-studio-4.1.3.0.201.7199119.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-MISC metadata.xml 314 BLAKE2B a0ebedab1e44cd55d61163dbbe73673c6901513ca00caebb168800b6937a1702053fb6ee147b62c1603ef4f304b0008f80e27e95ef318540552ebebc5506bbee SHA512 a572d6084d166d0961fabe828d3566336e3a6542b0d2bd3021cee1a92ef784a9920ee3ce40c0f6b47ff255c50c51448413f4d56f8796d2e80dec942ec1caf221
+DIST android-studio-2020.3.1.24-linux.tar.gz 980631631 BLAKE2B 11968ea566b8f03810752ecc1d50068420830fee04df16f579e88bc94e4bd25e7d2c731df608dd27a983e8d0a27b3622d4c73902bde0fc134915f2a3bbf3189b SHA512 a03305b3540a0473b93e0e30ae82a1b7cc77c9aefd6abf96b352092ce5c51012a6be0d55af1b406a62b9bcf3c4b83ec980d0ca1232d22031a97b0f455060f2b4
+EBUILD android-studio-2020.3.1.24.ebuild 2736 BLAKE2B de86ed17f3554749350b471582a8ee8479d589b25c0e43b73750236cc1d531ca1d5cd423078c7095f8b7da06318dc33fd9570f99d06330def6ca9ead225fa97f SHA512 fd11c80f2d9b0e62b2394985e221eb7a9c48c56e95192c8ff91a25992c7773662d560dd3304ca51c9ba7d850462d29665d6eb9b9d5727b18a021c4e72925cd76
+MISC metadata.xml 298 BLAKE2B 8f13e01e8c5a24c9af764e8882e2d5677ebf485cad143f35720ede0d491f2c09fd009ce48433cd33f863fb618d6413eac97e07a6d3526f5c8e679d9e51995908 SHA512 2c9d3c5d14e2499fac58df1d3cb2844172833f371fe4d557791efc0848b879191bca36aa772792cea6edd8f6e3be83452a188c0db043906a46c87af0dcacd4e2
diff --git a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
new file mode 100644
index 000000000000..17e178391136
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	opt/${PN}/bin/*
+	opt/${PN}/jre/bin/*
+	opt/${PN}/jre/lib/*
+	opt/${PN}/jre/lib/jli/*
+	opt/${PN}/jre/lib/server/*
+	opt/${PN}/lib/pty4j-native/linux/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/android/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.8/lib-dynload/*
+	opt/${PN}/plugins/android/resources/installer/*/*
+	opt/${PN}/plugins/android/resources/layoutlib/data/linux/lib64/*
+	opt/${PN}/plugins/android/resources/perfetto/*/*
+	opt/${PN}/plugins/android/resources/simpleperf/*/*
+	opt/${PN}/plugins/android/resources/trace_processor_daemon/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/android/resources/transport/native/agent/*/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/c-plugin/bin/clang/linux/*
+	opt/${PN}/plugins/webp/lib/libwebp/linux/*
+"
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1
+	virtual/libcrypt:=
+	!!<dev-util/android-studio-2020.3.1.24
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+	fperms -R 755 "${dir}"/bin/lldb
+	fperms -R 755 "${dir}"/plugins/{android-ndk/resources/lldb,c-plugin/bin}
+	fperms -R 755 "${dir}"/jre/bin
+	fperms 755 ${dir}/jre/lib/jexec
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild b/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild b/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild b/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild b/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
deleted file mode 100644
index 6f97c7d3f925..000000000000
--- a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use JAVA_HOME before bundled jre
-
-Must keep bundled jre symlink around in case "Use Embedded JDK" is selected
-
-https://bugs.gentoo.org/613868
-https://bugs.gentoo.org/660404
-
---- android-studio/bin/studio.sh	2018-07-20 13:43:12.339049033 +0800
-+++ android-studio/bin/studio.sh	2018-07-20 13:43:38.494932028 +0800
-@@ -73,6 +73,14 @@
-   fi
- fi
- 
-+if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
-+  JDK="$JDK_HOME"
-+fi
-+
-+if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
-+  JDK="$JAVA_HOME"
-+fi
-+
- if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then
-   BUNDLED_JRE="$IDE_HOME/jre64"
-   if [ ! -d "$BUNDLED_JRE" ]; then
-@@ -83,14 +91,6 @@
-   fi
- fi
- 
--if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
--  JDK="$JDK_HOME"
--fi
--
--if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
--  JDK="$JAVA_HOME"
--fi
--
- if [ -z "$JDK" ]; then
-   JDK_PATH=`which java`
- 
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
index 4c831eddc64c..c61e3dc74f4d 100644
--- a/dev-util/android-studio/metadata.xml
+++ b/dev-util/android-studio/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="custom-jdk">Install and use Android Studio's custom JRE.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 9ebde5176a77..54f94aba20e4 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -10,5 +10,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-build-1.76.0-r2.ebuild 2155 BLAKE2B f3705ae6770e374d00d4405335662c072dd475dc0a230cb2fc376bb84374554cf11dfc07df059833630ea0131a2f3bce9f4d0aa0059fff33b0996d12d1d1d33b SHA512 b68b1bbaf0713cb0901037d731ba7001d0cab9bfec248bf0f6724211b2b50ba7a759d9f5e0bc66070f37b60c9207dd452bd63f69007ac18d5370316dc3443651
-EBUILD boost-build-1.77.0.ebuild 2116 BLAKE2B 5cad580ff99e6c9a88dcc05665e3fdf5de5cd63e2adc32f0f015d8e8248f2a32285435e586543deaa115c707073d224b0c23dbd2001139bb63aad95273ebd0f1 SHA512 56169c216bdcfbb0e3585e72d9d5ae82a7332db0688a372698f82209fdf51d4d0e260c58102109f42d2a8d271a580cb11069ce3ab5fd8f65f149ec9943ab0546
+EBUILD boost-build-1.77.0.ebuild 2122 BLAKE2B 8327046ec652c24697e0273e143ecc6639bc5cbd63100e60194a0d72e8674badd989b0453922d30d5470fd77d6e3e7b56807c9b2bf9f1cda36755c5a8e18eab1 SHA512 d9f2c4ecb318b52d44a3d7664480635526f6d27c90307c5b95e6125b7cc4e8145434154e755e6b663687d796495cd8e75fbae0a122ce350176660d449bfe4cf1
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.77.0.ebuild b/dev-util/boost-build/boost-build-1.77.0.ebuild
index d4117bc4ee27..9259bd5cb941 100644
--- a/dev-util/boost-build/boost-build-1.77.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.77.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="examples"
 RESTRICT="test"
 
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f1a383f10915..6b6cb546f637 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,4 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
-DIST patch-5.14.5.xz 121948 BLAKE2B 1f1c503e9d56384250f0e3bc36d698a3fbd07e45dab8b01cb8046d660d32630f3f26daead931b5adc8d7ff26af3d819325d4af2c6ec0a37cb4ead637244dfe80 SHA512 496859c954a700704f5f4aca64ed134c183638d270155e5456fcc871c917a82f41ab4d70a0f503c9f1a7c63426f99a25545f4a930753e6afeb23dbd4be92e6b2
-EBUILD bpftool-5.14.5.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
+DIST patch-5.14.6.xz 262092 BLAKE2B 06c3b6c194d67e5a2c39c9b97799fb2f4e76071e058d62f29c1d2aa049980719bcc27deba445081b0e3d5fc6fc476ac722945214baf60fed672c417bd837a31c SHA512 9270e911d2a71dc9c284f95217c10fc3b3666d7e6c54ce3bb1b1d4f3c081d7ea5449e7ac645c60c18986531b4675291ba3808367f5630eb15adaee3de4e63d46
+EBUILD bpftool-5.14.6.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.14.5.ebuild b/dev-util/bpftool/bpftool-5.14.6.ebuild
index e3fa3487cfe7..e3fa3487cfe7 100644
--- a/dev-util/bpftool/bpftool-5.14.5.ebuild
+++ b/dev-util/bpftool/bpftool-5.14.6.ebuild
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 69ae21b96423..bab878d47f69 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,5 @@
-DIST catfish-4.16.0.tar.bz2 261252 BLAKE2B b495814857cb551c00dff8b92d2b24df876b1ab269bcb0ba468c791b97f3e962b875c5a687010472c5d47719475c99131d5ee6df3ce642af147b199976eb3538 SHA512 926318d3b2387386a5141347cf23b7e1505f83c48dac3804dc9c51aeeede2ef71d6d70e61bd5f608145249ccb4d3d87662bdab0c0a88dc69608b2edee55ddc19
 DIST catfish-4.16.2.tar.bz2 270051 BLAKE2B 41048edc3933664af389ae7120e6f2b25f6c92632a4d00b999eef4e26e0f6eeeed70320ed740f26a0649e423e3b8316e33b8c671a282ae1a4474b3cc6bbc4824 SHA512 a1dc2839106d55e11e537478402b44d3794cdcf326c5984bd95d0d5a8bad52d91df1be22ba347d23f030d0c62fdf2b90a507e2abc30ed4b4d1804ab8dbde1dbe
-EBUILD catfish-4.16.0.ebuild 1196 BLAKE2B 3fe6f289c69468b2fe4d1d19c091e9605f85d2ec83cccc0a9cc36fc783ad934cb9ca0e4df21a3059cb75961ef71281fd1af79f8f714e91f649d5746f4916ca96 SHA512 0086aa4c90c32c2c9d94a42c80652e26f5fee614850b99c46c3e2dd6702a728fc1c52cd4b614ec3888633b922b38c948f7341fed76abe2adc80cc63a035e3bb3
-EBUILD catfish-4.16.2.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
+DIST catfish-4.16.3.tar.bz2 271642 BLAKE2B cebadeeb478a041ba6f815aec81b18d317ebf468bfe0699e33c4550a2f4b1b3377cbabd08d7d6504c3d94169b2be68d35ade9bd77e018ea7c099370ccf4ac124 SHA512 23ffa160b0593033a9696644fd00c48e4a6f54dc25448f975f0949aece50d8e4fbb45b9ad086a8e14072ac1dab27e0b4ecd19af0f31a5b4a775b17e18b00c7bb
+EBUILD catfish-4.16.2.ebuild 1197 BLAKE2B 085361e1637e506cdccb07c50464fbb7e2ecbbc6517c0ede48907100f3764f787b98bbc452a7f5b179f5bb30e20197c62078dd28f72e458bee5265370d550a05 SHA512 27d63ea3fba37a90fc0b0e78f7a2e8133fb6a5c74890bd26958f261f219236e4038b13a0eb14a814b874d727cfbca0efaf3e9d44ca72d02d065bf1cc1232b9a7
+EBUILD catfish-4.16.3.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
 MISC metadata.xml 217 BLAKE2B dbd6f28308a539b2f2d27b9b2bb6d44ce324db803a3ed7218ac091711f3cfcd5f01f505c084c0b714f19257af70483906135c68caa1964252b6a9c9fe71b4ac7 SHA512 ba66b524e0287ac4326c527d973ed2ff6a40e330f38f3f1333db2c66a7672e6b24a6212ddf430ee454ed943d89d04a12e42eb670f3dcf1567f59c6e51d5677aa
diff --git a/dev-util/catfish/catfish-4.16.0.ebuild b/dev-util/catfish/catfish-4.16.0.ebuild
deleted file mode 100644
index 5d3b27cfd10d..000000000000
--- a/dev-util/catfish/catfish-4.16.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.42
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	x11-libs/pango[introspection]
-	>=xfce-base/xfconf-4.14[introspection]
-	virtual/freedesktop-icon-theme
-"
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-4.16.2.ebuild b/dev-util/catfish/catfish-4.16.2.ebuild
index e20eafa63bda..e598039ab371 100644
--- a/dev-util/catfish/catfish-4.16.2.ebuild
+++ b/dev-util/catfish/catfish-4.16.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 # yep, GPL-2 only
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.42
diff --git a/dev-util/catfish/catfish-4.16.3.ebuild b/dev-util/catfish/catfish-4.16.3.ebuild
new file mode 100644
index 000000000000..e20eafa63bda
--- /dev/null
+++ b/dev-util/catfish/catfish-4.16.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/pango[introspection]
+	>=xfce-base/xfconf-4.14[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0b85b85ea61d..7206063fceee 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,10 +5,12 @@ AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.1.tar.xz 509916 BLAKE2B 54fec9480c37c144667ae2dd969cabc1526a01312200b2b9b26ef1d5533836e2070d28e6a7fbc580f232b22dbd6f1a56a43494b8960d96c5a97d8f041e8f31ca SHA512 820c0b05d2b0209e8478c7409da0e27de8e9621c683aa0f147f9c025b8ac7bc3d06d6945d346143790168da79dfbd14b0ccfb284c7ac05c35f85b492be07d676
+DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.4.tar.xz 509516 BLAKE2B 6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43 SHA512 a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
 EBUILD ccache-4.3-r2.ebuild 2039 BLAKE2B 52f3830cb8451b66871732aa64aec3a8e42bc1730640337f2baed76ef9fec092f43c36749b0c9939e7e98b75ae3d7a14847d9dd8ec380f8acc8981b3de989dd0 SHA512 1e5bea0e4d4bd454d6d224975972d2dd1470061be94a6fcc6eee7bf5bdad2c07007a586b0003144308eed1fa4cbe11c07d3ca3d3f96f27b4eed7ca644c2b1c01
 EBUILD ccache-4.3-r3.ebuild 2118 BLAKE2B 78542c33b7cab6cae672873c692f78630c22660690756200b13817e40b8d9c012d14b130e3c4806c01ba352ce8ac90a4a104165804ff4df2ca55bb3f24731a48 SHA512 fe037af1fca8f0d4962e78072addb2ed8dabaa424c1c301444289052ee19baf983ab63b15eba757369807b6346bac0a27cd54e947331c450a9f731ed84d725d1
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 EBUILD ccache-4.4.1.ebuild 2303 BLAKE2B cc369c3130135f847b011f6fb567fbaf6fd82b52db8076dd3744c71e732dd38d81a3a1e98539fc9782d45b36d2ab8d9cad71ead8a36ab31d1299124b51ed8e56 SHA512 22df449dc9c538b312786441ce8069e100c38de3aa392872aba6c875f0fdcb45c625066f061f213cb8d778d536106e1bf660fbbcd552cdb50e1c1b7ae8a6ccce
+EBUILD ccache-4.4.2.ebuild 2303 BLAKE2B cc369c3130135f847b011f6fb567fbaf6fd82b52db8076dd3744c71e732dd38d81a3a1e98539fc9782d45b36d2ab8d9cad71ead8a36ab31d1299124b51ed8e56 SHA512 22df449dc9c538b312786441ce8069e100c38de3aa392872aba6c875f0fdcb45c625066f061f213cb8d778d536106e1bf660fbbcd552cdb50e1c1b7ae8a6ccce
 EBUILD ccache-4.4.ebuild 2204 BLAKE2B a6ae2e76ed4fe98970eeda1e36da986ccfedf80cc35b74414a7dba16853b3663908621c5b00029def4031c3324edbe44283c60ca353899d778e9d8e8e1f8d193 SHA512 5d7ccb58cea38b208092b87c954bfd029007b84cd09bc05fc79c3f6164a9ddde15321998c074436e3d2065edd104d27e32f067f811867407c743c82e34a5fb10
 MISC metadata.xml 632 BLAKE2B 54a81f78ca7731afb01f2ca1d377d9aa722a368d4177c8cd34a505c1ceaec28539718da6665ffcb5a06af544d518d7806c8db4338b0ab473d56cfff39fbac9bb SHA512 bc9037810d55b532289cad47b2249efb9cb81a9acd48466461efba65487ffade1269ff00f271a4cf1ee8625906c1b3abca6e5244224c55a527aea75cc6eb5922
diff --git a/dev-util/ccache/ccache-4.4.2.ebuild b/dev-util/ccache/ccache-4.4.2.ebuild
new file mode 100644
index 000000000000..39deaa2e861d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.4.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs flag-o-matic
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+	use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+		-DZSTD_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index eb58b008b1b5..156463980b81 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,5 +1,5 @@
 DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
 DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
 EBUILD checkbashisms-2.21.2.ebuild 804 BLAKE2B 3327e778848aa5aaddb57e44ad561465133c2833db704842d1fc5e3533fcf5d15a33c065baa5dd199d3e2694b770096805f7719236eca33b35953afd6d1814a4 SHA512 bff58abba0ecc7da82e22d5a5aea758fb5a665a7cb05d0f472ef423de5273dc9ba89ba6af5ef613bcb740faa1e8a7d0d0e4debf53baa632e36fff31c736fc292
-EBUILD checkbashisms-2.21.4.ebuild 797 BLAKE2B dad0d0308e87e0b915e3aec869bb893fb725aca31fa847a7869e285f75f9e4558af24aacf6860d5bb439d76ac45aaa1c1d952af986f73592f10968a6e2528bb5 SHA512 5e5a736f8ab2e23d0e1a3237b930bb3d60bc39c9b56acba2f191334b5eebe9cb7e529b8b6ac734ca426581402437a89136ecf03858a0ac74334bd2203c902411
+EBUILD checkbashisms-2.21.4.ebuild 804 BLAKE2B d2384fb5eb37e741e7b19cf401572b6fb642a28c36a98d98e7253eebebf2efdcd4be0b33ec94cf7fecdc257794bcf4d709fde5d6ec3de1ee19a80eee7bcd09e6 SHA512 78556996ca62b0bff41fb0eaa5a508a855c48aa2008ad9e89596e7037697b196e0b21b78a174737255b14f6fc46c793a8025025178dbbdebdbdb7948b9af713b
 MISC metadata.xml 434 BLAKE2B 031cac658d94414702e897991f7e60858edca6ed7c49c6413b20523e4e1f39adaa109c9bd5b87054a2767ba1fb1deadeb4e5021dad58a5bee366e962d7d95ccd SHA512 c30bd0b32e0c851ef023de34a60207c353d8076fc84ec4be67cb23358cdd31ba9be8baa8f3dfacb526a7ac40ebde2b278d413f16595b412d0a9e9590f14bdd0d
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
index c92bd4dea7d8..fe77ca334930 100644
--- a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index be60881671e2..cfa25175b050 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST p5.9.20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
-EBUILD ctags-20190331.ebuild 1795 BLAKE2B d6f51668cc3fbbaf4b8921bf7d27d01dd7f62ea5faa424bdd6f962d9a8e0b5f9b971b08955efa5efba67894be4b0c78ea4a7be5225184fa6fe16c54979289da3 SHA512 42f0b6f7c8929e668acb8a4b79577d92fe72d641a18f90dad96be9e57a888c7387f47a0dfd1f142375ea6f109890e27bdd22d655d7d775560f826e6f3d6bd4e1
-EBUILD ctags-20210321.0.ebuild 1832 BLAKE2B a6be46af0437025d5daec0be988a0e2969b362fb9f59bb953fb33018aab20e59e79b5d870697104ea8323bf82a67926f6ff2026f6253db31312cf89e849ed403 SHA512 7ceba5b08fcfa6b2b00679d9bca52a9556bfecae442b7cb06999346754e153adaf6e245209df7daf04087daa70a55c9dc50b0cb03c02cd66f6f31c5b4c9ca067
-EBUILD ctags-99999999.ebuild 1825 BLAKE2B 2a0e097d2626d364c2344db4e72f0c7c2e717f73c3560d2aaf2012c234c3ad858d8f6ca9e543ee48c11a1324f93d6cc5e50d93ef6ae20331b7ca263446cc2a63 SHA512 8463c98b9fb2a0c6b556ab1785f7b128dde90a05dd6a1e765afd146e4d692af7ef88f7ee22294e561fb270a20408137fddb637b72cfb32c73aa1ac56f05bbdfe
+EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
+EBUILD ctags-20210321.0-r1.ebuild 1834 BLAKE2B 3e482f989b51faf1d6112d2f89e766531917fa570b9542a9e8185944c98c219dddc48438b80a521936340fa59c9049d13c0a66d142f236a92d0d3b945f5c9ddb SHA512 e7be1cd84e146ac88c02e0d178eab24ae40f96ff8a7464ff25b6ac27ee261a83edfe5f40ab383415612c0aeb028c7757035edd1c189f0a172f6943a22ce09558
+EBUILD ctags-99999999.ebuild 1827 BLAKE2B 80f19b0ca0d3efcb63255bc0d297c4457adf4ca62a722162c4e5c22989a0ee7332070230672172888c25b85b1bf7118c7b22e56ca476a3f436d4d5922ae6253b SHA512 c08c5bdd0908bb9f1d6ebf7ebfaaff05c502307c66e8658d69088378b2f9e26468a27f462b9747f56963d82d6d3b0895144a84222c20fd43bf059751a1b6afba
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20190331-r1.ebuild b/dev-util/ctags/ctags-20190331-r1.ebuild
new file mode 100644
index 000000000000..7eb5ec5879da
--- /dev/null
+++ b/dev-util/ctags/ctags-20190331-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+COMMITHASH="95975bd157cc1326120977ce530f0477bcbf43b1"
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.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="json xml yaml"
+
+CDEPEND="
+	json? ( dev-libs/jansson:= )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )"
+
+RDEPEND="
+	${CDEPEND}
+	app-eselect/eselect-ctags"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${COMMITHASH}"
+
+src_prepare() {
+	default
+	./misc/dist-test-cases > makefiles/test-cases.mak || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-readlib \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog "You can set the version to be started by /usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
deleted file mode 100644
index cfd6b8d756ae..000000000000
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="95975bd157cc1326120977ce530f0477bcbf43b1"
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.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="json xml yaml"
-
-CDEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )"
-
-RDEPEND="
-	${CDEPEND}
-	app-eselect/eselect-ctags"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	./misc/dist-test-cases > makefiles/test-cases.mak || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20210321.0-r1.ebuild b/dev-util/ctags/ctags-20210321.0-r1.ebuild
new file mode 100644
index 000000000000..471c4110d1bf
--- /dev/null
+++ b/dev-util/ctags/ctags-20210321.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+if [[ ${PV} == *99999999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-p5.9.${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json xml yaml"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-ctags
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog "You can set the version to be started by /usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-20210321.0.ebuild b/dev-util/ctags/ctags-20210321.0.ebuild
deleted file mode 100644
index 797f050afc93..000000000000
--- a/dev-util/ctags/ctags-20210321.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-if [[ ${PV} == *99999999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
-else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="json xml yaml"
-
-DEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-ctags
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	#./misc/dist-test-cases > makefiles/test-cases.mak || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 398cfa10dcb4..1d3b06d128c0 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="json xml yaml"
 
 DEPEND="
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 23a0da31589d..347e23d120b6 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.16.ebuild 1017 BLAKE2B 32ed5c7812f30a4cfa06a9d3b383f28f58a0138614ec0fc62dfdc0e9a3ed1ba3373ccbe01e497093a47268074181d5174fce4975ba1afee6c490388b0f8168d3 SHA512 e8b881c969a80222695341c03601a2bc81214d1e6c487cfce80d708e0afa48a269ce069c47cde5199d21184e9b2e93f672f383fe14af3331f29afaf96a112347
+EBUILD d-feet-0.3.16.ebuild 1024 BLAKE2B 9551ddfec9528d64b83614e4c58dc30322b688ba4cd56af154c2d859e5982846255978d7d832b5569216d1c5798492287e98d7dee993912eb6173f32347d85db SHA512 de91c821a0838c576d80f9476fb58e678f32c8202b442c648f50386a07283083d9fa10a7a5971091e3b54b6587a9131225e8d747e3970fd32f64206190b77ebc
 MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f
diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 78b248d5ae38..7a9d65104598 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="test +X"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 9cdd9e9587b7..67fefbc8507c 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -8,7 +8,9 @@ AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb76
 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
 DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2 SHA512 3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
+DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
 EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2166 BLAKE2B 61d3f255586dd52ac42e75da5e5f68183418d95483c40ce13207d227735d84e2959c556dc9518a02a47aeb9247fe6137cc7ce266412a9eb809b2bae04e42775f SHA512 c5ab29f8188144402d97405e4ae114e8851fe94a0431a73c6e8ce1b6f0e4c323b9f1b444ff7ada65a82f50ca99c4f70664daec8cdc626cf7fb3dfd370031d50a
 EBUILD intel-graphics-compiler-1.0.8517-r1.ebuild 2319 BLAKE2B cdf35fad3f98e4b53c368a09ebd73f4b770ecd5bd0223d0653313bfa1058939a7950bb5c51ab264167f1b709870f9b8d066261c3cdd1651de87fd4b9f84566b2 SHA512 61cb7c35d6327a854d371216ccc230f3b690401560e9560657037c444650273232d46c4bd2b624f4bb753ba9845b545bff4500ef3d59b880d5d1d0c4d3bfa207
 EBUILD intel-graphics-compiler-1.0.8708.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
+EBUILD intel-graphics-compiler-1.0.8744.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
new file mode 100644
index 000000000000..0e7e9889129e
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="11"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/lld-${LLVM_MAX_SLOT}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
+	# and the way IGC uses this definition causes problems for some users.
+	# See bug #718824 for more information.
+	! use debug && append-cppflags -DNDEBUG
+
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	local mycmakeargs=(
+		# Those options are ensuring, that we are using
+		# the system LLVM with the correct slot.
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+
+		# VectorCompiler needs work, as at the moment upstream
+		# only supports building vc-intrinsics in place.
+		-DIGC_BUILD__VC_ENABLED="NO"
+
+		# This will suspress some CMake warnings,
+		# which cannot be fixed at the moment.
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index beb432b578eb..bd97124374ac 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,3 +1,5 @@
 DIST intel-graphics-system-controller-0.2.3.tar.gz 124505 BLAKE2B 50bfaf5dee2fd55d92cd7e544faa8c26930f809b1f4d6dbdc332aec0ace0ced9e21817479c87c4ec12d1117209696b2146c2c6aeb1cfde4ad654d065547e8a6b SHA512 a3ecac36170b0f5c508e077c35336f5c2122d4cc2917e68237af3c92fb82b5f080deee4dded68cb36922cb9edd4d78f7b7a6ed2295649a538ab83ad30c280761
+DIST intel-graphics-system-controller-0.2.4.tar.gz 125476 BLAKE2B 82c803dc654240a364416dcca6c1104ec96eca6a0ffec058394ec2594d87bdd6854a3b0143ad6e114b5b4359b15f787679c995fa60fcbbcf5097467c15252217 SHA512 57b0aa1f5cfb6c103903be590d94f4a07c33c90180e688b62b2434baddf16637a6fb6c160c225fa08cf2d0efc80a42c6b86de48b71fb6aa08bd3f9fe2ff79fa6
 EBUILD intel-graphics-system-controller-0.2.3.ebuild 1095 BLAKE2B f81e54e15daa0a3583a41c44e012e1862f327ed59518d4fc5490e7200356861c57fc4736b7f46a5d8881ee5e34f4f9d00c611a5031b57480e40f6094017dba61 SHA512 3a5820321d723a95a86c64daa5d2d1161bfcc9daa75cbc49916d5118a6efbd089757561bbf55c873c8306c34e69b739a0cf904345ea81390b6d82777cee9ac62
+EBUILD intel-graphics-system-controller-0.2.4.ebuild 1096 BLAKE2B 368b10a3c4a1d920ea2653edcda7ec720982f82a39369b16c8f0f968ea11c634d061d9f8f89dd3d3ed2fa25902bbe5bf38fb81f61752055127d76eaea33fe475 SHA512 f2607af18461daf5db2adc1775ab0c55796cd78063cb34f65306ddd76ee5782ebb94de93de0755496dd8564a146b745291ba29949c969fcc82237e67531e08c8
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
new file mode 100644
index 000000000000..bb2e878960cc
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="igsc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Intel graphics system controller firmware update library"
+HOMEPAGE="https://github.com/intel/igsc"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cli doc"
+
+RDEPEND="dev-libs/metee"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CLI="$(usex cli)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_ENUM="ON"
+		-DENABLE_PERF="OFF"
+		-DENABLE_WERROR="OFF"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DENABLE_TESTS="OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 670e3ee4a2fa..872550ce3bb5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 EBUILD lldb-10.0.1.ebuild 2286 BLAKE2B ac5ee6653bce26265c7bc52f5461613ed0ddde5cefe930aeef268e1115656eaf122681342e606b42786fadfbf3437c6903d87df96c236b074c530c1c78eeb90e SHA512 38d1a73a7961ce42a7a50b94b08da1a340cec3f8e7c2c1272fc959519bd18523872116418e46f5baa4451f41d76082edbf186b618e9879aab447fc79097a5756
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2378 BLAKE2B a7648bce8dae2c6a0d0ff7ae002c141ec1c7a1089425941953eaa9236001e6047a08a4a4f61508addf4adc21fdd83e4848eee5276c054cf63a6e4b891ff97341 SHA512 ebceca1d1c2ac1fca742d0f1f65e7445361bbc4c8009ebbdd75a419517369e3432eae11136e50eed10f62ff60982e6ffe914b827c38a9b3b6a375dde79fd5968
 EBUILD lldb-13.0.0.9999.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc2.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc3.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc4.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
+EBUILD lldb-13.0.0.ebuild 2395 BLAKE2B 3c5d12b418337d93cbdcc8b399ecf1c67c15d297d06a885bc570b7a7841b81df6d6f3f1ac025262799b7509dbcd359c6c3c10672675ab947907dcc84d13594fc SHA512 b762e499564b7cbf52f9e087d012e7d7f337b54ecbd1514a6549fd794b9b8fa713a6be9feba4d62a1836440e4599b441cac9d0c19d51a378f1172357184a442f
 EBUILD lldb-14.0.0.9999.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-13.0.0.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild
new file mode 100644
index 000000000000..20f75db4f574
--- /dev/null
+++ b/dev-util/lldb/lldb-13.0.0.ebuild
@@ -0,0 +1,101 @@
+# 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
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+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}"
+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-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-13.0.0_rc2.ebuild b/dev-util/lldb/lldb-13.0.0_rc2.ebuild
deleted file mode 100644
index 394b6d66fc57..000000000000
--- a/dev-util/lldb/lldb-13.0.0_rc2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-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}"
-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-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-13.0.0_rc3.ebuild b/dev-util/lldb/lldb-13.0.0_rc3.ebuild
deleted file mode 100644
index 394b6d66fc57..000000000000
--- a/dev-util/lldb/lldb-13.0.0_rc3.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-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}"
-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-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-13.0.0_rc4.ebuild b/dev-util/lldb/lldb-13.0.0_rc4.ebuild
deleted file mode 100644
index 394b6d66fc57..000000000000
--- a/dev-util/lldb/lldb-13.0.0_rc4.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-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}"
-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-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 6bc63ba98513..fe03e99f6b32 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -2,10 +2,14 @@ DIST lttng-modules-2.10.12.tar.bz2 306825 BLAKE2B 9f71f3102094e905bdbfc7d1788845
 DIST lttng-modules-2.11.0.tar.bz2 315192 BLAKE2B a56d2847ab48760a1fa41545a69b5c855723c71dda488b3af9555cab6b3744db98fdb7650bca74c88a36549dfefbf40c8e75390557cce5e43ace5615bfe7430a SHA512 549f78bc192bdf4e39a912d45a6918519c5c29bdda3bee0b4f7172c6c2d83c887b669dd8e17a8a5d0c17b5dde57aa6eb5087dfac3a103ccf1e5017be2d038379
 DIST lttng-modules-2.11.8.tar.bz2 316947 BLAKE2B 61dc2abe8d61242b5157fcc93d8b6cb26684ee5c20c03f7fafa7ebfbb8498f8e8b46ce498f5666bd367a8f3115b780ba3bec8fd599eb17cdbb5475793372a90e SHA512 d83fb3e6e6786ee7bc4d9a377fdbd90331e7ab72e5dd12c21f6a61d0451b2157965e2d49dfaf2e7be7eb89d7196da0f4668bc468c97a640a524aa19cbabc7831
 DIST lttng-modules-2.12.5.tar.bz2 317002 BLAKE2B 9f42f8641dca7ce55e7445495c747ce340919458a23b4d471998fe2a28dd26bc7dfa5edbccf0b11877176091dee0c4d63fdda919c03afc8dad3fcfb7e9529c33 SHA512 81524dac513384852555a6f5619dc10286a2f7d4e3032ee9ca33705e830ee3bc3dc8c96b89a9c09dd5df2bf29944e3e566d1ac1a6cd6be83718af9836e043991
+DIST lttng-modules-2.12.6.tar.bz2 318479 BLAKE2B 7cac6dd7dcb12801a32179ced4bb141a7af87c864eb71b793e65b905e4a0ba3d3273609bd3cd80c9c1251914a39e62da0a85e18058480da0c4eb2d6eb44f851c SHA512 608112b960d47ed5f979c7f2de2886d3fbe78a0d2eaec0892bfbca92bdad423e8ba8c3960836f71045c79d9c1b9eac88757400726656e98fb0ae70035e0073aa
+DIST lttng-modules-2.13.0.tar.bz2 342499 BLAKE2B 81feb1b93972ab5605b40db4acc46ba9c9383211b3b176b14301c302b68d76b4490bc433176073b4ee9bde4c2ad66ebd6c1d4aeec359cc4dc8b0f26525ef9a5d SHA512 f2fcc8c16867fb79061a46381d27b26a8f49000475cd2f6ad8a9ebc1d8b11cab840d62e38df1aaad68908aa5a29c62c47c986eb281027b226e115dd4a25cd611
 DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
 EBUILD lttng-modules-2.10.12-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
 EBUILD lttng-modules-2.11.0-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
 EBUILD lttng-modules-2.11.8.ebuild 1011 BLAKE2B 9a7a494abde991d2cdb4471f866f2587878906cbf4b843e54aba32ffeb349dce623ce31786f8188f9900de18a30ab19cca46728a01f23862251a41b9fd3269a8 SHA512 7cc452a3bf21bc68c3e9156aee22f5afb563c107bb3a2ff835cebad76b023759d5b17a3b650642538aa1115e114ead0ce58cb473b8d5919116ae6b02aae34d34
 EBUILD lttng-modules-2.12.5.ebuild 1003 BLAKE2B f832e877110422709d9b00c3b0dfdecf26d76e2c1d9e3d09db14aeef0a2b5b1709b3717b0f6997d4c9500e13c898e708bf24629ee07f09af46d78c42d290b804 SHA512 5575233587c9ef25a6bce7efb18a0a561f33be5eee32dc4f6151f50ab83bf722c7c6bafff3940bc66678cf89e5166f819c1781463b00641fe131c4740169afdf
+EBUILD lttng-modules-2.12.6.ebuild 1005 BLAKE2B b6b3c2a093735bddfbf64de28ce391138e8fc6c69d0e6176a8d818b3f34a6d9a4b14c8e146b59f1c023cbf5dc66eeed33fe41c7aadb905ace3e9884fbe4d2075 SHA512 7b18dafcaead0710c05183c5211ff107effa1da1d054042a065d13478fb9936700d3eb421a070be7d92be7174a58bc6256d69b1627848aae2ca40ac74560487d
+EBUILD lttng-modules-2.13.0.ebuild 1000 BLAKE2B 3fbe3e2295527019b02b5e58dd12f72dfde095a702524f2edd7530064202d09c4f683c33584f16570b17b9793663e08a2abdf6e1dcf6d535bde088f2c1575a9a SHA512 3a624bfa2f989e2788b9e557513be7981de4d8b02d3fe0fbfb6899cdb55c63d17b90baaab638fa8b583ea30b8414678a919d2939884ecc61b3a33716c43a5573
 EBUILD lttng-modules-2.7.1-r1.ebuild 963 BLAKE2B 8fb536297fb7132eea88d65c5ad1ccd3735c8b4f029dcccabb29aff0e93d0ec5d14b8880cd9e9c51107ea5d17454241b25a4a1276b3c3d2aae3c49b69f286d0e SHA512 5f051784283f3967573f5a48dffe7037a727a3936e333e963a9c7a9c7edf5b00cdf42646c7e3ec991ee7ee05da4811e5a492e8ae8056b87a6368a01a38005546
 MISC metadata.xml 696 BLAKE2B eb719232f619166590ba6b585d512446c7ed89440090552860291c6fb9099f1c059d7a2728be6321ebeac3e549b725d6cadde1856047f064662faf93a3323124 SHA512 76e2fea1f51216138f2afa826107c520ec8a33a17e529ec9682c7c1ceca52e506acdbaa7fe48654da1561a217205a66918b16c86107b387e2c886dfa36006692
diff --git a/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild b/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
new file mode 100644
index 000000000000..2936f980647d
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 3 0; then
+		eerror "${PN} require Linux kernel >= 3.0"
+		die "Please update your kernel!"
+	fi
+}
+
+src_compile() {
+	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild
new file mode 100644
index 000000000000..8d751c6a08ce
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 3 0; then
+		eerror "${PN} require Linux kernel >= 3.0"
+		die "Please update your kernel!"
+	fi
+}
+
+src_compile() {
+	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md
+}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 95b9c3f713e2..20cabdd268f0 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,9 +1,13 @@
 DIST lttng-tools-2.11.6.tar.bz2 1484146 BLAKE2B ed2f60f87ebf6d8049814e761f9493d35858745caf144132cc71759b9b37f2127d858f2882825d5357648e3c46316399a3d9430f788f2c92dc0001f2a58cc242 SHA512 4536e8c39b66d0a0f62543ee6b729585322ee1758507719ed60f0dfc10b95362497f49faeae4dbc8fb3a44336616a54f1c2f55a23aeecfe43c4271ffcd485094
 DIST lttng-tools-2.12.0.tar.bz2 1544515 BLAKE2B 642047348ef7bfe72c5ec718b4029c628fe2e23fd0a82517a8d5bb15a8cc3b84965d21b2f528a20530fb6ca8213e320d0dd6f36de09b34a53863c46ee272a470 SHA512 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
 DIST lttng-tools-2.12.3.tar.bz2 1550901 BLAKE2B 0f4a5ac780e26f6ef16f4c71af7052083b4889664962712bf248cc6a7c05e8448a40b12dd9fe615e41519924e285b629e7ed535cf551581b26890a2b8fd58cad SHA512 f997e94a5d6126845b914d8b80a5e1512d49799e84c6cc82903187b988da2b0f157d65d7fe8f14d01fd3b5352aa317c5305bcd6b56f81d03a85a561a18be2a0c
+DIST lttng-tools-2.12.5.tar.bz2 1576936 BLAKE2B d5e0590ef97b899988a9c2be916fc742e025eb986fe6537528eb98ff342ad301721fa3c4142937400b1deed59e725581f693f4adae1cb85da7ee1f7287283b4f SHA512 5b7295443681f3faa0409b6385f2aea07bd07b0c01f03c9a0f21d5055d73987b9bc34116e6b0e742f7fb17b5e93fc435d578e658813f1a11261b317ceabb136f
+DIST lttng-tools-2.13.0.tar.bz2 1850423 BLAKE2B fbd5f2528d2dd262cbdbac5559b2cac1d7aa82adddf2118dde6b9f3956e582566406590d1646ccac9c9c496c8e07fd9f7fd7a5fdaa90f528745e2ddea8f0269b SHA512 bcd824b21a6e186caba7d0cfa472b173681995c4c9680ab03d2f33c21f9e003c0ae22cea14f65e9f240ed48e3a679f940b8634a72fc5120fc2a5f47b067b6f07
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
 EBUILD lttng-tools-2.11.6.ebuild 691 BLAKE2B 4946ca4e22bd637d7d088d7869a0f787968d6466985e6cc505c4a460416da91efab750116aea202bc085ed8d1c7046584da8bc3438eedc62c3cb558a9b82a18f SHA512 1c183280e809a350bb2a8b619e3fac9d3834df82948c964ce9c24bd5a690e2f525276896381367fa12ef4e5ca0d10fa7b2d2111745dc635737eb5e4cea497b8c
 EBUILD lttng-tools-2.12.0.ebuild 691 BLAKE2B c4fe28aedffa12cee98e2f7bbc10bff1ff66d3ddce6c4621cf230a25de43c3ea106a879a6d2384d2d05f75d3f5c253cc5f9f391abe7ef1693cb07d70fa8c249b SHA512 f3346a83dd5d2b092a17de4a0f46de72abcc1e42058121736af98636f7ebf38b8a72a197ba9076c923c3b3a7b14956615d9b8fff05560a47ef8fe17b51a0c017
 EBUILD lttng-tools-2.12.3.ebuild 689 BLAKE2B 110357264437ff12de6160bc7f4800231adc9a62701a128d5af6852749f4b3c12cb2b6edd598817fe3a483c58cbca83ee52a26229358348b6a007ad1ae54488a SHA512 02ca8f2f6dea11adfbbe849627e23df3ca814ea5f7c145e7c0ce5e0f30b2f6314fec319e7de8bc32ceaba97dcc9dd83873e006c4e1a24b2a7fafacb88371aec7
+EBUILD lttng-tools-2.12.5.ebuild 671 BLAKE2B 544cb8bdece997a6f78d8bd1d13e99b2fdc4d9029b3b156d70c2fb88fc09bd9004b3a055e44ca059cdd8fb3fc455ef44103fd86e628061d3c17ce34ab1dd4e20 SHA512 e21a2fc213c655490db1fb661a38c85b1915169ca1132f1ca9dcc44d7bff582cf2d5e81300f4d1c529144c1f85bee705dd6e6e3804d90f0b36d711ace3fd7d49
+EBUILD lttng-tools-2.13.0.ebuild 671 BLAKE2B 544cb8bdece997a6f78d8bd1d13e99b2fdc4d9029b3b156d70c2fb88fc09bd9004b3a055e44ca059cdd8fb3fc455ef44103fd86e628061d3c17ce34ab1dd4e20 SHA512 e21a2fc213c655490db1fb661a38c85b1915169ca1132f1ca9dcc44d7bff582cf2d5e81300f4d1c529144c1f85bee705dd6e6e3804d90f0b36d711ace3fd7d49
 EBUILD lttng-tools-2.7.1.ebuild 860 BLAKE2B aa76843c0a61318a58347e3bbd2bec28ff1695d818198fc20d8220b710cbac8e98cf953ad3617ca86ef75e3b5d36548b325ffdaf717d7044602973160e59c42c SHA512 71dee4c72661c7b2caf941e2ed70858372b3cbed53e6c937ed746b825da912d3a3877c9e00c838500524249c4dfa87f61936a65c22b75a8c162d8fb2bd010586
 MISC metadata.xml 494 BLAKE2B e3d5a99fabe22b2076098cb3bdf18847afd9132695734e2060d2570acd5ded08684fca3d6655f8c05fc55c85def6d0de205ebd98c069247ed7303cb042a5978b SHA512 76a37a5dfc757933f077af076fda1105874bde77ab73366ca272303e5e8d16fc324f9eb0158ee1103d2a06221dc8267bb286dee4de80eff4b09dfc340c46dc59
diff --git a/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild b/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild
new file mode 100644
index 000000000000..9dc516b55382
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu:=
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild
new file mode 100644
index 000000000000..9dc516b55382
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu:=
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 2822c37af16d..823935cad4f5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,10 +3,14 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.11.3.tar.bz2 846839 BLAKE2B 4ef6918588d139e1ca15f477194796d974f8442a44c7e18768582199ba1e0f467c796d2b10ea9936554e589c91b49e1a07c29b619d74b77b884b081868484ea3 SHA512 2483bb7c57f0e99b9e0d6431114c74f6e5af295a73643307716f5abb6fc20e7dec8bfe7fe3e074ca96bad72ca5f6042b6340d1a67928e885753fecfa8a136eb4
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
+DIST lttng-ust-2.12.2.tar.bz2 861351 BLAKE2B 0c580285721b3d7932630c8d9f4a3606ee294596eef75fcf8b3c892ebdfaa1daae4cbfad1b6ef0ef93877b1f7dd143d97fa947758ab476e4a54e746d0f1e1e7e SHA512 e8734deb27b1a4c5efb81ebaa5c100079c1b3eac6b741b4f85487d1cb921d78d9ddf76040be56081404701b3053c6acc83a5d82667e3f49fcc4fa33392462eb8
+DIST lttng-ust-2.13.0.tar.bz2 1408266 BLAKE2B 28f584f168544e28539511d3904d7ace19ce61e8490f8c021913f4e8c6b91e4f44e1816265ef54336dd724826a01425f77d3751468bf8a9b40e7f60b918eec45 SHA512 f132cbd98c6574e460c99a2ffd5ea181ac592a5f820171f45cf83bf7314ec9bad1397bf8505bad326b9bc8220bb87a42fdbbda5f1c9b89a39d5be8a3c0cb2cea
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
 EBUILD lttng-ust-2.11.3.ebuild 732 BLAKE2B 0fe4bbd05e5c18daf01e825f82bfcb9e4be762f845dcac1da730a0a88237c75ffa6cfbc6351af3b62be7a86cdddd998825c78f59a515e61a5e8d825fd638c81f SHA512 9301586063911e0b975e8ed003295d1f5acac7071b2ca75122bd9f8577a035fc41776f4c87bee92cb1292e2ad8161199670eb7f1689137858453a6444ce5145e
 EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
+EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
+EBUILD lttng-ust-2.13.0.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 701 BLAKE2B 2bd57c9e2b0d8e24eba3ae0767e22d911ff7d4e9c86035fd2c2a10f3e011e7e98fe4d17fbbf99419477652f4a56425cc242a8947fca314486d858145ca992db4 SHA512 87721cee084407a7565d2f0da06d588b5de039349769901102b6833571a53bbfd95d3986a0d7e74a3fd4d285c68c3942f776e813793f0a30d2d83f0a9243628b
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
new file mode 100644
index 000000000000..efe9ff12201c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa"
+
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild
new file mode 100644
index 000000000000..efe9ff12201c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa"
+
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 05ffc4558974..045c601e294d 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-build-tools-0.8.0.tar.xz 25340 BLAKE2B c83524a5688cf38521406e50ad08e93b20d246c0fe779929905cd5aaff67ece6b7dae483d1d4f21657b913ab2ffc7ec821a3025ac6fe3585028146d1746f7565 SHA512 7c235df623ae8c88fa551f38bf24d0621958ce3586296a798b50bbce87084cb624298f4e5aaaa40d3244afae17b7fa373d2b8b6084377f9d7a355fc4bfcbb531
 DIST lxqt-build-tools-0.9.0.tar.xz 25296 BLAKE2B 9686a445c75a700a38150b4493f6c019ba0782e219b3482f67c6a324f35ffe252fddc614daefbd8616ee16ef8bc331c7e4302ddf2df870d1c3696a80cfb585a8 SHA512 9a464393ea6d871c5856ebf5b8fa3d31a89c6419ac084e7146aed675f2b20a139bb3eedde017d6ca03167ee6e30a37a62239ab4e8b76f5b6db244d26ab164892
-EBUILD lxqt-build-tools-0.8.0.ebuild 521 BLAKE2B 29c94964ecb76b8264a56fbc2c0aec8c0159ccdfb8485bfba914fb968f2c063183f016c0772b182722e543bf0aca4a3b8c999d12e725f4ccf4af70d52b6a03e7 SHA512 782dc789d83ae028ac55a80cc0a8d7686f1912e443a2be13204fc22151a74587ba6dd3f2caaeff8f74f42f76254d92cf72f3c66a4411a6b0763c94e7e4e7bdaa
 EBUILD lxqt-build-tools-0.9.0.ebuild 528 BLAKE2B 7b1f78a49c2125264ef5d4a539359f60dbd733e09f238e0bb26bb2c74b88d7bc84c4ac55bed02a6fb6c65071cd62ea8223c2a49f58962a24e32bfd4956b5347b SHA512 78fe92caaf494d6699279d55b144221cf9e141b15a8eddc6ca6d1f07467f8e9f8b5e3ecbec187383f639c635f137c6f2ba5ca5f725d1b3f1af8d4295a925e620
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
deleted file mode 100644
index 1c71c8c84462..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt Build Tools"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0
-	dev-qt/qtcore:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3efb8bc4a7c4..21f10c013c77 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,6 +2,6 @@ AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff5
 DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 EBUILD meson-0.58.2-r1.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
-EBUILD meson-0.59.1-r1.ebuild 2765 BLAKE2B bcedeae1c647c0c1b9616919db71562b2c3326ab3e94a3f3fde83d2525af2ec1623c726b841f7e72784e717fce408a450d8e69f53773aa05713c8b1306394b5c SHA512 1f3c9bff2134fa8d5a79b810ba37c9970021208cb616b46dbb227b34bbeadd2884f06d76ccb2fc89a38be4fc1fcde834fe1cb97ac0923a551e0c102faeefc674
+EBUILD meson-0.59.1-r1.ebuild 2760 BLAKE2B bc631767f6dd03d16f73b376c335b4793f1ab316e0242c49fd9748c917dd0e0c3bba0dcb4188ac61f4f8bc647cc2f84be2020c188a651e6b98e59c8ba374d339 SHA512 eac95dd7dbd35ff2f20993ccd2b68f554d49cf51ed371dbfcd99f5f2b039cb72d1074163b62665dc580fe8ad917f168e802121740a3ce99c6eac5d8c69c75a44
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
index 5d637ceeeddc..a7a64972a732 100644
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.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/objconv/Manifest b/dev-util/objconv/Manifest
index 8bb870932962..254a4600bb0f 100644
--- a/dev-util/objconv/Manifest
+++ b/dev-util/objconv/Manifest
@@ -1,3 +1,3 @@
 DIST objconv-2.51.zip 1033450 BLAKE2B 1029e8001bee969f177e7e47e735dc132dbf640bb472ae148cd2a33af522c190066f226a55da3bb3b47902a68eecf437edc025622781bda691a10956c84561c3 SHA512 12991b98fafbb5fad709471b25bf8acd2944f862ca1f3cbae5a6f7fd53a6009dbb6e67a2fcfa180965b519a2d6010d9b2f7585748ea58d36b28d86c0981f13d8
-EBUILD objconv-2.51.ebuild 1010 BLAKE2B 6574210bd8b1add496028615fc4b168aac24bebdb61e2d3b84213acecd3a16211e46c0da7278329fb425a4bcd131932607fd731fe46cd2994d591a677ee7d56f SHA512 cd37c3e72bde6775c7635c3c91002c99d3fbb204a8d1a781258b41413f02c7f4cd0379b9a9de4d3bb3462def75bee5118a7056c91c6de5768d746263604786c2
+EBUILD objconv-2.51.ebuild 1007 BLAKE2B be24891790f9aee98328125962c2e47bd3015f6cc370ff06dacb7c5ebd6476e83c0e6b21363d5db499853e3ede8f0c40e8210e07a1cf457536b8bdcd43355480 SHA512 501206a86863498215574469b1e77e42916795ba87592a62959bd38e10d60feea1852be3310d06d08ff1da93bf47bc06728bdd96b36a940343c298c2c8f0d091
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/objconv/objconv-2.51.ebuild b/dev-util/objconv/objconv-2.51.ebuild
index 0623cabd95c4..e167d52fa324 100644
--- a/dev-util/objconv/objconv-2.51.ebuild
+++ b/dev-util/objconv/objconv-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
 HOMEPAGE="https://agner.org/optimize/#objconv"
 # original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
 # I copy those to distfiles time to time. last modified: 2018-Oct-07
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.zip"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index f842915cfff1..96a68edf695a 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -3,5 +3,5 @@ DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2
 DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
 EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B 256e0ef32db80dc37bfa06a49135f081b11154dfe791752b2322058a32d074ede2b780bf6bc1354ad015de25812b05cbfe477c3bfd4d8aa38f20bca27fb40826 SHA512 3da5cc9e8e83a0ed1d96817990b16920e3172e52cd99621d10e2f59c98a89368f212533f1470267dbfae8e0eab94d54340ec3a5f62f9cb1586b251eb2f1d78ee
 EBUILD opencl-headers-2021.04.29.ebuild 502 BLAKE2B ed8d78b56b10d92d13591261fed0edc8257bc572b3dd42f136df1b5f6b91a03f5d26bbff8ba0015f01732228752693bfc3b5217c16d59647b073dd5c2a1f6f8f SHA512 f6a9733f71dc0dc3c20bc2fe0c9e4782f8c8a60ca6feb13a546836d5022b4221f33ecdecdb3902ccd34c147435e226758cf6b23a28c0d1bd4d86b8fadba2a426
-EBUILD opencl-headers-2021.06.30.ebuild 504 BLAKE2B cb9f280b89baec06757b7cf214b759a2297e88509bc40f3912c29c46a826f55dbe4202c92336e4674ac6cb1165d7f9b4b1bb0b0d4f22fd810f19dc8f8e745783 SHA512 73a6a849de1638365d0e16da9628afa2c3c1842d055b522f2caf8e7124e6e3d0f2e5bf3da6885b9c7096ede931bd03a4de1bc552e14f8bfd9a4f52be520e0bab
+EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
index 46d065988f56..8ad07c4d0f42 100644
--- a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 1b84acb797ab..ce932a3dc4fc 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,9 +2,11 @@ DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078ea
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
 DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
 DIST pkgcheck-0.10.7.tar.gz 460625 BLAKE2B f62057dcf493ac32fddd1594beb9b38dc463015e8e93de5e51084894be43932f1842c7b5a742d4eac20538160060c538e42e14f5931c5506d443017e1980020a SHA512 ccbbd14cf3f081ff028af164aaf73a0192133f499ed107747f8eb766131c56ccbf0f128a34210e2a54ee47ee713a5151cfb1e0991e5470e5e7f74ca180bba694
+DIST pkgcheck-0.10.8.tar.gz 460288 BLAKE2B aab2abdd9eaee483d580180753fc719127b7c7d0024b834e9199101aa2d18684ec7804efc4ddf59f4a44c0cc6c2896f437d4a7a9fe4496813be4a3a8d33ce7ad SHA512 9a186e032b86e1b565d6198dc9a993a9a8ef065e43f431d6d6dd9bbd6c32fe91501612984c7e3b2092754450c992fc683270d62c29ec85beeb97674b07a9ba9a
 EBUILD pkgcheck-0.10.1-r1.ebuild 1552 BLAKE2B 3ada505dd9f21bdce2f683ac27b7ea30f8a9b4e49c6d287bc87788ac75a478f2bf02c5ade77b56f268e56d1b8790e10a3b64252ca07abaab29fabb3b300fab56 SHA512 1408c239732b315a1a267ff3bdf1f5df40248c3893eecea2baeb500df9720fd8a62aacfd18b7eb890f1e8f39e097432392a9f157c07bbfa23c60139015281f95
 EBUILD pkgcheck-0.10.3-r1.ebuild 1609 BLAKE2B fd96f50c732590d9bacc04267e3e2df094cbfa33bb6be1322aded8c7473c9af12c729086aa759ca3c8a96c0452ebe7e1c7ec97373f55169d99dde10dfb58fe52 SHA512 72043d1cf02676bba1ede0864eeb991b319c7e7c83af1447736d774de0e591f0ef97e714ed441cd4ecdf0933c652382b9031577baac0035ce66af3687f339075
 EBUILD pkgcheck-0.10.5-r1.ebuild 1618 BLAKE2B 6cc7ab548f27a7b1d9ae9ccd86367db964d50c834a6efbbd61a8931596fdd9e6d62a32a615d6e1fe25a6aa3ff3f79dd11d4709608b0f82333fb0715fb30b3213 SHA512 2631da14401dd5fe659180ca8285d24ed10419fa0b4d7fb9fc39c11f606375ca860b6f8d68690bb8ff20a7447a8e59cc3309ca916a92bb819555b54068e433ec
-EBUILD pkgcheck-0.10.7.ebuild 1572 BLAKE2B 83e9f789906d8415c86f5e63b97cf1036290c3850a1caa0efa287ec12260682a2d1f425974703452f98f5e019f1eb73a958a7db9559920eb27285c036dcff6be SHA512 b6495aec8314b391b1ed06959be442beec5dda7c71146244b08eaa33f282fc3d4181d99380c7b272f8c0792a412a88a41a145aad0ffa4931807c5072d4535b5f
-EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B d03e4d1fe145c9832af499920828bffee127e467ad2a7a6c3e21230325840678f67fe1d20229aab5097105f5dcafeb6cfaf9f7b1cf41faa683ce344bf4df38ec SHA512 1eb05628c9add2ffea776c86155dfef87c28741190d1eb91bb9c894a14126efd84058646460daf6199149b5501b6e306b7b81c59a1bab628127f20c7495a1993
+EBUILD pkgcheck-0.10.7-r1.ebuild 1610 BLAKE2B cfbf430001df15083e5f03ed504d698602490e122a2aa943e864746fc8e37f53f4d0ccb4348afeb0ceda1b9d061b822904f7da6db4ce909c79a60bbab74283d9 SHA512 259e13ace6e8d05734bf5a86bbf83a2dc35e95916ecf8c725c87b00a7464425128c50b8e7d2ed46f5ccc2e9649df3dc37148602e6503704b1cdf223ae87102bf
+EBUILD pkgcheck-0.10.8.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
+EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
 MISC metadata.xml 329 BLAKE2B 30154e72c975701c69832cdb72ac9d2464ce5ac65ae107ed1a0d55269dd80664532b529a1ad5a907a948446244b9f41d13c2d19484b45d208f8757f5192bdd32 SHA512 e51404fef8bb71baba825a6700ba9c9ea3680e2892016daf38d3979d33c77c07ea88f95b00c6c821907fbbda129c35ecbcc00b0128111e18290b110cfac5e316
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild
new file mode 100644
index 000000000000..6052eae461f9
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild
@@ -0,0 +1,65 @@
+# 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 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.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.7[${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}]
+		dev-python/requests[${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
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild
deleted file mode 100644
index dbc08627dd97..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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.7[${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}]
-		dev-python/requests[${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
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
new file mode 100644
index 000000000000..ceb25cde418e
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
@@ -0,0 +1,64 @@
+# 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 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.8[${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}]
+		dev-python/requests[${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
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index e934bd067162..ceb25cde418e 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index b9b6d9343a00..2f561513a8b2 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
-DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
-EBUILD rr-5.4.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
+DIST mozilla-rr-5.5.0.tar.gz 1477110 BLAKE2B d37162ef68b20f1ce7878c338f480e6e1ba1850e37d2c6728705b3ab8791897bfc238c950fd5f318dc2ba0be0df04571888092418b227e396c2c524121ad8345 SHA512 4101de8ccf46533e5fc8e72f99bff39253a40543510d9bc9a611ed0909efcd45a050244994a9ebc878d1c6d0af548ec7e2879d1e737f6455db732f75175ab497
+EBUILD rr-5.5.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
 MISC metadata.xml 444 BLAKE2B ffed074f3322dfc2fb772a2b5e7056c1899e9f424e41f774a9da86af028322f5e3b4e371fbb624b9448733c30778fcfcf4cd7a54f40148d9db24702d5beb5a6f SHA512 481d21665113f88c355c0097b6ba0980d62570d53eb130096ee8db32c46eaa1e5f8f9746d2f7a9bf1bded5b725d4805d875abb81e2d7cb6e7c3fc8cf472c3274
diff --git a/dev-util/rr/rr-5.4.0.ebuild b/dev-util/rr/rr-5.5.0.ebuild
index 73cc6777d148..73cc6777d148 100644
--- a/dev-util/rr/rr-5.4.0.ebuild
+++ b/dev-util/rr/rr-5.5.0.ebuild
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 397127cabc0a..35a9506b2c09 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1074 BLAKE2B eeca6fc57f8360399a0b318e51ebc56a98828f9521161b6de7209b128fed265bc24b0f2b6f84cd01ff0a9fd7cb28541a70d8088cf4e92bee7053ef6aa944cc8a SHA512 d4975f2964b9ae98283b23bc41b462bdfd1fcc36d535947bf65b9a7caf54ca9aecdb23afcdf59183a7e3259d5fa21ad2e636b4d2ac03a5d8defd271ad99cf200
+EBUILD scanmem-0.17.ebuild 1079 BLAKE2B a8a0ec3eb1e5e3a1480740e27ae85aa6036d29d7b8898e16bbfa2f94f336696871c65e40c005823a6beff3e7dbc59e8f80de44f166e0f059b8bac64dfcb61fe9 SHA512 1356f396f6a9b2946fee69e1c5074defa3d8fff7dc8831b26534e813b8f10479ac56c1cf1ad6abef633f58b6dff24e8cb7597ecf9cdc130175a3eb38603698c5
 MISC metadata.xml 318 BLAKE2B 081a868e03192346a1d251caa782751d0cdc831607a57bc08b67df34737496152df6477d769da51fcfac1a2d81aa419c2e8588b27cd3f89c5dd91eb84b0f88cc SHA512 eafbe8d2c6d06413368968db5aacd89981ad7963a04b5870601c7defb9ffb515a8398ca9a8182ad10cf23d05f8fd2d7c0f681811391cd2446bd1ccc1bc9fe34d
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 4ff912ced245..0f73625fc11a 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.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 autotools python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="gui static-libs"
 
 DEPEND="sys-libs/readline:0="
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 68d9861f6e43..3a08766be4d9 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,5 +10,5 @@ DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e988
 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
 DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0
 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B 0add0564bc259cee0d3dc5b4121577e329257d62c02c9811f1df5df680402563cdbab7fd118c585c5b4dde333d1a96c69dc4f04b4785b92b4852e40136fd0409 SHA512 cbcc1e83478eb60778e7512dd3268d064fc1e96acfc47ee598b68064acd9b44e262c2d675d5c0383d632014174036bd9b9886f8e320464d9fbcbe2572dd1f494
-EBUILD scons-4.2.0-r1.ebuild 2889 BLAKE2B 709f7adaeefaabd3bc298d661a48c116ec472d78d18052abfbb715900e152b0303ea1565cd1e8c69a3dc06364de2f2524e7a1bd742207ac507a827a37233e105 SHA512 542741fa94fa0857732d3cfdf388f22c9d86965c026460ef00754f8b7a49b6e98bfd7ec9a9288cc6fe9dfe6fbe84f56f67c87686871126f4393dca9a6ee9e11e
+EBUILD scons-4.2.0-r1.ebuild 2886 BLAKE2B 8a36d15b5512b6c0830d967f12aa1f44085cd1804bcad304f31883da4c2fdf2adf83e7a9e87995f0cb85c8511431157eab0c065bff6a7409a5d76b5b3cc7600e SHA512 2023ab17883083ca597c1c659507f714f226da1fcf755e07d2c145f41e3a9215dd241bd425144463f113797c93ed2b4fbf1ce6ae5302e0b34acce34d28f0327a
 MISC metadata.xml 705 BLAKE2B c2c0722d7a0a382c218f101c0219deac4b335d1dc0a0038f27b7e920b37e4fdad2c7524f0463182a2495c04f9679f511b8a2b92982ee7ffc3cad985cfabf1e80 SHA512 5b127afcc07795487bb4856d942e0a34402c609147256dc457f5919d75a8fbf3f0bfca0c3a5f61d78a1152ee56967d1f48eac670dc12ce292ae964d692c497dd
diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
index 9c816bfcc0bb..d4f1339f581a 100644
--- a/dev-util/scons/scons-4.2.0-r1.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index edc5e1af6c1d..4cae255e0bba 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,6 +1,6 @@
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656041e4d397aa97862cc7aebb6a5e705d036889a7b492bbe4393537ff52cf78af46bbe513e71aef19fca1388e3ffa79b SHA512 bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
 EBUILD uncrustify-0.71.0.ebuild 744 BLAKE2B 6d466a70bd6ea03c84f7f4dc65f54a9a97b675b80ed02c71992e56e71916bfd361b9425a55b220cf855ac4aa82ac31d7e3817d42a19896c5e5e99322d8ffe805 SHA512 c4530d02300987cf93c7b6863d38826ae967ca470ab324b9d2e3d4ee54e73ee57c4f3cda7380ac2a2fbfde1fb759e6a6c429d01f2cf6ba53d2e5971b8658508a
-EBUILD uncrustify-0.72.0.ebuild 738 BLAKE2B 142ca979491bcc2a2d0270f25c09e74ea16e15693b07fedfc45d03d81c1c7bd86d3db4c4459e4f45e0abe1b60817c83e8c3e7296769908603d9dddda5a28958f SHA512 b6fb4c58b692f7422876cd2f7d82565ba77b8accc1135d4e0b54a41a48c8e95fc7260ece72b2387325cb93f3c80b07ea71967596856bd0f40b20256a5c028989
-EBUILD uncrustify-9999.ebuild 746 BLAKE2B 796109c0f430214b76778254cc66e0291a973711562e4670d22dfdc500416812db05ebd5270363601814d8093b2bba7910dc28b6b56834744eece42db58c28c3 SHA512 a6c72f62101f760cfd496656544c8772045047fec2c17a3345c60abd77cf21a32db0fbfd9cb4c837d86f8acae4ef87f8299bb8a4bda24b1601335ae56536a068
+EBUILD uncrustify-0.72.0.ebuild 739 BLAKE2B 4e3de929909ab880480826c404e237a40102beae3068b47d7d5d7d6fb8017dadb5a34a24dd916d344f01dfd7309d55a493c8924cac80b2e7eaae320d286a0915 SHA512 c172e63fea583fa3e1ccd313379d08130b7c03eebaf012f75fe2d0eb264db60ed1addf6691e1d215716adebf693f448396006bcacb2f0cf2d23e4ea1a3b6eba2
+EBUILD uncrustify-9999.ebuild 748 BLAKE2B 8fc9c14f7784c1386a3f52c6a56e7e37c010afeb80d744ac2f368952e9ca012649bf1a57535052b601243cdaf6aa7e9918c2e3e1a5081991567440aaf681780f SHA512 c1c6665a8a3cf0726d781e8fb75b1098e4d57c8d9b2f0aa1e85345a666e26d52967e80da4f1dae8b507c01887861837f1171fa613b13286b4556657a83b07efc
 MISC metadata.xml 500 BLAKE2B bc52827b6bca6fe3529586004a180234601307881f2ffabc23bea7210093e42ca29fc4baf2a81f45793d9bcd2bfbd546622d7703b9680200159bbf8e52d76fcc SHA512 5a039d7b7a857226c80a557ceb868a625b85b3a2205437badb4c85241f4aa51c14b6aade595d52468347c998f8a5cf1bf0030ec932e54907387803b782387b38
diff --git a/dev-util/uncrustify/uncrustify-0.72.0.ebuild b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
index 9e76b92aa679..e4c34c2bcb23 100644
--- a/dev-util/uncrustify/uncrustify-0.72.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
@@ -12,7 +12,7 @@ else
 	S=${WORKDIR}/${PN}-${P}
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 ${scm_eclass}
 
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index d078b64fab35..c4689a26e0a5 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -14,7 +14,7 @@ fi
 
 inherit cmake ${scm_eclass}
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 54ea16210c46..469fcb0d51a2 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,3 +1,4 @@
+AUX vint-0.3.21-fix-py3.8.patch 1428 BLAKE2B f45cf44b458a779a0e6ee27822fcb65c5c5594673c2d59e540c7fbd0fc3b31f3b0f17dacaf932e9a7837d93f47d6c267cd2ce1bb8487d2a0268ea6a3c7fd96fb SHA512 7421bc4dd6de228e60ae0d421912dcaaf1814c4d5216ae09198da65b4f56e90bf1c944fc3aebfe773f7a4abcdfc439481246a611613df302fc914a42cd610668
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
-EBUILD vint-0.3.21.ebuild 886 BLAKE2B 50abf8d296e0470e98b46f881bd4093c54684d7d93b64d19ac03d86e4c89fbf8dab74bf7c7e87e28d90195e9688991bfcf57db39f776c9966945f94f31805cd0 SHA512 c54bd92dfbd9400728c2dffa8fffca797d5270bace822c662ec18d04030114315114aad16b5ad48b27fcfef253cca6571a47686f540e6fbda37578abe068ae20
-MISC metadata.xml 584 BLAKE2B 6ec51a7ca523def44ec9edeb96e64fc13762f233eafb8a40d1f4d06bcf815bdcee3ebfcbfa1952ad46b6bcc4670588d6644ffe7338b3d733addd1f8a369af9df SHA512 d576672a31098c2a115c7d1ebfca6aff349056696cefb7bcb14305a1bb214c843d06e1e04a32447ba31165326be92789e0ce426117dc1eb981f7edaf391472ae
+EBUILD vint-0.3.21.ebuild 646 BLAKE2B 1f1a15fcf7d74e76c276cab6b969fc3548f9e7e39cd22fac44dc589c82cf06178242ffca4d4f956d1e12a88845c48639d2f22ef6751cbfe5d03ad8e3779a55f2 SHA512 c5569269b6f078879e25078c326d36643528d2da4021927e36f19b9dc8dabf199b03291efd61b861f7049fc918da3807ab2eb37923caba73fe3f69384eb57677
+MISC metadata.xml 608 BLAKE2B 2a483186140621bc5e54219df1ca31114f4d410b308883e80c84a35a273e9aeb57968f78e608481e66d7535d137c36a192ed493c385c9b98bd9cf405554dc68e SHA512 5cece77f9c71170d519d3a11d292639c25fba403d4c8c8932c093b04d375433ae9279b23d1ef9c0c6fcb0c477b08d6559f8a3bf9521e7151c2de11b4e1ac6a0a
diff --git a/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch b/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch
new file mode 100644
index 000000000000..af97c51cf2c4
--- /dev/null
+++ b/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch
@@ -0,0 +1,29 @@
+From f8bae710ba74dcc55a3b95995fe73139cf949b75 Mon Sep 17 00:00:00 2001
+From: Daniel Hahler <git@thequod.de>
+Date: Mon, 25 Nov 2019 06:41:39 +0100
+Subject: [PATCH] Fix SyntaxWarning with py38 (#334)
+
+> SyntaxWarning: "is not" with a literal. Did you mean "!="?
+--- a/vint/ast/plugin/scope_plugin/scope_linker.py
++++ b/vint/ast/plugin/scope_plugin/scope_linker.py
+@@ -406,14 +406,17 @@ def _handle_function_node(self, func_node):  # type: (Dict[str, Any]) -> None
+         # We can access "a:firstline" and "a:lastline" if the function is
+         # declared with an attribute "range". See :func-range
+         attr = func_node['attr']
+-        is_declared_with_range = attr['range'] is not 0
++        is_declared_with_range = attr['range'] != 0
+         if is_declared_with_range:
+             self._scope_tree_builder.handle_new_range_parameters_found()
+
+         # We can access "l:self" is declared with an attribute "dict" or
+         # the function is a member of a dict. See :help self
+-        is_declared_with_dict = attr['dict'] is not 0 \
+-            or NodeType(func_name_node['type']) in FunctionNameNodesDeclaringVariableSelf
++        is_declared_with_dict = (
++            attr["dict"] != 0
++            or NodeType(func_name_node["type"])
++            in FunctionNameNodesDeclaringVariableSelf
++        )
+         if is_declared_with_dict:
+             self._scope_tree_builder.handle_new_dict_parameter_found()
+
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
index 5bcd8159db53..a3cc2f0b5eed 100644
--- a/dev-util/vint/metadata.xml
+++ b/dev-util/vint/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<changelog>https://github.com/Kuniwak/vint/releases</changelog>
 		<remote-id type="github">Kuniwak/vint</remote-id>
diff --git a/dev-util/vint/vint-0.3.21.ebuild b/dev-util/vint/vint-0.3.21.ebuild
index f07e7a81f734..44cd40dc8e15 100644
--- a/dev-util/vint/vint-0.3.21.ebuild
+++ b/dev-util/vint/vint-0.3.21.ebuild
@@ -1,11 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lint tool for Vim script language"
@@ -22,12 +20,8 @@ RDEPEND="
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.8.patch"
+)
 
-python_test() {
-	# Tests fail due to python 3.8 warnings in stderr that appear when
-	# compiled byte code is disabled
-	# https://github.com/Vimjas/vint/issues/355
-	[[ "${EPYTHON}" == python3.8 ]] && return
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-util/woke/Manifest b/dev-util/woke/Manifest
index e126125b37ae..9d975de2f6b0 100644
--- a/dev-util/woke/Manifest
+++ b/dev-util/woke/Manifest
@@ -613,5 +613,7 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST woke-0.14.0.tar.gz 85897 BLAKE2B 7731a8d88574f33aaa3021cbd71cbc84db7b9f2c13eddd4301c7cc1f512a2282a4e8376f98ad3c824a21afa6635b4e178a5bf2c5be203563aeff71e12a95b390 SHA512 ae6501816f0fc2cb615bb950e657d89d83b46829dd3bb2c4c594fd9870757b11bbec4fb9b5c5da386f4845b8686e3f3cee041ea53234301280c0fbeacdb5cfe2
-EBUILD woke-0.14.0.ebuild 33621 BLAKE2B c5ac50a1f7cf7fdb8d9d4185724408b7930c13b15dace5dc069dea197641c319559ed0eeca68f747550041bb6399a99e1d5c0f5ac00e30906768ad3a38a8ea98 SHA512 b3c61afec222eb0f942ae80239826bbbc8a8d634dd1c9e9ea99f3283734993a7acbe3aaf55080e651af78c302b57e43ab3482bb9682ed4fc57cae06bbdc46c2a
+DIST woke-0.15.0.tar.gz 86130 BLAKE2B 1954ea8dcfdc5ca035a78f7fa97b7a03a4c7b11e1741fc2457d529e04a27f565f9f2b6b16be45608bf60d7342afb9a0f8cd631d67d24f81e6b24be5b132099e9 SHA512 796b18887a5a82b0de2ab6dba353c12bb252650a325c1033d62bf7103356d9da744a6064fad2e0472ee6a1851f491a486b935a8d030d96711459c1ad912a75c1
+EBUILD woke-0.14.0.ebuild 33620 BLAKE2B fe619ac9b5f4927ce12a51c5f82f320c0182184c98f08db0004a9c57ba2598302a1a3660a7f85e31577a9b306fa3890fe72ca4c07a98fefea6b0e392b0dcba3d SHA512 695c39ba2a07c50c789d9c22958950f487122bccf0418f1d1750cb2720830ff79e3619f1d70294364866cac889a8fdd8b9f2d27ae4cbdcd3c55a56e2d052e2cd
+EBUILD woke-0.15.0.ebuild 33621 BLAKE2B c5ac50a1f7cf7fdb8d9d4185724408b7930c13b15dace5dc069dea197641c319559ed0eeca68f747550041bb6399a99e1d5c0f5ac00e30906768ad3a38a8ea98 SHA512 b3c61afec222eb0f942ae80239826bbbc8a8d634dd1c9e9ea99f3283734993a7acbe3aaf55080e651af78c302b57e43ab3482bb9682ed4fc57cae06bbdc46c2a
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/woke/woke-0.14.0.ebuild b/dev-util/woke/woke-0.14.0.ebuild
index d4c53f4202eb..e9b1ee947c12 100644
--- a/dev-util/woke/woke-0.14.0.ebuild
+++ b/dev-util/woke/woke-0.14.0.ebuild
@@ -629,7 +629,7 @@ SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	go build .
diff --git a/dev-util/woke/woke-0.15.0.ebuild b/dev-util/woke/woke-0.15.0.ebuild
new file mode 100644
index 000000000000..d4c53f4202eb
--- /dev/null
+++ b/dev-util/woke/woke-0.15.0.ebuild
@@ -0,0 +1,641 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="check source code for non-inclusive language"
+HOMEPAGE="https://getwoke.tech/"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/antihax/optional v1.0.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/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/caitlinelfring/go-env-default v1.0.0"
+	"github.com/caitlinelfring/go-env-default v1.0.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.12.0"
+	"github.com/fatih/color v1.12.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/get-woke/fastwalk v1.0.0"
+	"github.com/get-woke/fastwalk v1.0.0/go.mod"
+	"github.com/get-woke/go-gitignore v1.1.2"
+	"github.com/get-woke/go-gitignore v1.1.2/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"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-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.5"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/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/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.9.3"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.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_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/rs/zerolog v1.23.0"
+	"github.com/rs/zerolog v1.23.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.8.1"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/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-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.2"
+	"golang.org/x/tools v0.1.2/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/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build .
+}
+
+src_install() {
+	dobin woke
+	dodoc README.md example.yaml
+}
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index d11eb43519bf..d268281214bc 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,5 +1,5 @@
 AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
-EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1092 BLAKE2B f32dccc300df7796a66093cf7dd5f36884bd97639779c78b48df702dc5701bc96ce8336e8dbd46f2c61e4f903336ee3c84c86991f2c07919bb851d50461f5b9f SHA512 5401e2786759e852bcfa6ae7cbbbee3b01fbb934279999f5ad7d6fc468325403a5c340489d4030207aa4349af960d3baa2a7de673ec4e74b4d4595c3d1e9be09
+EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1089 BLAKE2B eeb075d68e74f9a93687918c721b3a654e032be74d26e55e89c6d712b94bd250fcabdef55f02ce3e45ab26e91e255104b1069a996761e05103837dac01cea7ba SHA512 279cd9be221214447a829ae024f87b031ee454a68990c551368c77bad1892c60216638c7f1ad4e1d3297ad69b7103b30fe08c5c5ad969524e77ac9cc66a7d893
 MISC metadata.xml 324 BLAKE2B 0a0246b1a280d7901bcfcc117a375b863754fbe3a0601d96997bbeafaa8292c08a6e4b704157c6a5844e5c00497ebec421684676176d3d7a2928b47cd961db14 SHA512 308093da0e00c92364156a867ec18880f0e802330211433029a5d0ad2c1cd82ae9881a924ee1a0320c25df4cea3e1c1d951babea0e15f5c3f8d2855167038f03
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
index 963f344ebfad..9d0e1dfeac10 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://furius.ca/xxdiff/"
 # generated as 'hg archive xxdiff-${P}.tar'
 # from https://bitbucket.org/blais/xxdiff tree
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 86fd724d4bd6..50de680a2235 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 84d6dbbcfa64..f709b2ffb6d7 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3398 BLAKE2B 116d7988d71fd55dc4e7fa0e707f0909d
 AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c056b97962a11e4aa4f56f48695fac5dbcc77b8a44cfea3f4ace27fc24a894b7968c7b843476ea78a4560ce648 SHA512 eca9b73848d4d219de2f29021f6b5376ce507ea4b4cbf17b7007c96f75b8598feebf9d18750dbd617b903cfbdfd9ed0ec2d83c6f05462e1dfc4b100bc3745ca1
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1-r1.ebuild 904 BLAKE2B 96c62507b55ef9f1f506c76b7d2a66746e390dc9736c9915f8b2c8bd2f96b769dd4c119c0c872f3912962882a0cd9b1fde1b3f6b6b39b9abf42f2e76db6ea733 SHA512 4fb361e3183f1274d67cc4cc4b317e1ca35b9baa0b35bb04d1e00b1893a6ba76404ae468257a07b47a6184449c6a6990fec90474d0b64c9a5cd64ab2bf500065
-EBUILD cvsps-3.13-r2.ebuild 994 BLAKE2B 4f1bbaa9121d7ba23b7456c599955808f6f4ccd2caea692528aa7fbf6eedf7456a8c9265422754be8c68befb16fbb0cbd3419b766016866e8565dbcf6018741b SHA512 2f73e96bb7e3c3f12a259dfba05096d846ee06cb4269c89afcc7e8716058864bd4930122ceb9a787716f6ac58033eba5c9d84bfb20ae4ea883735206e129f09e
+EBUILD cvsps-2.2_beta1-r1.ebuild 910 BLAKE2B 0d200cea90e523416b5a4d88ddbe337b47ca0e40a2b37ffe857319d60b0133360cd3b4ff132bd4fc59f29d05d27bfd7559474ece15c2246fa3de17872ac2ed50 SHA512 728b0bfa09087bc6bb8f3f16c299bae9e6451eeb96a15f8172ff476682c592cd1f409812c683186f63b32c6c44235da0b258668fa1ee4df79cba0d80bab5e975
+EBUILD cvsps-3.13-r2.ebuild 1000 BLAKE2B 72a9d5b5d10ee83c34f8cf4f35b0a2212efeff6bb4eac69eb13d94e15c77e7dc963f8a8c7cfb20852d59168450d7be69067d106d225f638555b92d63bdd3b655 SHA512 95ff0cfc8272643aac1d8e265515172c12c1ddb98079822b20ac37a2276b0060305653db4e096bb746cd650b1752604b3e54e9f3be219a07bcfcf501b62ea4d5
 MISC metadata.xml 240 BLAKE2B 75c454379c30bb18cfb0c1be50c74635c8c16414a600b305228f7bcb9c522da69ff0b4316d3e69c569cc1ee60bba1c70c850a41ed5fe98f06443d12a74902e38 SHA512 955df4846cce9194d71505a082c2eb7ef5e2dd75506de19ba93e3b2a48d36620f77cf35fccc897ca764827a8cad58a3ef7278976e1d02f64c2c868998432f9ed
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 41a453738252..7177b069d6a2 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 1cfad7729221..0a04cf1d0dbb 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 6e395ae3278f..43b2c57c0dcc 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1,3 +1,4 @@
-DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
-EBUILD git-pw-2.0.0.ebuild 1037 BLAKE2B 8733ba74e1410b1646ffef903050bf536911d4b24150156775c594f5b9a58d84dc7e5d6d73e0a315a90cad6d8ce9d488b7425d49173a7f4c2830333cc292f46a SHA512 805faf949e13acfc57ee862dc8c57aea69425d2b9c2cfe8d2e6501907a940f1930d88b24aae803e999a97d3c595cc1c6301cd6efbc6196277c8e62302f585c40
+AUX git-pw-2.1.1-test.patch 1048 BLAKE2B e44d85ed1b0073a0c4b3e9f044e5f6d79612f9acc2a3b65dab9d4bf653c3364935203741346ca56cf6d3b0b75550954616289ed6a86f49cab7ab5fbc84cdf3a7 SHA512 6b5741a95c35cc19afac0d5f1485fb85290d2a9eb9938f65eed83b0bf016101e0321262685687d57c52abe4cdd18a1d33ab632df5c37b59a26386161ecc17956
+DIST git-pw-2.1.1.tar.gz 32489 BLAKE2B 516eb3b81c3798a455b7122a3b0ad9bf0d9722eb6f301ea58ed766cca94137f4da4eaf34a40ec7c5e108368aa6099f9401aba6d71d463913cd2b7fd9dc7aef09 SHA512 3cbf0670bf811d6b6ef0d4c5c7ad4321380d442c62fd15869758b26b4fc375c2d4bd2bdbf693a41d0cbe862bdef15fc02d04124a089f7786bd1b2e56f818e0c2
+EBUILD git-pw-2.1.1.ebuild 1080 BLAKE2B 82442c41df4c20dadbb231d982367eadc0372ab9b3e275344dad5ccf4e1b92731c69cd3d16df200272415abcffd2717239840f9ccf48fa33b739c4a8a70c57c6 SHA512 62efae093f24d7c0ffeba0a3bd9503e92185c3d7596c2c6e98cdbe2051379a74b8044e519d673e2fd57e68b6fae6c6bd4e71d191f9de1bdebfc56c9c91e74b06
 MISC metadata.xml 573 BLAKE2B ea8a1646462b2ff59f05531d1964c160216b7c19b17e261a75940e591106195050ad9ba65f3b5ea594d4a4ad53cfda7cf7dbb1894c6ac850a6b5c9e189093432 SHA512 cc0a718a6d9bd29c5a77dc3f23a4f4b691ab0c954c6c2a7266126c2cbc312aab73e5484120bad031e77abcf0c1cbff2c7af998700e45eebc51fd73facc988f8c
diff --git a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
new file mode 100644
index 000000000000..00df55f872d1
--- /dev/null
+++ b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
@@ -0,0 +1,28 @@
+From 08152c86d02c36c425047fa9220d6d5ac3fcda01 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 26 Sep 2021 19:55:40 +0100
+Subject: [PATCH] tests: Unset PAGER env when testing fallback
+
+Prior to this commit, the test test_echo_via_pager_env_default will
+fail when $PAGER is set to /usr/bin/less (or anything other than
+"less").  Use unittest.mock to unset the environment variable during
+the test.
+---
+ tests/test_utils.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index cf75a55..a0974f1 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -75,6 +75,7 @@ def test_echo_via_pager_env_PAGER(mock_inner, mock_tabulate, mock_config):
+ @mock.patch.object(utils, 'git_config', return_value=None)
+ @mock.patch.object(utils, '_tabulate')
+ @mock.patch.object(utils, '_echo_via_pager')
++@mock.patch.dict(os.environ, {'PAGER': ''})
+ def test_echo_via_pager_env_default(mock_inner, mock_tabulate, mock_config):
+     utils.echo_via_pager('test', ('foo',), None)
+ 
+-- 
+2.33.0
+
diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.0.0.ebuild
deleted file mode 100644
index a27a91f9a2c5..000000000000
--- a/dev-vcs/git-pw/git-pw-2.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/getpatchwork/git-pw.git"
-else
-	SRC_URI="https://github.com/getpatchwork/git-pw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A tool for integrating Git with Patchwork"
-HOMEPAGE="https://github.com/getpatchwork/git-pw"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
-	<dev-python/click-8.0[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	export PBR_VERSION=${PV}
-	distutils-r1_src_compile
-}
-distutils_enable_tests pytest
diff --git a/dev-vcs/git-pw/git-pw-2.1.1.ebuild b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
new file mode 100644
index 000000000000..dd63e27b733c
--- /dev/null
+++ b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/getpatchwork/git-pw.git"
+else
+	SRC_URI="https://github.com/getpatchwork/git-pw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool for integrating Git with Patchwork"
+HOMEPAGE="https://github.com/getpatchwork/git-pw"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-test.patch" )
+
+RDEPEND="
+	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
+	)
+"
+
+src_compile() {
+	export PBR_VERSION=${PV}
+	distutils-r1_src_compile
+}
+distutils_enable_tests pytest
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f9b23a016ded..ae41e0c172af 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -41,7 +41,7 @@ EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaf
 EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987cc2dc62f076c3a16b2d387374f44cc55c2ef3210583e4972b0783d32d1e49802fd4b5f8fc7d54a5e6d5c70e9 SHA512 5fe5ebbebef55cc29e23984ecda3c3e8814bf8c17ef4329960ff561a857058e998ee5c5f9bdb3b26e7dfe7d408dd0fce772074f17bbaf0f3a9fbbb776e3b6242
 EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51
 EBUILD git-2.32.0-r1.ebuild 18175 BLAKE2B d1ad748f2352b377dadad657fc7259df0e14829949e76975cd85264ceaf8cacca56298401346719d4848204489909e47d26f03034add34aefeccea3ffe46f87e SHA512 afe87968de6d6956a265ae693a2ebe6ff91d2cdf5fa0486b7735a8feb39b8eb4126e9d87fd1a0cee1fb9784ad43875913eff9494d3075d5c9070dd5ffd30e494
-EBUILD git-2.33.0-r1.ebuild 18182 BLAKE2B 2156858a01b4f819f5a36375b91375c8a3da26a8729c9900f20ee73d80bbf595e3c4f82fba83d1f91d38f679f9330d5ddc5811e0fe34eccb85c4c83596ce7e15 SHA512 863ec5b8a7c3d247818bbeb171ad9c1debb660d4fa7b67c417661eb92c3337ce5e1daa24159485969acd17cc3524aacff679c679ad61f6fb2f3f1baac21132f9
+EBUILD git-2.33.0-r1.ebuild 18188 BLAKE2B d919e980b85e905b7c593a3946f992e7125a294e42481af2601fc8b64a0d3ba9b4f0d17b1a7a0dc6addcb6bd851251ad71fae35c3ec5800930ef328e6c87e87d SHA512 8bd82321e7aeeb46eccd55ba0c8ca229b8b41434d2d5500f8bc3a5a453225f6485ce15897b95aa9626a04f655d7f344ea2bc45284bb36ebd66fae7d9080f2e65
 EBUILD git-9999-r1.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r2.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r3.ebuild 18071 BLAKE2B 4f7571d39e8cd836fd71117a34df82a092417f9543f6d165121359230e1f2b6fce8b925345d205512d372e56459c7ad4983a79da2785139b99dacba6bbac0a3f SHA512 901412cd7d3d71e67f66e0a37d2e5f9032cede4c944a04455de962fb6f681cad941839d0e60a77dc6959fbd616aac7afa556a2aab24aaaf9cd7f95802c5dcbd3
diff --git a/dev-vcs/git/git-2.33.0-r1.ebuild b/dev-vcs/git/git-2.33.0-r1.ebuild
index 776695e8922a..568fa5085e27 100644
--- a/dev-vcs/git/git-2.33.0-r1.ebuild
+++ b/dev-vcs/git/git-2.33.0-r1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
index 5a83c47e83ee..08aa4f16c881 100644
--- a/dev-vcs/github-pages-publish/Manifest
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -1,3 +1,3 @@
 DIST github-pages-publish-0.1.3.tar.gz 3568 BLAKE2B d19d9d218d584f92a70016b6522b1e27edecf7de8dcc1fb4ca790980ec2a4ffd4f401f11ac7cd2483e5e723f9ae088678dc3aa346eb66de536a5c10435ff1953 SHA512 a501a6fbdf10038a35b5df8add58a79813d6cc2b26b2bfed2a2db7d02740c587a60402459c2fcdeeec66c72f1d5df532023490219daba14ce60782a2018b93d6
-EBUILD github-pages-publish-0.1.3.ebuild 740 BLAKE2B 4847ca11fb9f2d28dcf4edcb31b88c4b84ee8a142308be41cfef68f75d0cf7bc13268a078787e7f1444035cf5980d4eece04dbde19fbfbbda497d9929afe7399 SHA512 eba605a649efd5b5497a73b1ef34e3a0aa10551dcc96032044b6ae2adde23eb9edac073d1436017942e70d46cefc4657f6ea03d4fde1fd9135bc47c3e79c3cd6
+EBUILD github-pages-publish-0.1.3.ebuild 495 BLAKE2B c307b92d4ba4564c70ce945f4d425af13fd39bb98781d2eaf9203ba8cf55180b638aa0620727b3b89ab07206e8dfbf1587526220cad0cc407c4b6bbcceef7f78 SHA512 a7077b80ff7fb1951babd9e410e378e207194a710225eb829b2e73524e4b02ffd5f6c030c5ea31638651d9d267bcb0662e994a1fb75ba376fbc670cdc5e3fb80
 MISC metadata.xml 449 BLAKE2B 871ecd35ccdb66151e7d175404f8c456b924df91c499c924c37dfb25bab5051b97db89b4358031997def6072583fc3a96fd154f57dff39c9621b08718ddc5bd9 SHA512 69adde21cf695adddad419b1b3261b48daab79a85207579f3d09c10df4ca06befcaf0e4a0b7b88e48087406da7a1e1110ec109c156ce44a9c6525c51e0563681
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
index 3226c0a807a2..73c53a38c1ea 100644
--- a/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
@@ -3,30 +3,17 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-GIT_ECLASS=
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
+inherit distutils-r1
 
 DESCRIPTION="A script that commits files from a directory to Github Pages"
 HOMEPAGE="https://pypi.org/project/github-pages-publish/
 	https://github.com/rafaelmartins/github-pages-publish"
-
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=dev-python/pygit2-0.20.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/pygit2-0.20.0"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c024f3a9237d..7b000046d1e0 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
new file mode 100644
index 000000000000..b89f4216034f
--- /dev/null
+++ b/eclass/bzr.eclass
@@ -0,0 +1,257 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: bzr.eclass
+# @MAINTAINER:
+# Ulrich Müller <ulm@gentoo.org>
+# @AUTHOR:
+# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# Mark Lee <bzr-gentoo-overlay@lazymalevolence.com>
+# Ulrich Müller <ulm@gentoo.org>
+# Christian Faulhammer <fauli@gentoo.org>
+# @SUPPORTED_EAPIS: 7 8
+# @BLURB: generic fetching functions for the Bazaar VCS
+# @DESCRIPTION:
+# The bzr.eclass provides functions to fetch and unpack sources from
+# repositories of the Bazaar distributed version control system.
+# The eclass was originally derived from git.eclass.
+#
+# Note: Just set EBZR_REPO_URI to the URI of the branch and src_unpack()
+# of this eclass will export the branch to ${WORKDIR}/${P}.
+
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;;
+esac
+
+PROPERTIES+=" live"
+
+BDEPEND="dev-vcs/breezy"
+
+EXPORT_FUNCTIONS src_unpack
+
+# @ECLASS-VARIABLE: EBZR_STORE_DIR
+# @USER_VARIABLE
+# @DESCRIPTION:
+# The directory to store all fetched Bazaar live sources.
+: ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src}
+
+# @ECLASS-VARIABLE: EBZR_UNPACK_DIR
+# @DESCRIPTION:
+# The working directory where the sources are copied to.
+: ${EBZR_UNPACK_DIR:=${WORKDIR}/${P}}
+
+# @ECLASS-VARIABLE: EBZR_INIT_REPO_CMD
+# @DESCRIPTION:
+# The Bazaar command to initialise a shared repository.
+: ${EBZR_INIT_REPO_CMD:="brz init-shared-repository --no-trees"}
+
+# @ECLASS-VARIABLE: EBZR_FETCH_CMD
+# @DESCRIPTION:
+# The Bazaar command to fetch the sources.
+: ${EBZR_FETCH_CMD:="brz branch --no-tree"}
+
+# @ECLASS-VARIABLE: EBZR_UPDATE_CMD
+# @DESCRIPTION:
+# The Bazaar command to update the sources.
+: ${EBZR_UPDATE_CMD:="brz pull --overwrite-tags"}
+
+# @ECLASS-VARIABLE: EBZR_EXPORT_CMD
+# @DESCRIPTION:
+# The Bazaar command to export a branch.
+: ${EBZR_EXPORT_CMD:="brz export"}
+
+# @ECLASS-VARIABLE: EBZR_CHECKOUT_CMD
+# @DESCRIPTION:
+# The Bazaar command to checkout a branch.
+: ${EBZR_CHECKOUT_CMD:="brz checkout --lightweight -q"}
+
+# @ECLASS-VARIABLE: EBZR_REVNO_CMD
+# @DESCRIPTION:
+# The Bazaar command to list a revision number of the branch.
+: ${EBZR_REVNO_CMD:="brz revno"}
+
+# @ECLASS-VARIABLE: EBZR_OPTIONS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The options passed to the fetch and update commands.
+
+# @ECLASS-VARIABLE: EBZR_REPO_URI
+# @DEFAULT_UNSET
+# @REQUIRED
+# @DESCRIPTION:
+# The repository URI for the source package.
+
+# @ECLASS-VARIABLE: EBZR_PROJECT
+# @DESCRIPTION:
+# The project name of your ebuild.  Normally, the branch will be stored
+# in the ${EBZR_STORE_DIR}/${EBZR_PROJECT} directory.
+#
+# If EBZR_BRANCH is set (see below), then a shared repository will be
+# created in that directory, and the branch will be located in
+# ${EBZR_STORE_DIR}/${EBZR_PROJECT}/${EBZR_BRANCH}.
+: ${EBZR_PROJECT:=${PN}}
+
+# @ECLASS-VARIABLE: EBZR_BRANCH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The directory where to store the branch within a shared repository,
+# relative to ${EBZR_STORE_DIR}/${EBZR_PROJECT}.
+#
+# This variable should be set if there are several live ebuilds for
+# different branches of the same upstream project.  The branches can
+# then share the same repository in EBZR_PROJECT, which will save both
+# data traffic volume and disk space.
+#
+# If there is only a live ebuild for one single branch, EBZR_BRANCH
+# needs not be set.  In this case, the branch will be stored in a
+# stand-alone repository directly in EBZR_PROJECT.
+
+# @ECLASS-VARIABLE: EBZR_REVISION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Revision to fetch, defaults to the latest (see brz help revisionspec).
+
+# @ECLASS-VARIABLE: EBZR_OFFLINE
+# @USER_VARIABLE
+# @DESCRIPTION:
+# Set this variable to a non-empty value to disable automatic updating
+# of a bzr source tree.  This is intended to be set outside the ebuild
+# by users.
+: ${EBZR_OFFLINE=${EVCS_OFFLINE}}
+
+# @ECLASS-VARIABLE: EVCS_UMASK
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set this variable to a custom umask.  This is intended to be set by
+# users.  By setting this to something like 002, it can make life easier
+# for people who do development as non-root (but are in the portage
+# group), and then switch over to building with FEATURES=userpriv.
+# Or vice-versa.  Shouldn't be a security issue here as anyone who has
+# portage group write access already can screw the system over in more
+# creative ways.
+
+# @ECLASS-VARIABLE: EBZR_WORKDIR_CHECKOUT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If this variable is set to a non-empty value, EBZR_CHECKOUT_CMD will
+# be used instead of EBZR_EXPORT_CMD to copy the sources to WORKDIR.
+
+# @FUNCTION: _bzr_initial_fetch
+# @USAGE: <repository URI> <branch directory>
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function, retrieves the source code from a repository for the
+# first time, using ${EBZR_FETCH_CMD}.
+_bzr_initial_fetch() {
+	local repo_uri=$1 branch_dir=$2
+
+	if [[ -n ${EBZR_OFFLINE} ]]; then
+		die "EBZR_OFFLINE cannot be used when there is no local branch yet."
+	fi
+
+	# fetch branch
+	einfo "bzr branch start -->"
+	einfo "   repository: ${repo_uri} => ${branch_dir}"
+
+	${EBZR_FETCH_CMD} ${EBZR_OPTIONS} "${repo_uri}" "${branch_dir}" \
+		|| die "${ECLASS}: can't branch from ${repo_uri}"
+}
+
+# @FUNCTION: _bzr_update
+# @USAGE: <repository URI> <branch directory>
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function, updates the source code from a repository, using
+# ${EBZR_UPDATE_CMD}.
+_bzr_update() {
+	local repo_uri=$1 branch_dir=$2
+
+	if [[ -n ${EBZR_OFFLINE} ]]; then
+		einfo "skipping bzr pull -->"
+		einfo "   repository: ${repo_uri}"
+	else
+		# update branch
+		einfo "bzr pull start -->"
+		einfo "   repository: ${repo_uri}"
+
+		pushd "${branch_dir}" > /dev/null \
+			|| die "${ECLASS}: can't chdir to ${branch_dir}"
+		${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} "${repo_uri}" \
+			|| die "${ECLASS}: can't pull from ${repo_uri}"
+		popd > /dev/null || die "${ECLASS}: popd failed"
+	fi
+}
+
+# @FUNCTION: bzr_fetch
+# @DESCRIPTION:
+# Wrapper function to fetch sources from a Bazaar repository with
+# bzr branch or bzr pull, depending on whether there is an existing
+# working copy.
+bzr_fetch() {
+	local repo_dir branch_dir save_umask
+
+	[[ -n ${EBZR_REPO_URI} ]] || die "${ECLASS}: EBZR_REPO_URI is empty"
+
+	if [[ ! -d ${EBZR_STORE_DIR} ]]; then
+		(
+			addwrite /
+			mkdir -p "${EBZR_STORE_DIR}" \
+				|| die "${ECLASS}: can't mkdir ${EBZR_STORE_DIR}"
+		)
+	fi
+
+	pushd "${EBZR_STORE_DIR}" > /dev/null \
+		|| die "${ECLASS}: can't chdir to ${EBZR_STORE_DIR}"
+
+	repo_dir=${EBZR_STORE_DIR}/${EBZR_PROJECT}
+	branch_dir=${repo_dir}${EBZR_BRANCH:+/${EBZR_BRANCH}}
+
+	if [[ -n ${EVCS_UMASK} ]]; then
+		save_umask=$(umask) || die
+		umask "${EVCS_UMASK}" || die
+	fi
+	addwrite "${EBZR_STORE_DIR}"
+
+	if [[ ! -d ${branch_dir}/.bzr ]]; then
+		if [[ ${repo_dir} != "${branch_dir}" && ! -d ${repo_dir}/.bzr ]]; then
+			einfo "creating shared bzr repository: ${repo_dir}"
+			${EBZR_INIT_REPO_CMD} "${repo_dir}" \
+				|| die "${ECLASS}: can't create shared repository"
+		fi
+		_bzr_initial_fetch "${EBZR_REPO_URI}" "${branch_dir}"
+	else
+		_bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
+	fi
+
+	if [[ -n ${save_umask} ]]; then
+		umask "${save_umask}" || die
+	fi
+
+	cd "${branch_dir}" || die "${ECLASS}: can't chdir to ${branch_dir}"
+
+	# Save revision number in environment. #311101
+	export EBZR_REVNO=$(${EBZR_REVNO_CMD})
+
+	if [[ -n ${EBZR_WORKDIR_CHECKOUT} ]]; then
+		einfo "checking out ..."
+		${EBZR_CHECKOUT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
+			. "${EBZR_UNPACK_DIR}" || die "${ECLASS}: checkout failed"
+	else
+		einfo "exporting ..."
+		${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
+			"${EBZR_UNPACK_DIR}" . || die "${ECLASS}: export failed"
+	fi
+	einfo \
+		"revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${EBZR_UNPACK_DIR}"
+
+	popd > /dev/null || die "${ECLASS}: popd failed"
+}
+
+# @FUNCTION: bzr_src_unpack
+# @DESCRIPTION:
+# Default src_unpack(), calls bzr_fetch.
+bzr_src_unpack() {
+	bzr_fetch
+}
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1326809a8bc1..3513a74c4db4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -369,8 +369,11 @@ distutils_enable_sphinx() {
 # of RDEPEND to test?-BDEPEND.  The test-runner argument must be one of:
 #
 # - nose: nosetests (dev-python/nose)
+#
 # - pytest: dev-python/pytest
+#
 # - setup.py: setup.py test (no deps included)
+#
 # - unittest: for built-in Python unittest module
 #
 # Additionally, if --install is passed as the first parameter,
@@ -618,6 +621,7 @@ _distutils-r1_handle_pyproject_toml() {
 }
 
 # @FUNCTION: _distutils-r1_check_all_phase_mismatch
+# @INTERNAL
 # @DESCRIPTION:
 # Verify whether *_all phase impls is not called from from non-*_all
 # subphase.
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 95fce0f0258d..250f49bd58bd 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: mozcoreconf-v6.eclass
 # @MAINTAINER:
 # Mozilla team <mozilla@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: core options and configuration functions for mozilla
 # @DESCRIPTION:
 #
@@ -28,7 +28,7 @@ case "${EAPI:-0}" in
 		inherit multilib versionator
 		DEPEND+=" ${BDEPEND}"
 		;;
-	7)
+	7|8)
 		;;
 	*)
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers"
@@ -120,7 +120,8 @@ moz_pkgsetup() {
 	# workaround to set python3 into PYTHON3 until mozilla doesn't need py2
 	if [[ "${PYTHON_COMPAT[@]}" != "${PYTHON_COMPAT[@]#python3*}" ]]; then
 		export PYTHON3=${PYTHON}
-		python_export python2_7 PYTHON EPYTHON
+		export PYTHON=python2.7
+		export EPYTHON="${EPREFIX}"/usr/bin/python2.7
 	fi
 }
 
diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index 3966dfd9f53f..53f27ed782c3 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -17,8 +17,6 @@ if [[ ! ${_MOZEXTENSION} ]]; then
 # paths specified in the eclass.
 : ${MOZEXTENSION_TARGET:=""}
 
-inherit eutils
-
 DEPEND="app-arch/unzip"
 
 mozversion_extension_location() {
diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index f8e3c95d8824..5063445ae933 100644
--- a/eclass/mozlinguas-v2.eclass
+++ b/eclass/mozlinguas-v2.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Nirbheek Chauhan <nirbheek@gentoo.org>
 # Ian Stakenvicius <axs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Handle language packs for mozilla products
 # @DESCRIPTION:
 # Sets IUSE according to MOZ_LANGS (language packs available). Also exports
@@ -19,7 +19,7 @@ inherit mozextension
 case "${EAPI:-0}" in
 	6)
 		inherit eapi7-ver ;;
-	7)
+	7|8)
 		;;
 	*)
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers" ;;
diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index 7652a8625184..0d7a1aa50f39 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -28,7 +28,7 @@ esac
 # @DESCRIPTION:
 # List of versions to reverse sort POSTGRES_COMPAT slots
 
-_POSTGRES_ALL_VERSIONS=( 9999 13 12 11 10 9.6 9.5 9.4 9.3 9.2 )
+_POSTGRES_ALL_VERSIONS=( 9999 14 13 12 11 10 9.6 9.5 9.4 9.3 9.2 )
 
 
 
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index e90a9b618d6b..c4fd0c492f45 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -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
 
 # @ECLASS: savedconfig.eclass
@@ -146,14 +146,10 @@ restore_config() {
 		treecopy . "${dest}" || die "Failed to restore ${found} to $1"
 		popd > /dev/null
 	else
-		# maybe the user is screwing around with perms they shouldnt #289168
-		if [[ ! -r ${base} ]] ; then
-			eerror "Unable to read ${base} -- please check its permissions."
-			die "Reading config files failed"
-		fi
 		ewarn "No saved config to restore - please remove USE=savedconfig or"
 		ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PN}"
-		ewarn "Your config file(s) will not be used this time"
+		ewarn "and ensure the build process has permission to access it."
+		ewarn "Your config file(s) will not be used this time."
 	fi
 }
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 625460987053..4d79ff0bd102 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index 5e6fdd577715..aacb8780fc3f 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-robots-40.0.tar.xz 420024 BLAKE2B 2cac9377914a4cc12bdfe23bf73fd1c63e80aee7c70d3817ebeac2cb044c6a1a4f00a6fd40f903bea5560ef598ad74d372dda91a61e486eb17b0bd85bc6c53ca SHA512 bff0caf40976b420f564abbfaa96ae1627da89cfa19a7ff3c14c313f7bbdd1d0452452d49ca7b150493915ae7eebdd022aada673405e0794e4c3abd8f5c39b4f
-EBUILD gnome-robots-40.0.ebuild 890 BLAKE2B 49cdcedf25755ba035e7bc9ebd2370b064163e97f878fb9f39745305c4b6c61d4b3aa4c895171a0973728aa6b9b12537bc87c20e3e61c18d665216ea0e7b2d67 SHA512 7a6d6d6da4419be9218ff008f2dfddcc52a9dc5777b1b9699cee645b2e5711649cb512eeb8a5269e106bbf72fb887da16b9fabb5fc3eb0e451403fbeb79d330a
+EBUILD gnome-robots-40.0.ebuild 918 BLAKE2B 041ccbfbd8cebadcfb1e06d32a2c4cca0cc13e9e78b2aa298bba78e7481a288c749ec72a920661d0eea67f20b7342526316d2d91db2fe61cf5f3b9a430afbc87 SHA512 929355ea97f94dc90e766977be10ca6d7a5f4f6692d8e0f28388ed9e8e7821ebb49378fa159f6d570751cfb91dc2b95a2cf88eda99e8730970568e000bd216d6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-arcade/gnome-robots/gnome-robots-40.0.ebuild b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
index ecfa46bb52ff..6002689eba77 100644
--- a/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(vala_depend)
+	gnome-base/librsvg:2[vala]
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0977c3388cd4..d69abb6e146d 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index ce96c2f22c61..011636d61fc5 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,6 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20210506-r1.ebuild 4471 BLAKE2B 95406846ddc8fe4322c901cb1f7ce1c00fbc760172391531a6ef8e500e4fdaf4bd784854582476aaf339fcc7cc7587075913d10ad826ce63d6dc8b407fbad4dd SHA512 3e348d1ad30dc689e65bbbe4a296e82c2ff07cdfc6be87ec81e5ea4c259a19b0116f3b25b591b9b97620a62e8274dfd4cafb18cd67950aba57a54883be410c20
+EBUILD dolphin-5.0_p20210506-r1.ebuild 4470 BLAKE2B da5fc22a352173c13e175a86ea77baa6a290c550e59fa73e167cddeef1466c98aa2d032bff4ab6c33f77aabd4e51f1346403be5d1f2cb8cf4ce73e6a33a4ce7a SHA512 c9b4b791feb2760e192cd1ba5ae03b696eedc1811ff85e3c8c9be8a0cdfe79ce8f77af58e168a65ced75a1fb1e0fb6d88d97e94b07f6e276fdc59eea3a603db0
 EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B 5285d51e4404f2ae273c8315b143a18f5587356ad1d8c6b1c4fa369d5e9737742bb5b6af4c3c3f7d04e63edf5052245632256eed16136dfcc3beca83f861fb96 SHA512 f785395201fefb634972bd1c5b4538cb5e2534f1a4716f744ba1424f61deed7c833d406bfea71197d8a297e593d372c3b93c19447925ec8f72f518a900a016b6
 EBUILD dolphin-9999.ebuild 4578 BLAKE2B 94e3c6fbb50a2da4943d6a80d0e9e9cdf38fab6a9dc555a9ade12b314d1dbc62a653fb7ef215c0ffb074afd9fea5fc9108a59e96251864c769d0fbc11dc65eee SHA512 7ca40222418fa167a90880d2a9a1dd35b25da12b4ad7eb24c75893cddb08fd33e1e011c32a3b8a055d0e6eb9f1e0f2001c4701685385bc2069a0826dbb5521e1
 MISC metadata.xml 1081 BLAKE2B 9723c2b177b0f695a71dd3c06414079a149dea55a9110c594a6667445eec4154bbd213c423734584ff276441e121f69d72f1537a31633b342e69e2511e2bc7a7 SHA512 9924dccb09af0b0adf4f7231bbff23aad196132f853183c0217578a456030e33011ba9ebdcfa6296ac65e8b8aa90b1d94754b937248cf0e4dab9faf9a9c62e99
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index ff1c6123f877..e487f7c878e4 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -15,7 +15,7 @@ else
 		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
 			-> ${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index b1529a868909..22fd55e00b89 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 8e47e46fec9a..0e62334c9f7c 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,5 +1,5 @@
 DIST frotz-2.52.tar.bz2 289109 BLAKE2B d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774 SHA512 387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710
 DIST frotz-2.53.tar.bz2 375800 BLAKE2B a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1 SHA512 e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808
 EBUILD frotz-2.52-r1.ebuild 1690 BLAKE2B 2d95ac95b4541e5e887b0067dd58dc7ee6f5bb18d7bbcbb3f1c389032c5627fa8521570e808e25e7663f8e8a32c5835adde3f487cbdabb7f08f1dce23e23b95e SHA512 6290d59b3362aea687945c9f38664f6d927bd442878b5da2a23b8754a761f79542dd9087546e42fd5f88aab58e6f05cc878c09cabf0e26e173bd23d61ce2be4d
-EBUILD frotz-2.53-r1.ebuild 1690 BLAKE2B 2d95ac95b4541e5e887b0067dd58dc7ee6f5bb18d7bbcbb3f1c389032c5627fa8521570e808e25e7663f8e8a32c5835adde3f487cbdabb7f08f1dce23e23b95e SHA512 6290d59b3362aea687945c9f38664f6d927bd442878b5da2a23b8754a761f79542dd9087546e42fd5f88aab58e6f05cc878c09cabf0e26e173bd23d61ce2be4d
+EBUILD frotz-2.53-r1.ebuild 1697 BLAKE2B 42edccf57839f10d7647e2a7aeb3c88e59e4a73b32ff8f54d978ad039a5810d185f398be9d8b65a96cda1f5d1959c8f66b77cc1d6f262ec3ffbbc429bf05ff6b SHA512 a706486df1c48396deb406a566fe632ec8657330e6c57cea8de284f349f8ce4b265a914572b620dcbf59239cf1ab9e41e879f5099b81ac7ff5c8b113b3ac1597
 MISC metadata.xml 338 BLAKE2B 811899ad96ae5e5b023d3cfdf11dc19de37b336dd7903bb63ec14c83ea0c96955ec1803a9954cff560c89bfb083a8f614e61bbe199e66d053125d4642c8be2aa SHA512 b72ccc452bb2d200f0c3b5cd3e361dadc4d80b248e0c8bef50fb264c85b0e0dd04639014c3b4d3f590ebcbcdd9bfe41c61c540514a272ee7ebb406bfbb337546
diff --git a/games-engines/frotz/frotz-2.53-r1.ebuild b/games-engines/frotz/frotz-2.53-r1.ebuild
index 6be32d8e9c56..1fdf97ae9e56 100644
--- a/games-engines/frotz/frotz-2.53-r1.ebuild
+++ b/games-engines/frotz/frotz-2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="ncurses sdl sound unicode"
 REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
 
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index a866d116ac8c..2f6c9cbfb2f3 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,6 +1,6 @@
 AUX qtads-3.0-fluidsynth.patch 1817 BLAKE2B 32f61fde3f3521c7d50ca8b67d5a66721caec4595e6a98a15f4434f6da6dda62b75521d64349252a11fd15e0fc62d301db0329dc07ce56783e7eac8beafef791 SHA512 37c0c5e7ad76d9b483c6e3aa02d1b8673bae50820c48197dc1649efed888ee6156a3a935add16ccd006de43e9067e29f0de8b893c85a476ae4b4b32597799253
 DIST qtads-3.0.0-source.tar.xz 5325048 BLAKE2B cb60908e71edb32157638891a58bed83aba01d484821473716c17845094be9232f9e989bad474db27c1e06734b073ee301756b0528ca880e4c40c0994e95bc48 SHA512 e7b72350876475e0b5b9b8c8c953aa380f5f25dade25785d15c5004a6866bb614c3ca2a3b34f84989013e350f9e73d339ce8ddd7d36766d80a981cfbfda7d1c6
-DIST qtads-3.1.0-source.tar.xz 5438292 BLAKE2B 50d4cb8e39ed1da83005f326aa20e595da825acf7b769a4abaa2b319ee9f2da83af435cf676b82d28417ffc751be7ad8ab6bdc09ad3d571a1df068cd1eca48dd SHA512 b79c6e326369c259d293adf8232e7da64b23506ed272a456b57aef3ef92f440d53ca5204bf36a49cae1b783ce864bae1986053d7f0893e70bfbf8877d87b7267
+DIST qtads-3.2.0-source.tar.xz 5415396 BLAKE2B 100812db9dd0d0630a5392036e29a366afd61778be2c887e19a1dfafd8f54af00654350fd855691e7e787385675d79a1c065767c93bc97665840396719ae5a0f SHA512 db52ed092d676029cc1ff1d02ddf9e5a91e0bcd77fbfd8e43c923deea4413c452895b70835c519e234f8af0bddf61bad7ad3ec5209876335eacaabe63ed6390a
 EBUILD qtads-3.0.0.ebuild 912 BLAKE2B 227fa26b32e4b8e3f41341930fff294bb491d5fddba9dc3624b5a72611704e1932b2d872826c404670a42d4ba098da949288826165c000248031a48144fe3427 SHA512 4d71f4eaffb9dfdd589a67ef123535d1289b03d18139afb81de60c3b0a91488a9985b5549ad35abe895c5e50bb0fcba4be8c1edde8797cffd7943424bf574fd7
-EBUILD qtads-3.1.0.ebuild 849 BLAKE2B 6ed9598cc27cdde4b5d92163e924c56eb809b460eedd00e52c7a2f453bfa41e6f1dedf40af3cec2872b64fc01f72ea452522a50ea1f5cec7bd203630266a040e SHA512 63630980383beee5f67e1dcb5242e965a0285f46102a7be800f29eeb25ff15082833b7f5835a543bbc8a1c477e2547a4032e1b944b36143aafe477d0566011fe
+EBUILD qtads-3.2.0-r1.ebuild 948 BLAKE2B 81fb89795ca6e7acdcf13e112553f83b3ee21aadebf95d26882c172b7dc2d7d603af54e25602f228e31dbbaaedac491a9285a20c33a9fcebd96ea0e1d2efcd0a SHA512 6e5bf4e1a1e65ecb0de2c84195dc402419c95cd3eac10506cce776f5efb5df617ce7dc9f12c6a458fc1aa9dd228d2766e26d6c7bacb35e8fe3b4b848b1a53198
 MISC metadata.xml 600 BLAKE2B 7aa1de6bd8c9c4809e7775a692a69c6e413ed3062a20f89a952859f9b1a4fec9fd86530933edd9e9977df7fba093b1623f231fe8c010dea08d8fb1b89202ff7c SHA512 4d65532cb39d2c90870fbbc1ed038c48646f90f5c5037e69aa1f5b0f965f46a37bd51621aaeebc62f8360b18dbc37e12f605e057d071b6a3313d4a446a66a2c2
diff --git a/games-engines/qtads/qtads-3.1.0.ebuild b/games-engines/qtads/qtads-3.1.0.ebuild
deleted file mode 100644
index f865caf33793..000000000000
--- a/games-engines/qtads/qtads-3.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Multimedia interpreter for TADS text adventures"
-HOMEPAGE="https://realnc.github.io/qtads"
-SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sound"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-	sound? (
-		media-libs/libsdl2[sound]
-		media-libs/libsndfile
-		media-libs/libvorbis
-		media-sound/fluidsynth:0=
-		media-sound/mpg123
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		$(usev !sound CONFIG+=disable-audio) \
-		-after CONFIG-=silent
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/games-engines/qtads/qtads-3.2.0-r1.ebuild b/games-engines/qtads/qtads-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..a96b5f399620
--- /dev/null
+++ b/games-engines/qtads/qtads-3.2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Multimedia interpreter for TADS text adventures"
+HOMEPAGE="https://realnc.github.io/qtads"
+SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png]
+	dev-qt/qtimageformats[mng]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png]
+	sound? (
+		media-libs/libsdl2[sound]
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/fluidsynth:0=
+		media-sound/mpg123
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${EPREFIX}/usr/share/${PF}" \
+		$(usev !sound CONFIG+=disable-audio) \
+		-after CONFIG-=silent
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 0a8b4dd045b4..31b5342291b3 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,6 @@
 AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-EBUILD scummvm-2.2.0-r2.ebuild 3277 BLAKE2B 4e9f22e32cc03724564f28feddd17c45ebc05a3c3fce775ad718810367991b04d610bc2c44d35c30bbbc1fd172842c5f625864def142e967c69eaccf3236222c SHA512 6fd6444c74f2089f02f41bb33ef52be95ba11b2a0a68caf2d0ab8cff90b0520979925d997d565202b7fef45fb00796df1515d16457a340f0bc39fec30db76688
+EBUILD scummvm-2.2.0-r2.ebuild 3284 BLAKE2B 56f2c163028a473699af68c5d0707d7bbf3d7f3f077008d8e73272e65e55c0d6b59d4f1dd0ad63cb040c17b3e733157f35e4b2db0e42562e6970a2f6aedaf3ee SHA512 a2170c84373dc0c2905667a31f4ab2af67a3400afd7bd0ae5c142accf1151934a939b96084e5d3962ebd1679caaa7418dbc54b71cf9aba9004911ec21ff64077
 EBUILD scummvm-9999.ebuild 3253 BLAKE2B b93f721bf4bb0c7a1022787f0d5a5dfd52163e8f3ecc92c17e9495329bdd9714a3dd23e91206f9bf6c0d059fc3c36cbee3f80d8f1ca2b0228a2a42dd96f88de9 SHA512 d1ff22ce066261a64e63f87646cd1401ba4d9d6fad1c613d0bde0780a1c7713957c7bd52249107921413f781b8635ebafe0355b62d8b16012c00715410a277ef
 MISC metadata.xml 1215 BLAKE2B 87d954f59103b0bdc1300094f195638f44dee1ddfeaadc40dc515248fea7b3da553313a1a6e8478b5e7a827c8971da5a3a56756ae5fc01464af1e8295623db5c SHA512 1a5592562aabd4d78f22dbed63446593b6082b676fcae152b7f1e173c92972d89fa1d99cc759991db55e42670fc122aeb1b22b5c0e7defcb7a3bf68eaea110a7
diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
index 65afd2a5beb6..22d247713dfa 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
 else
 	SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 25da3375bd17..8d7ccd28955f 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod-all/Manifest b/games-misc/fortune-mod-all/Manifest
index badd57264b68..873c827e6c42 100644
--- a/games-misc/fortune-mod-all/Manifest
+++ b/games-misc/fortune-mod-all/Manifest
@@ -1,2 +1,2 @@
-EBUILD fortune-mod-all-4.ebuild 911 BLAKE2B 935635d4a95e02c35692d1b55cc5181bd0d7c3ac6b6477870098f21b2f4cb6cb88d0237fec88c5da82b1714f06a95e70a92df69ea8136ef5ec47ea384b6b98ac SHA512 b8b4a44866ae072ed7e1f1eb195053513c17392cc7d93fd724bcc826f467f9bc32796685409d3d6fbf0fae814f1749148e83c29b1c8e7fee0b3e283ca7302d23
+EBUILD fortune-mod-all-4.ebuild 918 BLAKE2B 278e64bfb9071237ebb2efcd0857968bb854d6d37b8dbd93857bcc2c0a324f65f4a9169a0a78a532d42f7cffc12cb510823c165415e223850515215a56dd35f3 SHA512 59b255a099360b79f9fea8630444c6b14c23e21454ecf98a2a8d37e8227a00d60e98684e1ed65d8a74545cec7920be7a9ea854d21e7a9b0fe1d47a130e0316a0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
index b5592b94bd49..1b6a31a9e8c0 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="l10n_cs l10n_de l10n_it"
 
 RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/Manifest b/games-misc/fortune-mod-at-linux/Manifest
index c5d854361543..b068c3bd882c 100644
--- a/games-misc/fortune-mod-at-linux/Manifest
+++ b/games-misc/fortune-mod-at-linux/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-at.linux-20030120.tar.gz 81012 BLAKE2B 551b1169acdd863040389d79f5143e0a294293f856fefcadd0fa3b89ccde7c91c15117af9f730ef54476e1acf3933959f13dd83f879cce8b7123dedc056502ce SHA512 804b785194db2f4727e3196d46b317d6b644bd4d05a4f3286617a2b2e3dff2c9a7c9fb88a0f2a6556d66fd0f975fee8564df236085a7864172c6a6b63c33bec4
-EBUILD fortune-mod-at-linux-20030120.ebuild 849 BLAKE2B 272d6a4228032673b1e4131267cb1e44e6cd69a10fe814409c6abb321f0d114aec5282e1f72b427d68dd6da8b66ae48493c52f303276a365e1e19979dc7d0d60 SHA512 344f7f1eb05606eb7efce70f7442d49f8ea9bf55b070850ca25f1083834db81652d430837b1242d71b1787178da0400c8da22ed94eaa5c65b55396c7fe5da34b
+EBUILD fortune-mod-at-linux-20030120.ebuild 856 BLAKE2B 352c6677bacfbd799a428450dd58b288920beec14ac5dafd921a401f7a6b2575e8cc213c8f505cfd17a77d39c6815f380738f3ad5a4f3b96ee0b930139023c4c SHA512 bec03fcd3f638d7a4ea096c4c0bd1c231969bd4bdf2d559c5e8d35915a6a4575cdc2da2d4bbf463a7c3838d65d9464375d470a283f95f8e0e73b3978586529ca
 MISC metadata.xml 339 BLAKE2B dd8005e7f476ce90fae6ad7587d05c5de3da4a13350b27daada3d6a3bcbb54370ca8813de171f5f927e274abeec6a987cb560973b379ebc8dade7ffd985f8049 SHA512 1f22232fc23ab0037402f3f242862e990628577bfe0a7f40460df2e5a0d911dabb43c4425a17c63519085f8fb7520e3dd6d5e3ef8139af20371f0ac30c40580f
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index 2339f337c8b1..7062a005ca13 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
index ba995bcfa207..716dc543a11e 100644
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ b/games-misc/fortune-mod-bofh-excuses/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-bofh-excuses-1.2.tar.gz 12753 BLAKE2B a16b5e575b1a2fccdbdc85a0ad092d3cd7ed1f3a39bd6bffa2eb5ced6f33fb0d0eb72440f06c8924f1b731551588da72e5f53982d5ef6404e35d61edd1a4717b SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99
-EBUILD fortune-mod-bofh-excuses-1.2-r1.ebuild 572 BLAKE2B 809ecdeb5797c67ef5715a71f75c940a3ba20b0d5ce4812e343ece6dca6f86bdc31933ea59cf7d2fad838c1deddedbe92b5f4a782567231fa6e87d107cd532da SHA512 c298d2d69e9967221e37b7fa4d12c4785a39bc3d1b492dcefc0456989cc914654e5bbbc489b3fe973563dddb6682fee4a8574c55a054941d4ed3877caa0854d8
+EBUILD fortune-mod-bofh-excuses-1.2-r1.ebuild 579 BLAKE2B d04b1219e405f662065764b88feee3a8ae13cc0738e64e6ffbbd8b28a99621d3f218537a75b9476f4204be55a0e4f3a9ac7f6751f37075848c9c6963bd5e3687 SHA512 15c84c418d41d9d7887a8b3f47d3b493126cf1f61ba0f59c45aedf2dd67a2041d012f3e32c5be90cdfcc1a77f3417eddd6eb38186014d79b7b5d72acc0abdc17
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
index bec71904b505..5965a3aea372 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
index 5f1f958a294e..b1dcbcc9af41 100644
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ b/games-misc/fortune-mod-chucknorris/Manifest
@@ -1,3 +1,3 @@
 DIST chucknorris.tar.gz 23035 BLAKE2B d42b510978321b0857a1e6ff50b80576e5f6af52f9014330a765c78a39b274cfecbe2367811fc31e506b1d0e4f3b65c416ff3c06c6a2d7bf20e302ea41f46417 SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2
-EBUILD fortune-mod-chucknorris-0.1.ebuild 546 BLAKE2B 8eaf7f2ff789194a7f9d84b339c09375380b2e759d2edcfba8201481b0e00a872296c9ab69547bad0c104d1a39553dd789eda9ab24c3dbb9317892a5cd7e4714 SHA512 115ce90f3d8e6af930c6848ba1820720887a7bc94a535bdb75993d54d8a2db3a6c42821bdb5686536d7774bb43d08621331c0466a819642f57a0975670afab4e
+EBUILD fortune-mod-chucknorris-0.1.ebuild 553 BLAKE2B 26fb1e9e478c382dc25a449309b9389735a456c53e6caec1a6071c8883023fbbca30b19529fb093ad2401fd55bdbee4fb62d6cd1f7e8dfe57569b30dac3d3f79 SHA512 a7eefc34b1545a320b6eee88dc09b954f56fa62278b5dd4bc8926278c5be88e22da425643c18e09d5423cfa1994a846d7170d47df7948d0398a41b513ef692d8
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index de8896416f6d..5ba7b54198ed 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
index 03208a1161e5..5b730243a7c1 100644
--- a/games-misc/fortune-mod-cs/Manifest
+++ b/games-misc/fortune-mod-cs/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-cs-1.6.9.tar.bz2 390766 BLAKE2B 1f84174bab1274e8c26a10ec5eb4921f0d3199b4bc39b88b4ed3b83ed9fa5e2b1b478348501ade17f9899f6f7490748ad736e2f2c6bea4de08055f73ce7257a7 SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c
-EBUILD fortune-mod-cs-1.6.9.ebuild 1025 BLAKE2B 73a4e51fe9e9aee69cac652f1889e70069e95c783fb889163a15de94355d54fdbda0e51569d59c12f7e279a5e89e654614bffedef06de19d043a6116d55e7c0a SHA512 6857513a598b374dcc70d0c909f763532d0a8b5f05ac6a8535b356006411196266fe2d383204eba8ef76282d641e9630fed521d7d81ed409635ace6ec07a4174
+EBUILD fortune-mod-cs-1.6.9.ebuild 1032 BLAKE2B 723aa00530eb9239802c4ac94b8ffa4fa045cd3167dacc35b88d9ec270b9a4becb28befcc27a10f7c34a6f87239a0db65f2f332c6f5920ad7e2adc3c924e3d73 SHA512 2a7cfbfd9f12feef0e573839bdd497440eda8c2564bd2e8e22fdd92c0f0bef071386267c79c7e16ba8373229474efc87b9d450484ce3f13d071d887ba9a6fab4
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index 1129557dd40c..7a497b77942b 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${P/-mod/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-flashrider/Manifest b/games-misc/fortune-mod-flashrider/Manifest
index 39ab7a97b579..d31b65a07118 100644
--- a/games-misc/fortune-mod-flashrider/Manifest
+++ b/games-misc/fortune-mod-flashrider/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-flashrider-1.10.tar.gz 152743 BLAKE2B d70354f25bf8b3072c85f9f2a6271d1a6da8678679e2f1a547d512f023bd4431fa0f87165e58de8b224413ce436f51f25fd580be25775a257f7c7f2ba26c636b SHA512 04a6492f732e918ca0fce72ab5ff5fbf6ca924d61de423f6abfe4a2c3f9a8ce49b2808ef62763e22601264453b43cb5d43170d3247373ad8decdae7346abe7e3
-EBUILD fortune-mod-flashrider-1.10-r1.ebuild 727 BLAKE2B 85148f816758389e8e7510a0f1cf452088f3bb10ac2a849aa2e0b215f7d468ca32c13dea2bceb658e53603c56d32b582a0fa44479d99594137fb5b765883c235 SHA512 6434908b4da74ae6ca75231332e6a9f8fcb418a0682e833f115179f4840e5fa4a831861117cc35492e39e1caa9fe18c57866ca62691e949f02bb972c7c430670
+EBUILD fortune-mod-flashrider-1.10-r1.ebuild 734 BLAKE2B 36c4d8e161e4ea908bc57d4ddf7891c629ed7df20775ba669b5cfe0fae1e81a38e7351557b4d148e36ae20ba9bdc39332af522829933930d2376db3d52dec3be SHA512 eb22816e24250babfee431d69ac3666e95e53212b48f92661b55e2283930444a4e783734c50d639e3aac95aef080cdcf469165ff05134deb388c9300bf48562c
 MISC metadata.xml 253 BLAKE2B d4680b07481e2d8355bd6394ed6f1b8afeb63eef98b1eb1e0153f01586a4fad45f20ef078b57ab35b007f3cbd7b4674b9845ba9e1aaf805422bbd01475003429 SHA512 3ba64a0f4abb554ff052cd73ca47c7d9467ac120abb4f0a84e68578f29a125e7cbd6abbe30b558fbe3a18857e309604a7190da666ee55ab3efc8c5e42cb90ab0
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
index 2ef785f4bb5d..7aee3a13c709 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-fvl/Manifest b/games-misc/fortune-mod-fvl/Manifest
index 81239b46a1e8..d8bd3ab0268e 100644
--- a/games-misc/fortune-mod-fvl/Manifest
+++ b/games-misc/fortune-mod-fvl/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-fvl-20030120.tar.gz 66081 BLAKE2B 78e1fb2887464cf7050dad309f47329ed6eaba1bf153c9d7d9758f9050f2dd77421dcf1a0e58279389811a3cd145b1f6bb3479b9501ee32378482f59098a2117 SHA512 43213abb2772f560d65f8e552a9c384f2163650cb2fa29a9203a05a0c3b36dff6645afb181e317d5e9258cf0597607bb185a8c852289a2f3cf015c6e4f946bf3
-EBUILD fortune-mod-fvl-20030120.ebuild 515 BLAKE2B 422b54cdb36012cce392c49f2b188e29429a5e26fb531ebc5011f2b806401de84825c5f4a269bce558db559a35b66ffb92058afe41a7add598d2e12d6ac5f5af SHA512 8b04fbca5e0af6087600ba1615ea4f618a0a91e3c0dbfa5c1f04af747f195422693fac9d6f409c002a57059ba1dd79b0cf8f4408f2662dc49954de26930785bf
+EBUILD fortune-mod-fvl-20030120.ebuild 522 BLAKE2B c80c1f94ce58874eca37126c9e2630ad3e29ccdb27e05599f414d840f5a9a5e11040d83f604cf06c5ac9f1a06108a14f4d1eeb8bf112b893790129871f7f6ac6 SHA512 319ffa4ad1f7dbd4d300fee8519238078372901719ae239e1b6ed518d031a6e804614d9e254e36d5c9c58731c7f716e39cbaf541cfddc3e73ee172fe5641f0d8
 MISC metadata.xml 339 BLAKE2B dd8005e7f476ce90fae6ad7587d05c5de3da4a13350b27daada3d6a3bcbb54370ca8813de171f5f927e274abeec6a987cb560973b379ebc8dade7ffd985f8049 SHA512 1f22232fc23ab0037402f3f242862e990628577bfe0a7f40460df2e5a0d911dabb43c4425a17c63519085f8fb7520e3dd6d5e3ef8139af20371f0ac30c40580f
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 78ed35fd72c0..ef1f784c275d 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-it/Manifest b/games-misc/fortune-mod-it/Manifest
index 58b62c08f5db..46aece9ca5be 100644
--- a/games-misc/fortune-mod-it/Manifest
+++ b/games-misc/fortune-mod-it/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-it-1.99.tar.gz 739886 BLAKE2B 8f4624f079682defbb34d04de4e3de8140ddeb9765936798f9480ac0a65efcaa67580c9cf201cf811008d97dbf40eb29a2454840e6014f6c0c07758eaded10c3 SHA512 b4b119f5def51a31ee25c5df3e47a0b9aa45341ecb1f7048233aa1d5c1d4fc8127b9eaa29c028a9df5ad71d9868d4006e7d3a1bef776b34d337a5bca47bd5d53
-EBUILD fortune-mod-it-1.99.ebuild 783 BLAKE2B 1ea5a0c619faea1a5c98bf1375b6909b2490d306224eee80f9e616462f6a22fc1b04750ce62a4cb58de1d75afa3e6aa959d64f5bab296a747c36665f15e2bd90 SHA512 f459220edf7902ffbb7b7f64a92de50d33c3cf0d5b85ec4e42331657eaa0a9d1420682be854d344eae5caeb3356e73263c3cfa87b0ad3e63562d6678d726c7f7
+EBUILD fortune-mod-it-1.99.ebuild 790 BLAKE2B c1e5aa7fc16fe0b1c9fc49258c2789a3ccffa0fa1836b1491e9e03b8a97fd13e4075012b45d0b61bd086d097f553f8df836e18150075aa53db34294124d684ee SHA512 84ec050778d9e619d59a2e70d65a5c6f08ed0b3a44c56563f9faf082006eda066e4948e7bf64980351a2438faae4ebd35587cee4b0d3a9490e0320c911dc9a65
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 95613acea165..de22f88e74ac 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/fortune-it-${PVR}
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
index dcdcbfed325c..4fe78deecf39 100644
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ b/games-misc/fortune-mod-kernelcookies/Manifest
@@ -1,4 +1,4 @@
 AUX 9-offensive.patch 4793 BLAKE2B 742dd02a66be1a35e8e1e379040e4d2edede92b0bb5a81412462667ba4a0625b372960da201eae05428c8b50eef29f02119caa3ef904339b783efe82d4084c11 SHA512 0ad9befa6e05b7d1f3d0e68f68b54f66c69a5e3fb759ef22c9ef28be78ecf32aa0a8e73ff4bf4c06dce092c192b65f62d68c7803fa88a779fce640599eb8a4c7
 DIST kernelcookies-9.tar.gz 8966 BLAKE2B c6d503d0c01fe86ac2b59240ba2a1639210b7aef6fb167d8467c4fcad0283880ff00c59e34e811c7bbde3b0bf7e7bb89536e8c3d439b514fb180db2d326847cc SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3
-EBUILD fortune-mod-kernelcookies-9.ebuild 810 BLAKE2B e26962959647add47439c865d172d8830eedb6b26c15047260654eab3b337f3ba1be7eb372cf3af87eb9e853d8e1d493495ff76fb8644f8136257bbfde90a961 SHA512 e02326a7e831654edace9c25d8632ffc8b5d3f798d50c5c5e6d3ffedc61c5438d42f95b43747af9e580851777b641d60c3d0a0613d44bc7f38a992c893d38367
+EBUILD fortune-mod-kernelcookies-9.ebuild 817 BLAKE2B 22ce531419cbcf3de6f0b0aa17d06cb35879c7ff4c7569f5bc27cfd27497120322e0a3080e7fd1603a3c3e738a6297d623abb1f9104f746ab4c63d7038569a4d SHA512 3f78d88510da9feb686927308f6baa9655980b18e1c454b57b180aac310327d1e80b746052d37a0bc86b211ec248da377bd3a6ad513fbae1ff2e39a2678ab3e3
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 72de0e5553e3..38aff79ff356 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/kernelcookies-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
index 56ad5cd7169b..5fd7aee4b7b9 100644
--- a/games-misc/fortune-mod-mormon/Manifest
+++ b/games-misc/fortune-mod-mormon/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 BLAKE2B 82fb85e6b78368e2c4541a8af5de7e5e1b4f01b222095fa662395b7f4bf0e3fa041cf3039ba265b572c4242a4531f5902805a8d3aa329170efb043a94df4d602 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f
-EBUILD fortune-mod-mormon-1.1.0.ebuild 705 BLAKE2B b663ae9cb71945eb4936fce4965a727cc67dc89e11eee250dc53b77da64a374477beab118e7f8918025b21f821d112e1e8ba93471838a1433b56b2a3ef221a98 SHA512 f4fffe7e6a1de5a8a82ccebc0773b5091672093458012f5845894c85cb2d4b7cc6b3373039164f5681e8f8f00c6a1ac9fa2f11cce82bd2513b5b428dd118043c
+EBUILD fortune-mod-mormon-1.1.0.ebuild 712 BLAKE2B bbe093607aa819f68e415676f08d8a3cabdbf0fa1d794108cdb7ad51c50c591f7f3e6bea7b73cb6dae867929b66e3948ef170b4ee6cf0f2f164dde977cca5ef9 SHA512 9611f1c372c9c0a0ab3fbb13b4ef394d73fc9930b2038b2b21351011be1b6b07e38b9e98d60a6c2891592d83d9b7d357f1d7ec290b3d1025838b3aedcffa75d2
 MISC metadata.xml 436 BLAKE2B 132ecb4ad5a671b16cd7f68a26c52c534b9a8886dce6575681db2b91cd90985181b1e740a5b12173285cf49f7447fd5129c76200c71a02097ea6f40a41b7cdb7 SHA512 9bd1d42bba9e2a48f9d19db525f19c9397d30df029c3143773218f5653a1cb100f67218b9b54e89ebbc9bbfabb1daad8978195d5a9775fea2dc8847b66d02d68
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index e3107d385d22..305f5a696272 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
index 6d7f9da64dfe..7fe892217dfa 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ b/games-misc/fortune-mod-norbert-tretkowski/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 BLAKE2B 4d5662d1dff0795dace05e1ae2780e6c4b76233eef69febf3770b0fb91cbdd307d5a38930e7ab1711db2d4059b26f6029966bf63e828de3c4496396889bf157d SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 607 BLAKE2B 273252211ac6d9a3b2391239c7795ba08183fd6152a52205b7a9302d6b47a3dff3c3660a5f16548229b9615b46f8a7ffa9a7e4ca8ea4596fddfc476db1960c94 SHA512 d5c6f0fbc8ed8826d9cf0167dbff375715b38c68ca524b228737048c44bea9e1423bbf0306548f37d39588e00b04792f04d44a4b76d9956ddd6acd9c901d1d0d
+EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 614 BLAKE2B dd6ffa5b6db8f5aa10c2f6c95e6f3e5d00210f54b56252a68fe04103f9f701aea712da4215f5c2a991e4afa9cfb664f5c7b2884399c12d543eb3ed2d64212260 SHA512 08b79f88045edfb4a6db4ad9145778369a1835fd143b7bd6c8d836e2931ac4e88c1b0d1583bd4f268a4724f0f4651fea027bcbad4866b2b56a512a0e85167592
 MISC metadata.xml 339 BLAKE2B dd8005e7f476ce90fae6ad7587d05c5de3da4a13350b27daada3d6a3bcbb54370ca8813de171f5f927e274abeec6a987cb560973b379ebc8dade7ffd985f8049 SHA512 1f22232fc23ab0037402f3f242862e990628577bfe0a7f40460df2e5a0d911dabb43c4425a17c63519085f8fb7520e3dd6d5e3ef8139af20371f0ac30c40580f
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 5c37548974a1..e7663687bcaf 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
index a3f8f18a846c..a4eb3ea26eb9 100644
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ b/games-misc/fortune-mod-osfortune/Manifest
@@ -1,4 +1,4 @@
 AUX spelling.patch 6343 BLAKE2B 81168cc38bac3e44852a588ad495cf363d41185cf7a04f77a7aeedf6b7ba2c6e904aabbcb77c78d85e4aabe0a39bbfb2a48b45a520897f125d5be1bd119837fe SHA512 9643e5de9f946330c6076dc5769e3f9b08172ea6c45938d1060d9561845c6f3de9016c7e16c1b5fa42801f3b79aed63fe83ad028487587422487e516b5797277
 DIST osfortune.tar.gz 3097 BLAKE2B 2c6dff9c81762b36f37df682d9f13f1b4c49ec52128f2bce206895ece64af4a2bb31f8e548cca928f674541eebc23cb4f76a7d5db9150740d4a480c91318179e SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e
-EBUILD fortune-mod-osfortune-1.ebuild 741 BLAKE2B 25c06b35ab7c018b6c0c0895b03658bd3aa614ba7f108a32e1fda9f3cfa0be24e7e5e8e28bce2e3b1b12b0877dd25e5c6b5932c1d312132c8ed6c437a2e3ebaa SHA512 a718c188fa5bd482637c77fc391fe5faf4b9db0c68cca93553a32ebd2bf7a390f97999f82a182b4cdbeb86ab063c2f06def1eaec001f7d0c8d3af611dea5c564
+EBUILD fortune-mod-osfortune-1.ebuild 748 BLAKE2B f01b89f12ae2b09cd3c8d7ee34fe664894d85638c56c8a1e529d62060e2c96d9a1bddbc58b9b957956ebf25c192022f96142d1b1871645817b5e65a102853214 SHA512 f7a54237ea748b71008eed32e6f0ddfd98fc54ef0a9f47d833ec71c7cbf43e3db76042c9c0ed1849f7bd9221b8fccbebb924d0bd8b6726f79db3c6b937cafc68
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 2c8783a0b9a3..fe936354c4e0 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
diff --git a/games-misc/fortune-mod-rss/Manifest b/games-misc/fortune-mod-rss/Manifest
index b07c641d3135..b4e36e40019f 100644
--- a/games-misc/fortune-mod-rss/Manifest
+++ b/games-misc/fortune-mod-rss/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-rss-20030120.tar.gz 27294 BLAKE2B 2738ed6a001e2a66b12e72789cff8ad1de114d93567ec5af03cbe4d5eb1fca74236c2c64b1eff35c02188844ffd965b8704e69035d9500e3f8276840ed04027f SHA512 65e3c6afe338bab19fece7111d37eb32270a374b0e62babecb4954bb7209054a6f18886ae67f502f29d148d2ce5a60d3ef401233d91caf765a0ade0d3f5478b4
-EBUILD fortune-mod-rss-20030120.ebuild 520 BLAKE2B 8a3fd899d35fa4b04eab5ebe44e32661bcef4ba6078eb58a89367db14cccbf9c5fcbd9c7ca9182e863b1cabad407e65091f1c1ad4a00bc87deaa1fb87ba8c0e2 SHA512 042857658d2267dd05ba41ed1e3fdf298547daa621f627e94f553e06019006a6ff7c099dd3d3e4f517eb5c5de6c437aaee3f5f31c8ca102fad0422aa243072b0
+EBUILD fortune-mod-rss-20030120.ebuild 527 BLAKE2B a11b07c3117bab25575719686e73aea5d275cb4e7eb16b0d397fc5a7128e94ca01c89067fa1b165f36e4b6e8336ede080ee07989c1ea4ddeab25e74bbfd2b59c SHA512 9f8918f480b476ac7fd2c3ff1a7860c543f5a22779bf1f0561b600ceeb5127c3ac23a064f7c92867ce9590e8d1f1cea331c455c9910b46ebf67c1184b31bb090
 MISC metadata.xml 339 BLAKE2B dd8005e7f476ce90fae6ad7587d05c5de3da4a13350b27daada3d6a3bcbb54370ca8813de171f5f927e274abeec6a987cb560973b379ebc8dade7ffd985f8049 SHA512 1f22232fc23ab0037402f3f242862e990628577bfe0a7f40460df2e5a0d911dabb43c4425a17c63519085f8fb7520e3dd6d5e3ef8139af20371f0ac30c40580f
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index db335b31b635..9f2064336963 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
index a1a6c28d3f7b..e8ee02137891 100644
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ b/games-misc/fortune-mod-scriptures/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 BLAKE2B ac1ff1f4e5fea8e46d065a421c11303bc640fc01d4712c26b47655360a1e816fb451ee8447b6875f384afcafb76ff0ab0978769a7cda205ab66c58a67439d504 SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 527 BLAKE2B c993e149a6fa7b4a32c8222812059a4c3b0968815bf1e924266e799305adb5ca0aa254e730e79336230fd305d62f5eba2169cb2181fb0dcbd8b5d6fe9664a3d3 SHA512 e24e6017aed213990a71edb61187f0daf35fb2acc131f56512f0e55fceb5f29b0a8b46ab9a4264b5f7b60c17327ff3d26109f656319692b5f180113311d35d8a
+EBUILD fortune-mod-scriptures-1.1.0.ebuild 534 BLAKE2B 8f48a3fc56b63fad2942e709702225db5b733b5761d1d07ea4ea22a071c0e55ce912340df83238bfd3d43a5f1412fb1ffa6fb6119cbea06c1819d0832db1f0cc SHA512 c02293f33bb07a442903341b62a3cb122644a65b336e521ab83a6ba02f52747fb0d0f19840a0654d636d70dcf5e8ee707318b8b835750f54a3108ab05c5f8fcc
 MISC metadata.xml 436 BLAKE2B 132ecb4ad5a671b16cd7f68a26c52c534b9a8886dce6575681db2b91cd90985181b1e740a5b12173285cf49f7447fd5129c76200c71a02097ea6f40a41b7cdb7 SHA512 9bd1d42bba9e2a48f9d19db525f19c9397d30df029c3143773218f5653a1cb100f67218b9b54e89ebbc9bbfabb1daad8978195d5a9775fea2dc8847b66d02d68
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index f8c1fc150ad2..baf0811bae4f 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-tao/Manifest b/games-misc/fortune-mod-tao/Manifest
index 67476299f4e0..5a726f7ca068 100644
--- a/games-misc/fortune-mod-tao/Manifest
+++ b/games-misc/fortune-mod-tao/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-tao.tar.gz 15381 BLAKE2B f1ee9c670ad2b849717a2a2c5158dfaf59b94ba7d9d501152b90aef7d63923d2fcaa2c6264d9d4ec8d11cad0d6116042bcb9c60fd4696d97a833a9b5b4a8443b SHA512 ec8d8b679962e9a1af4fb74600d7d7d348efcda0fd9c4f08db881835f8e1665688f77a77b0eb8231274ab5ecc93443f5348976100031d5b0c4b6245f647db0e0
-EBUILD fortune-mod-tao-1.ebuild 568 BLAKE2B 852c504d9ca3a6990143d460c2c6ec021b7718c0daf4a64958851787eea1b40f9210449aecdc579cefeb948bebb94316a9426b5a6ca34f57b7cf3dc2d9d6998a SHA512 7c333057527026886b5f168f11b6d29119394f4a8146d42947101af5eaa45738360933f530e9ae7915fbcaa2177a54a4767d23a0a5543b1485760878505c1bb2
+EBUILD fortune-mod-tao-1.ebuild 575 BLAKE2B f1deeb84568fa27a47c5ab55fb1893e27c94110d1f32727bfa14aa5dc10f5094c7833855e34b9aa452c2030a4499a608dca9e8781e2774847807952db4624147 SHA512 80a79c9ebf720ba3f2eff0dc9e652888e39ec43e419bc59514a655fbbe05e3ba14473d2d7f90ac5eff0ebc9c329b681b5477de46279af391dbaa32fd160261c6
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index 58a5b27bdde2..0cc42e1fd9b5 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-taow/Manifest b/games-misc/fortune-mod-taow/Manifest
index 398e7199a98d..07dc5baf90c7 100644
--- a/games-misc/fortune-mod-taow/Manifest
+++ b/games-misc/fortune-mod-taow/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-taow-1.0.tar.gz 67835 BLAKE2B 6cf3fc38931204e4b5c71cd0573c3cb854db1ad8b85318a7cd9a606bac66bcb9ceb8570b930f1cdf246ff63f373170578bebaed2f01bd3c03425dcdc784cc3ec SHA512 da1577b36c121028ba2568e4e5a2da96848d70361a3803e93960b357790026a56fb545f42119d013845f6003ffb9f8421de2a1152b189ef93d3a290474259405
-EBUILD fortune-mod-taow-1.0.ebuild 554 BLAKE2B ea72b608d160f2b5f21b63afb598e3366ea2e4085ce60373329976c3943b11a8cf686484a9fd53e037f273397ac44f7acbad2a063acf7f034dd4b4e4a35d8eda SHA512 e3ba7fc3a4b9962cc92be057b5d5331d95ec322c8bae9887a018cb385eab1cc17a27b19a2e9d7583cfce31ac47f6bc2d56ae3fee6f029b39a33c67ea60b0ec06
+EBUILD fortune-mod-taow-1.0.ebuild 561 BLAKE2B bd40f28d89dfd2d4ba9a9ea89415f0ddc1dedd2990b664296536f3565ed666c7e5dd3f6b2cd4ffbfec9222675ada87a6538a7d158e0af01e062bd51aaabdf87d SHA512 d55415b231d4d61ce2c7e5ff9ae0d5690faded51e725689771e7385281f3a4442cb347b72d7ae490cdadc60f48d98917d1366ea1872903be52a6ff8b378b95ee
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index 2c699ecc070e..014f9b151d56 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
index fcd5bdef524e..661704224143 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 BLAKE2B 58c2bbc1b7c432fad02b201d277eb5608151756efce4126eb20f62f30397bb74577d3dacafab3c5abfa136a61d2ac1d596fd20daf7dc7117eeabd29259244f82 SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 595 BLAKE2B 1467228e4a82d1dbbcc6ddc6df5f9a25832bc08a9d4033316bf8e596a65a0ba089c9452c2b45a5e1e9b313ee822b910f07279b30ccdf92e374092cc53d69909e SHA512 e4230fa59bdb1e1f2a1c3e327fe07c10d28d0c984a03942dc84c9e9ec5c4b6e04de71a5a57e094a511d7638a82d5cc0d48d2322ee9deb08fdfbdf476809b3dfb
+EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 602 BLAKE2B 2fdea107b80ca415b328e55d81282d36d94bf693295318953db09ea51d9ea1fe291b8fba221c7dd13332375673edf874e260eb54a0375c24ac8e7d1de4ec33cf SHA512 0e662c1378c1877cf3e073241335faec2cc7ccd7a37fb4cf2dde529da7a886dc3348a199c083d03d5c0afce183f7786e7610ae7d845de0d28270b42972e20883
 MISC metadata.xml 339 BLAKE2B dd8005e7f476ce90fae6ad7587d05c5de3da4a13350b27daada3d6a3bcbb54370ca8813de171f5f927e274abeec6a987cb560973b379ebc8dade7ffd985f8049 SHA512 1f22232fc23ab0037402f3f242862e990628577bfe0a7f40460df2e5a0d911dabb43c4425a17c63519085f8fb7520e3dd6d5e3ef8139af20371f0ac30c40580f
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index 94895bfc66a2..3deb3748e82a 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-zx-error/Manifest b/games-misc/fortune-mod-zx-error/Manifest
index 88e43a795953..6db582f881e5 100644
--- a/games-misc/fortune-mod-zx-error/Manifest
+++ b/games-misc/fortune-mod-zx-error/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-zx-error-1.0.tar.gz 1209 BLAKE2B c8197c765161204fd67e0070aaf0973fbd5d437aa03b1c74383e78119a3ce8f3f16b7fd2dc1192c4c4b28a56125ca5b190a1b727e5c1f0a470172f38fc75f807 SHA512 6412826dfafdcd79eeb2f8100c6e7a7419526af080e98af91243a786b1fc6089ef652eb0d8267eb94564dd932fcd1b5f903a4da76760f23b370e57fbc5c72f9d
-EBUILD fortune-mod-zx-error-1.0-r1.ebuild 704 BLAKE2B 484e66866e9472607f99146d497b1cd3d1c7ec3a2bdfe88cf5165365db51a1297c7020500718500a851006c974783e2ce831de3d5e0f756846a4382654776eac SHA512 89fa4f2f76c9343c10f23c4d27c438bf65f810b62953325e6c5a0b73a3984304d173df3430a7f15bbb2726b394b27f050beb9bd8aca0766a7e1b8b5ca8a21a62
+EBUILD fortune-mod-zx-error-1.0-r1.ebuild 711 BLAKE2B 41f37005e137161bbdc08db6c7fd7d4a1ee6e8dc78fc6d188e44f2c294c6eb18e2e514e11c7ebd32f68963e1d7abdd01b316824d649aca37c8d2f616571c7681 SHA512 bbbe14938488021074b204e877630a38e950d5ccd32ef51aae03bb33ec7d71d9adcc7fed4bf0cb42761d4e341388769b210e78f589cea831533acf8f661afe66
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
index 3f6798844af6..a3a80431c7be 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 8400677024de..a0e8e4e0117b 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,5 +1,5 @@
 AUX 01_all_fortune_all-fix.patch 711 BLAKE2B a4c6802863fe2d19bdb3080e7f8a039ae0c39235b33d6c6a1d0bad6d2d19607a7ae8e72f292ffa1d755985e24cdd92bb31b54ef0013365ce81c0216c69ed45fd SHA512 ebc0bffa0f7d89eb1b88631984742c109b8703e8116e30b6b0b11c28f12bab5aa929a0567f1bc3a603f01f6618d613a881b046646e20fd685133bbb6daa39aa9
 AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788a5bd70e3712b23e6227328c726740b5adbf6ce1d254706901ff183bfbe40c04da73a26edf181fe4a9727bb7623dbf5bea SHA512 338861e27cc82baf4a062fe17029a7f2d05ea19d009be8627c04f66bebd74e8801272c1fc3cdeab2f29da797ad6373f38dd0ded011a7176ee93774b396e45cd9
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
-EBUILD fortune-mod-1.99.1-r3.ebuild 1710 BLAKE2B b9af07978e8f4bf7ad975d24c51820b583f5f09f5079f3f1ea20f1013abd553ab4e9e1e928ee36725c3071122c434574b97b25c4ffad2d7504a1d93736777fff SHA512 d13f50c481cbcace84eb958c533f1c1464a6247d5251ef0f900c6e3dd99a720b483fdba0c0e8e4ac8e05e68993fb210ac6a052de4d2211a77e79c11c4229c6b2
+EBUILD fortune-mod-1.99.1-r3.ebuild 1717 BLAKE2B 7ec337d3a55e882d24c485e0461d8c757e34f894a65283d36e2af906dc1015cf13b27dc3aa487478a776510f984baae73852dbc2870c5e4a557d228f2b552e8b SHA512 35d6fd99e402cb26466860bc3754d6123d3e63d533afaa27f119f6d048b05c253ea5e32d160ba3172f024151762c9d281aab5b7825ae8be115fdfd54da8b1910
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
index e3e2019a48a7..2c5dd2971c79 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="offensive elibc_glibc"
 
 DEPEND="app-text/recode:0="
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 128ed484d462..0a8910dbb22d 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
index 71555cc78700..5dc8643c4542 100644
--- a/games-puzzle/fbg/Manifest
+++ b/games-puzzle/fbg/Manifest
@@ -1,3 +1,4 @@
+AUX fbg-0.9-missing-return.patch 280 BLAKE2B f1c0f5bc3da5a16228f9e1e720b753900c53e0ba6e3491a936380cc07fd45e6946097890dce020182af595a13c24e3fe5ac158e4389629285d8190b21dbee053 SHA512 a699b1f34d844798b9b31fbcbc7fc6b5f05c51e40ebed9249b0100dfa416d1c94fbe26f122f9d24886ca59ff09d0984ea836fee23bc9e244760e9fe04957b68a
 DIST fbg-0.9.tar.gz 1127384 BLAKE2B c732f0bfce5cdf92ed94b75764403f1e64efebdb6be92b900704601922a9a3e9f86de975613778aad9c5685303fc9e31dbd624283cc8ad2964cbf3c9c42b27b6 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353
-EBUILD fbg-0.9-r2.ebuild 791 BLAKE2B 0eec4a1245d54542666bc46299034668774242b606a9e904d879661b295460b448f03ee9d02c99b15caed692c6b190ace7acfce91a8146b81c448d3abc59b01b SHA512 34ee1ebd58eaccb2dddbe8742c006dd5a6ddf47d8b5dc572cdd7ce0fbdd473313c80fdd1f5856c94d25f434b22cf80909a2d80a1b92ccb250b894d43cb8b96a5
+EBUILD fbg-0.9-r3.ebuild 839 BLAKE2B 1cfcfa8f13f7e3638598e29b4fec8d5345e6301f47baff151c4b262c4b55d1c8e42cad15c006fee9c6909c1fad17ebf40cd88853ec7e5270512808c7cbd3ff48 SHA512 3b93645c5da9a723e1b346ff7de18142d7acb5f561a3b5158a2a19439fa8c5ff6aa738014d60245b96d141b71738263396d810e309e446499c98fcec7a29530b
 MISC metadata.xml 327 BLAKE2B 42ccb827b43cb37d26eb332ad93c476fbcdb5868bee92ca1a97560b7ef822672b71c56a90e568abec6e29aa527a0694bb1a9458cbae492e0e609c6619b9c24f4 SHA512 a1bfea86b82179e648acf357f1505a85ee6c0c8877b8574400d4538989fa2fb0faf60114b7bbaac480b798c7e20ae4bfbda3c804cf7046289cd866597106e3d4
diff --git a/games-puzzle/fbg/fbg-0.9-r2.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild
deleted file mode 100644
index b0c84fa8eeca..000000000000
--- a/games-puzzle/fbg/fbg-0.9-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A Tetris clone written in OpenGL"
-HOMEPAGE="http://fbg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-games/physfs
-	media-libs/libsdl[opengl,video]
-	media-libs/libmikmod
-	x11-libs/libXt"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \
-		-e '/^datadir=/d' \
-		configure || die
-}
-
-src_configure() {
-	econf --disable-fbglaunch
-}
-
-src_install() {
-	default
-	newicon startfbg/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Falling Block Game" ${PN}
-	rm -rf "${ED}/usr/doc"
-}
diff --git a/games-puzzle/fbg/fbg-0.9-r3.ebuild b/games-puzzle/fbg/fbg-0.9-r3.ebuild
new file mode 100644
index 000000000000..5da0c0508858
--- /dev/null
+++ b/games-puzzle/fbg/fbg-0.9-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Tetris clone written in OpenGL"
+HOMEPAGE="http://fbg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-games/physfs
+	media-libs/libmikmod
+	media-libs/libsdl[opengl,video]
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-return.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/FBGDATADIR=/s|=.*|=\"${EPREFIX}/usr/share/${PN}\"|" \
+		-e '/^datadir=/d' \
+		-i configure || die
+}
+
+src_configure() {
+	econf --disable-fbglaunch --without-x
+}
+
+src_install() {
+	default
+
+	newicon startfbg/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Falling Block Game"
+
+	rm -r "${ED}"/usr/doc || die
+}
diff --git a/games-puzzle/fbg/files/fbg-0.9-missing-return.patch b/games-puzzle/fbg/files/fbg-0.9-missing-return.patch
new file mode 100644
index 000000000000..86b0b551957f
--- /dev/null
+++ b/games-puzzle/fbg/files/fbg-0.9-missing-return.patch
@@ -0,0 +1,8 @@
+Lack of return leads to segmentation fault on startup.
+https://bugs.gentoo.org/815259
+--- a/src/glTGAImage.cc
++++ b/src/glTGAImage.cc
+@@ -180,2 +180,3 @@
+ 	glTexImage2D(GL_TEXTURE_2D, 0, type, getWidth(), getHeight(), 0, type, GL_UNSIGNED_BYTE, getImageData());
++	return true;
+ }
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 857f97afb8e1..66bbec7b63ca 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,3 +1,3 @@
 DIST five-or-more-3.32.2.tar.xz 1238468 BLAKE2B 8d223df7933cc84751c173617540a3b725342e84669be22a865a6751be19671fbe269ddc00e4c3a32d78ce3313c71d3c7e1930beae7d1561f6b90a6f9cdc73b8 SHA512 bbca7ebca45eb0975a57accbd6d3648f3fa5ab6abfaaede04e038b7ea793b44a2e125dbfe65d3f53863e62fed36eb28bbd9180e8975c4988e0fc919a8708e4c3
-EBUILD five-or-more-3.32.2.ebuild 840 BLAKE2B 5ae7632efebcc62a260238a4732faa18829ac69cb1a037ddc5998101ef02206aa40815bf2f51cd3b703a6afdf86d788b4f74e7e4daad25126fe6574e7793a923 SHA512 f066834da1074eafe927bde8ebfe0a7e4e932b9399919425bc6aa872ff05da0f69d4d4fd988567a8b34cd769dcad64c35e9c863b6ca4ac12e8f1d5dc5a7c1505
+EBUILD five-or-more-3.32.2.ebuild 868 BLAKE2B b8cdc962227923a16c6c78d0df9f69fad34f4c62d841327d7eabbf0135d76234e0ecc347dcae75ebc05cdbad54c449fd97a15a7e12e52dc3656f77ea2dbce954 SHA512 3cb931554b6d5857c10450b4ee83f35d9dba5e65f9b8f46c458ed3002d945523e6dabf176a900fa9c3acbe9beb8312120ab00d5da77daf91abc8c23db7011b4b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
index e162e8369781..8e639ca1eba2 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(vala_depend)
+	gnome-base/librsvg:2[vala]
 	dev-libs/appstream-glib
 	dev-libs/libxml2:2
 	dev-util/itstool
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
index 2782e1587c07..49bb6d7334f5 100644
--- a/games-puzzle/flobopuyo/Manifest
+++ b/games-puzzle/flobopuyo/Manifest
@@ -1,7 +1,7 @@
-AUX flobopuyo-0.20-gcc4.patch 967 BLAKE2B befdc13ec4da55497fae89f79aa1ad518738ffd69a8eae10167551dc45daeffbb9130adb319e426a8d5c65e2743a0bfc0d83dfec2ee19855d72fe86d0dba4478 SHA512 f1bfdbf6ba4e4fc2be453aa7d2299f70a2a47a1906e2b7043ef8c14a7b4c8e5bc1de29565e1404ba9c6688c03f4439f123b3325f3223bd3771eee9fe458ecd62
-AUX flobopuyo-0.20-gcc41.patch 447 BLAKE2B 189a5e2f970fd4e9ea1e5e12b6344e9c96d29a4de99ace9a9fbcaba35b832369159535d3195c871b91e75678b97f274fc0e4bf788a17608fdf7ab84a75716228 SHA512 05b888959fcc4e1bc0a1248c9efdbdc9768ee25382fb67dad1d49214c7180e97fa498853bca4483c7786f946d9b0527cfbd79065e5585cc26f72ade3900219ec
-AUX flobopuyo-0.20-libs.patch 4687 BLAKE2B fc571a5de46bb52bfa65eacc3078fddbe6b5c5f1e58378b2ff7e1f91b6130a0011705f6f17cf47dbe3c5417fbc7dfa3f708b970548f81f7234d467d11b6cf09e SHA512 fd879dca79a8532909286a50ec9d3d66b2fdf149a64602ee8990aad2a3de8dbed268f6837d39039db77774ab7e29a91b121f06dc172eae59a6c69c0f799a810b
+AUX flobopuyo-0.20-gcc41.patch 696 BLAKE2B c6015139b6ffcd61d813c2dea015e2eb30aa57b6969662a98f6f70d1065c5add4765dc14d80866e4591a05150af2dff320ecde3cbf381a0b0673176903fbb6eb SHA512 030cfc1eb01154b96c57116d727a4c6ae899cb7b47c52e3bc387b6557e2dbd1308b2d37819c565e7d88f4eac68d79fa587dcdb5b0d217b2995570b7d521fb558
+AUX flobopuyo-0.20-makefile.patch 1974 BLAKE2B 2dea13acb6e30c57ec4f782727203829996f20b65f223ee3130e4339cad9b3c308f36dffaf600de24d71bf8b8d0565a89b0222775bdd7d6f34b4451c7d7b04b4 SHA512 a6b1955caf15a145b830076e4c3205ccd31d2f3ee0333e2a85cc66fdd7d184b3113fe004f0bd539036afb2603eaa227f89c7826ba845bfcd7ffdc063dc01854b
+AUX flobopuyo-0.20-segfault.patch 4094 BLAKE2B 626c544742e1984912efe97a687a72713e0e17b9d137e35888efaa63683044caca83b6a3446ae451e33663d73ef0ed4fb88dd78ed3b5ac5c661973db7c178e12 SHA512 7fae3d835303566eb73a317204abdde2dbc56e972f9661d433b825eeb40397130c09087e4c6fdd881f627286884ed802c2a3cb38c4a8f7169e5408df05d2913e
 DIST flobopuyo-0.20.tgz 2949750 BLAKE2B 5e6b451ca05c4e3c497889fe350ceea8dffd9a0bc53b69747449e1ab607c26328ee3d2d1acb9ebf8a7fa634e43e12746f02c50166f16c7e2d3bbfa6531878250 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276
 DIST flobopuyo.png 25038 BLAKE2B ab9af4d0785614725c5b03942956c5cabfdfa38b3f5b2870dfbed9428ab51c553dad784b643f3387bfb4d90073befe9ea6d6bac57bbb266154b28092410d5c1d SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6
-EBUILD flobopuyo-0.20-r2.ebuild 1096 BLAKE2B 139dca0ecac332f94b86cd7de8a9c3acfdafa00eec26674a6a55404db481b20e6d691cb748e5d75e0ad729bf97cb9eaf2520b596a7f5d36d985599780c774a18 SHA512 aa572ac59adaf81ddb4cb7312fba084f8ac5c2aea9c46c650f903622feafc65a33a80708af9aeaa411f1f1880061eb522dcd29773d1ebcb5568f3941a68df57b
+EBUILD flobopuyo-0.20-r3.ebuild 1078 BLAKE2B b4019ad7b61af7445056e43edcb08ee0e4516073a82805e525963e869050b9c2fcbbce8a2bbb5a0ef0eec0cfa3735f93a647268834b0195e1048b704c7f36b59 SHA512 9e7452773d5de3f9b91232a7c563c29bf6d945fabb42e80460528f2ce7b544fef49fee229b40c45489335dbdc564b9e30bbebdbf612afbaa234ba4ce28a16197
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
deleted file mode 100644
index 6c5d39445a4c..000000000000
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: flobopuyo-0.20/IosVector.cpp
-===================================================================
---- flobopuyo-0.20.orig/IosVector.cpp
-+++ flobopuyo-0.20/IosVector.cpp
-@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()

- void IosVector::dumpVector() const {

- 	fprintf(stderr, "Size: %d\n", getSize());

- 	for (int i = 0, j = getSize() ; i < j ; i++)

--		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));

-+		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));

- 	fprintf(stderr, "\n");

- }

-Index: flobopuyo-0.20/PuyoGame.cpp
-===================================================================
---- flobopuyo-0.20.orig/PuyoGame.cpp
-+++ flobopuyo-0.20/PuyoGame.cpp
-@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
- 		return (PuyoState)newItem;

- 	}

- 	else

--		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));

-+		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));

- }

- 

- PuyoPuyo::PuyoPuyo(PuyoState state)

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
index 6b3f54ef5630..765bcae8d21e 100644
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
@@ -1,13 +1,23 @@
-Index: flobopuyo-0.20/PuyoGame.h
-===================================================================
---- flobopuyo-0.20.orig/PuyoGame.h
-+++ flobopuyo-0.20/PuyoGame.h
-@@ -46,7 +46,7 @@ public:

-     virtual ~PuyoPuyo() {};

-     PuyoState getPuyoState();

+https://bugs.gentoo.org/106406
+https://bugs.gentoo.org/121259
+--- a/IosVector.cpp
++++ b/IosVector.cpp
+@@ -104,3 +104,3 @@
+ 	for (int i = 0, j = getSize() ; i < j ; i++)

+-		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));

++		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));

+ 	fprintf(stderr, "\n");

+--- a/PuyoGame.cpp
++++ b/PuyoGame.cpp
+@@ -47,3 +47,3 @@
+ 	else

+-		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));

++		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));

+ }

+--- a/PuyoGame.h
++++ b/PuyoGame.h
+@@ -48,3 +48,3 @@
      void setPuyoState(PuyoState state);

 -    bool PuyoPuyo::isFalling();

 +    bool isFalling();

      int getPuyoX() const;

-     int getPuyoY() const;

-     void setPuyoXY(int X, int Y);

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
deleted file mode 100644
index b9b55a333cb6..000000000000
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- a/Makefile.orig	2004-10-08 18:41:12.000000000 -0400
-+++ b/Makefile	2008-08-06 19:48:47.000000000 -0400
-@@ -41,15 +41,13 @@
- ##############
- 
- SDL_CONFIG=sdl-config
--CC=g++
--CXX=g++
- 
--CFLAGS= -DDATADIR=\"${DATADIR}\"
--LDFLAGS=
-+CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
- 
- ifneq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
--LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
-+CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
- endif
- 
- HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
-@@ -71,46 +69,46 @@
- ################
- # Mac OS X
- ifeq ($(PLATFORM), Darwin)
--CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
-+CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
- endif
- 
- ################
- # Win32
- ifeq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
--LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
-+CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
-+LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
-+LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
- endif
- 
- ifeq ($(ENABLE_AUDIO), true)
--CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
- OBJFILES:=$(OBJFILES)
- endif
- 
- ifeq ($(ENABLE_OPENGL), true)
--CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
-+CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
- OBJFILES:=$(OBJFILES) glSDL.o
- ifeq ($(PLATFORM), Linux)
--LDFLAGS:=$(LDFLAGS) -lGL
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) -lGL
- endif
- endif
- 
- ifeq ($(ENABLE_DGA), true)
- ifeq ($(PLATFORM), Linux)
--CFLAGS:=$(CFLAGS) -DUSE_DGA=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
- endif
- endif
- 
- ifeq ($(DEBUG), true)
--CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
-+CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
- LDFLAGS:=$(LDFLAGS) -g
- endif
- 
--CXXFLAGS=${CFLAGS}
--
- all: prelude flobopuyo
- 
- flobopuyo: ${OBJFILES}
--	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
-+	@echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
- 	@echo "--------------------------------------"
- 	@echo " Compilation finished"
- 	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
-@@ -121,14 +119,14 @@
- prelude:
- 	@rm -f WARNINGS
- 	@touch WARNINGS
--	@echo "Compiling with CFLAGS=$(CFLAGS)"
-+	@echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
- 	@echo "Compiling with LDFLAGS=$(LDFLAGS)"
- 
- %.o:%.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 
- %.o:%.cpp
--	@echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 
- PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
- HiScores.o:HiScores.cpp HiScores.h preferences.h
-@@ -155,10 +153,10 @@
- IosException.o:IosException.cpp
- IosVector.o:IosVector.cpp
- glSDL.o:glSDL.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 	@rm -f EXT_WARNINGS
- SDL_prim.o:SDL_prim.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 	@rm -f EXT_WARNINGS
- corona.o:corona.cpp
- corona32.o:corona32.cpp
-@@ -178,7 +176,6 @@
- 	rm -f  .DS_Store */.DS_Store */*/.DS_Store .gdb_history
- 
- install: flobopuyo
--	strip flobopuyo
- 	mkdir -p ${INSTALL_BINDIR}
- 	mkdir -p ${INSTALL_DATADIR}
- 	cp -r data/* ${INSTALL_DATADIR}
-@@ -191,7 +188,7 @@
- 	chmod a+rx ${INSTALL_BINDIR}/flobopuyo
- 
- flobopuyo-static: prelude  ${OBJFILES}
--	@echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
-+	@echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\
-         /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
- 	@echo "--------------------------------------"
- 	@echo " Compilation finished"
-@@ -207,7 +204,6 @@
- 	rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS
- 	rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics
- 	rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store
--	strip $(bundle_name)/Contents/MacOS/flobopuyo
- 
- mac-package: bundle
- 	mkdir -p $(macimage_name)
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch
new file mode 100644
index 000000000000..670f18889cab
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch
@@ -0,0 +1,62 @@
+Set non-/games paths, respect FLAGS, add LIBS to pass them in right order,
+use pkg-config, don't strip, and show commands/errors directly.
+
+https://bugs.gentoo.org/125550
+https://bugs.gentoo.org/126835
+https://bugs.gentoo.org/234013
+--- a/Makefile
++++ b/Makefile
+@@ -15,4 +15,4 @@
+ PREFIX=/usr/local
+-DATADIR=$(PREFIX)/share/games/flobopuyo
+-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
++DATADIR=$(PREFIX)/share/flobopuyo
++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
+ INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
+@@ -44,10 +44,10 @@
+ CC=g++
+-CXX=g++
+ 
+-CFLAGS= -DDATADIR=\"${DATADIR}\"
+-LDFLAGS=
++CFLAGS:=$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\"$(DATADIR)\"
+ 
+ ifneq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
+-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
++OPENGL-false=
++OPENGL-$(ENABLE_OPENGL)=opengl
++CFLAGS:=$(CFLAGS) $(shell $(PKG_CONFIG) --cflags $(OPENGL-true) sdl SDL_image SDL_mixer)
++LIBS:=$(LIBS) $(shell $(PKG_CONFIG) --libs $(OPENGL-true) sdl SDL_image SDL_mixer)
+ endif
+@@ -92,3 +92,2 @@
+ ifeq ($(PLATFORM), Linux)
+-LDFLAGS:=$(LDFLAGS) -lGL
+ endif
+@@ -112,3 +111,3 @@
+ flobopuyo: ${OBJFILES}
+-	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o flobopuyo $(OBJFILES) $(LIBS)
+ 	@echo "--------------------------------------"
+@@ -127,6 +126,6 @@
+ %.o:%.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
++	$(CXX) $(CXXFLAGS) -c $<
+ 
+ %.o:%.cpp
+-	@echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
++	$(CXX) $(CXXFLAGS) -c $<
+ 
+@@ -157,6 +156,6 @@
+ glSDL.o:glSDL.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++	$(CXX) $(CXXFLAGS) -c $<
+ 	@rm -f EXT_WARNINGS
+ SDL_prim.o:SDL_prim.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++	$(CXX) $(CXXFLAGS) -c $<
+ 	@rm -f EXT_WARNINGS
+@@ -180,3 +179,2 @@
+ install: flobopuyo
+-	strip flobopuyo
+ 	mkdir -p ${INSTALL_BINDIR}
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch
new file mode 100644
index 000000000000..2edf49c03c11
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-segfault.patch
@@ -0,0 +1,84 @@
+Fatch adjusted from Fedora to fix segfault when using optimizations.
+https://bugs.gentoo.org/815262
+--- a/PuyoGame.cpp
++++ b/PuyoGame.cpp
+@@ -639,3 +639,3 @@
+                             PuyoPuyo *markedPuyo = getPuyoAt(u, v);

+-                            if (markedPuyo->getPuyoState() == PUYO_MARKED) {

++                            if (markedPuyo && markedPuyo->getPuyoState() == PUYO_MARKED) {

+                                 // mark the puyo so we wont'do the job twice

+--- a/PuyoGame.h
++++ b/PuyoGame.h
+@@ -112,6 +112,18 @@
+   PuyoState getCompanionState() const { return companionPuyo->getPuyoState(); }

+-  PuyoState getFallingState() const { return fallingPuyo->getPuyoState(); }

++  PuyoState getFallingState() const {

++    if (fallingPuyo)

++      return fallingPuyo->getPuyoState();

++    return PUYO_EMPTY;

++  }

+ 

+-  int getFallingX() const { return fallingPuyo->getPuyoX(); }

+-  int getFallingY() const { return fallingPuyo->getPuyoY(); }

++  int getFallingX() const {

++    if (fallingPuyo)

++      return fallingPuyo->getPuyoX();

++    return 0;

++  }

++  int getFallingY() const {

++    if (fallingPuyo)

++      return fallingPuyo->getPuyoY();

++    return 0;

++  }

+   int getCompanionX() const { return companionPuyo->getPuyoX(); }

+--- a/PuyoIA.cpp
++++ b/PuyoIA.cpp
+@@ -111,6 +111,6 @@
+     {
+-      if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoAt(c_x+1,c_y))->getPuyoState())) /* Test du pattern a droite */
++      if ((c_x<(PUYODIMX - 1)) && (c_color == (game->getPuyoCellAt(c_x+1,c_y))))
+       {
+-        PuyoState cColorA = (game->getPuyoAt(c_x+1,c_y+1))->getPuyoState();
+-        if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoAt(c_x+1,c_y-1))->getPuyoState()))
++        PuyoState cColorA = (game->getPuyoCellAt(c_x+1,c_y+1));
++        if ((c_color!=cColorA) && (cColorA>5) && (cColorA<11) && (cColorA == (game->getPuyoCellAt(c_x+1,c_y-1))))
+         {
+@@ -120,6 +120,6 @@
+                     
+-      if ((c_x>0) && (c_color == (game->getPuyoAt(c_x-1,c_y))->getPuyoState())) /* Test du pattern a gauche */
++      if ((c_x>0) && (c_color == (game->getPuyoCellAt(c_x-1,c_y))))
+       {
+-        PuyoState cColorB = (game->getPuyoAt(c_x-1,c_y+1))->getPuyoState();
+-        if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoAt(c_x-1,c_y-1))->getPuyoState()))
++        PuyoState cColorB = (game->getPuyoCellAt(c_x-1,c_y+1));
++        if ((c_color!=cColorB) && (cColorB>5) && (cColorB<11) && (cColorB == (game->getPuyoCellAt(c_x-1,c_y-1))))
+         {
+@@ -131,3 +131,3 @@
+     {
+-      if (c_color == (game->getPuyoAt(c_x,c_y+2))->getPuyoState())
++      if (c_color == (game->getPuyoCellAt(c_x,c_y+2)))
+       {
+@@ -140,6 +140,6 @@
+     {
+-      if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoAt(f_x+1,f_y))->getPuyoState())) /* Test du pattern a droite */
++      if ((f_x<(PUYODIMX - 1)) && (f_color == (game->getPuyoCellAt(f_x+1,f_y))))
+       {
+-        PuyoState fColorA = (game->getPuyoAt(f_x+1,f_y+1))->getPuyoState();
+-        if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoAt(f_x+1,f_y-1))->getPuyoState()))
++        PuyoState fColorA = (game->getPuyoCellAt(f_x+1,f_y+1));
++        if ((f_color!=fColorA) && (fColorA>5) && (fColorA<11) && (fColorA == (game->getPuyoCellAt(f_x+1,f_y-1))))
+         {
+@@ -149,6 +149,6 @@
+                                   
+-      if ((f_x>0) && (f_color == (game->getPuyoAt(f_x-1,f_y))->getPuyoState())) /* Test du pattern a gauche */
++      if ((f_x>0) && (f_color == (game->getPuyoCellAt(f_x-1,f_y))))
+       {
+         PuyoState fColorB = (game->getPuyoAt(f_x-1,f_y+1))->getPuyoState();
+-        if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoAt(f_x-1,f_y-1))->getPuyoState()))
++        if ((f_color!=fColorB) && (fColorB>5) && (fColorB<11) && (fColorB == (game->getPuyoCellAt(f_x-1,f_y-1))))
+         {
+@@ -160,3 +160,3 @@
+     {
+-      if (f_color == (game->getPuyoAt(f_x,f_y+2))->getPuyoState())
++      if (f_color == (game->getPuyoCellAt(f_x,f_y+2)))
+       {
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
deleted file mode 100644
index 717a4ba609cb..000000000000
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Clone of the famous PuyoPuyo game"
-HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
-SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-libs.patch
-
-	find . -type f -name ".*" -exec rm -f \{\} \;
-	sed -i \
-		-e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \
-		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \
-		Makefile \
-		|| die
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		ENABLE_OPENGL="$(use opengl && echo true || echo false)"
-}
-
-src_install() {
-	default
-	doman man/flobopuyo.6
-	doicon "${DISTDIR}/${PN}.png"
-	make_desktop_entry flobopuyo FloboPuyo
-}
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild
new file mode 100644
index 000000000000..c38cdc1d7cbb
--- /dev/null
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild
@@ -0,0 +1,56 @@
+# 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 famous PuyoPuyo game"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tgz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+RDEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	opengl? ( media-libs/libglvnd )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-segfault.patch
+)
+
+src_prepare() {
+	default
+
+	rm data/sfx/._bi || die
+}
+
+src_compile() {
+	tc-export CXX PKG_CONFIG
+
+	emake PREFIX="${EPREFIX}"/usr ENABLE_OPENGL=$(usex opengl true false)
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	dodoc Changelog TODO
+	doman man/flobopuyo.6
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry flobopuyo FloboPuyo
+}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 9bd48a6cb7b8..763a15300441 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 96d81a418011..79b1d4bb2e2f 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -6,16 +6,14 @@ DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone-soup-0.28.0_pre20210831.tar.gz 14699285 BLAKE2B 1902f6dbdde812850363b1bd3915f8a42a5288d00b890c07cea33d93eeaee2d4d581bdd4ba41444883c753e5cdacb52591d94ddb2db6c280de97887ea42e0d3a SHA512 5bcbbd07fba3ad05f719a4a6bb6cfd93087e7e7ab536c9b1f78e47eef329f124b52e411b98edb32a03dd8d034a060bcedbcf1ece9fea12bec6c4c855d60e40f8
+DIST stone-soup-0.28.0_pre20210930.tar.gz 15993960 BLAKE2B bec39024527068afb9d63efcb147dbb09fe6940e23c1f2fc5c2a78b5b4da131d7f3275cceb2160ffe4028ca38fe034a4a70b5b42698772764b0b47cf6bdb3417 SHA512 2b32e543c388b7cf1394abf5eac35f347fe27e60039372771c1c9c873c7fad2011762269d08166f7df77e85914a325c597e0151211739df32a5597f084a6ca7b
 DIST stone-soup-0.28.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
-DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
 EBUILD stone-soup-0.25.1-r102.ebuild 4572 BLAKE2B a08ac78bc30c445017649647f1e68492e948a6161d36dc97ca28e18866f70e0b3865a2436dbc7619207fe07e4d6fe9b2d9b3825890304857e665065bc7be15ae SHA512 5a373cfab1c38c81f17c59d7498eb743064f726ef6a8962abdd4d5a3d1af382c2fedec2d0f9640739f2f1e90aae52fe12c583ddf7fcdf7e96ec8737d17c5017d
 EBUILD stone-soup-0.26.1-r1.ebuild 4785 BLAKE2B 65800f751c38b6005bd0645907a16e88d58a6c9e5a67dc750184bf5272fe5cfc99f86683e3d21446b2352d3d44d9ccb47c916abc6df9ae1f03220fe0c35afe63 SHA512 e232b2878c412d712d2b749879988806f653dd1db3348e03cfd5301e797b32d991a0c34e61934260587a24d374bac6400455798b01abbddc8e68ced02c09faa5
-EBUILD stone-soup-0.27.0-r1.ebuild 4569 BLAKE2B cf84cebf42c71fd922ca133500130c87946c9d9fcdae35451e046a82155c0abb0988e92b5d2a6a555786ad596d654ee05afee1dc177504c3965f77c63c5e100d SHA512 4346e417f7ddc1ddc668e0115495e15728d7eea9e4bfeedfd9209bd500d207d8ec2cf5e7dad0b6dff40e62c88942808c441ebb77c5f2acfe777dceda7a4191dd
-EBUILD stone-soup-0.27.1.ebuild 4574 BLAKE2B 8b8c51b716175396119543b9e6ba16227aaa7a2b8f669afc58d2e06664fce6df95a7c24b5396819eac05c45a81477176e21989abe12a4d1a940d51b4816d0a64 SHA512 96b59509f23e9fe327b350312c5e0bfd985f72867b67b3e6bf866674ef60af8a9d2cc7ae4fceaf50d472b80f911cce7c85c65b8cd8560f181cc5ebcc5d53b2a1
-EBUILD stone-soup-0.28.0_pre20210831.ebuild 5211 BLAKE2B eb3250f7db4879e128872cbef162c8bc2816e001a65644ec3e4ad665ce6f43f694b127212098c103fb33ba771f3c8ad7d3a84a179fc1d6ac77462fdd606cbc50 SHA512 34cb82917441e07bad89e4c5384832267e44da033c4c316f7745b91eda66dc1f2d877c184180aeced660b1f74bbf5c148a54fb8c83b31509ac67b89567a4e407
+EBUILD stone-soup-0.27.1.ebuild 4572 BLAKE2B f914cf80deb946dfbc482985fcb7cde8eebd4e7b870f7c03af980ceeae2be9a390ffee4ca5894be07916d86b86fbc46b506fbdd6c0e262d404b42cce197169ec SHA512 7674f939ecae0112453f2236708011a33c1be0d86d3886229d62c99df688dc228ee9099bfef779e49c6536bff05ddeac42310f79648920278f21ddd203c2d187
+EBUILD stone-soup-0.28.0_pre20210930.ebuild 5211 BLAKE2B b88b19281cc240bdd37776145df6eb656d650deddd14abf4e5e34a5213927fc8e9b13e261d326548af378271b92dd3e6167cbd72ba48f709024c0e1980a4ec4a SHA512 b6e5dcbb09ce6094104ab04bb53e2a34b68b527ceb4c8df105fdf99121f31c5a5a6e67a736a4b301febfcc8610d7a4e8ba440a9566731fa3a278fbbeaa9bd3a4
 MISC metadata.xml 1620 BLAKE2B c010b68c8a3287ab8015f4111ecdf32cf49801b133e31c782d3c72f74e5805e7929cd169ef21a247a484d7398ce688e3e1196ecaa265f6740261e95592d30e1d SHA512 e2c62e86f83eb9be7badd06573b2ad142dffba70924a5aa4fcde847ce141edf2f9a767285ff8aa263c90e1963611e07664e4d9de06d2d7c89a4a9a0df1c42615
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
deleted file mode 100644
index 67dac56203fc..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
index 5a1ef5231382..cc70aa3e58dc 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 # 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"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound +tiles"
 
 RDEPEND="
diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
deleted file mode 100644
index 51d928f03e91..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210831.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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,10} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
-
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="https://crawl.develz.org"
-SLOT="0.28"
-
-# Leave empty string if not a _pre release
-COMMITSHA="46f4d3c3461b2012140bb15563a19ef027b1fc69"
-if [ -z "${COMMITSHA}" ]; then
-	# This is a proper release
-	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
-	"
-	MY_P="stone_soup-${PV}"
-else
-	# This is a _pre release
-	SRC_URI="
-		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
-	"
-	MY_P="crawl-${COMMITSHA}/crawl-ref"
-fi
-
-# 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"
-
-S=${WORKDIR}/${MY_P}/source
-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
-	"
-
-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"
-
-	# File required for a _pre build
-	if ! [ -f "${S}/util/release_ver" ]; then
-		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
-	fi
-}
-
-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.28.0_pre20210930.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
new file mode 100644
index 000000000000..670b13e391ae
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20210930.ebuild
@@ -0,0 +1,201 @@
+# 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,10} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+SLOT="0.28"
+
+# Leave empty string if not a _pre release
+COMMITSHA="f77a47075d75ed93d74dc37d5dd92497f3a30001"
+if [ -z "${COMMITSHA}" ]; then
+	# This is a proper release
+	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
+	"
+	MY_P="stone_soup-${PV}"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+		https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+
+# 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"
+
+S=${WORKDIR}/${MY_P}/source
+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
+	"
+
+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"
+
+	# File required for a _pre build
+	if ! [ -f "${S}/util/release_ver" ]; then
+		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
+	fi
+}
+
+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-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 8cf385780b68..6183811f66f7 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
index 336a93801e15..2b20974f4958 100644
--- a/games-rpg/sumwars/Manifest
+++ b/games-rpg/sumwars/Manifest
@@ -1,4 +1,3 @@
-AUX sumwars-0.5.8-cmake_lua_version.patch 286 BLAKE2B abe2013a9e0928cac9625719014eeb3cae3592938fc16930c73d6ffebf188c1b4120abc51d9c0a77896479384e9153cceb25ff87b30390873690b7d23b71b975 SHA512 5962aa04b8c296b30248de424375107274119971e9db3020d0b66f121b36cb65f840423a097839674311ffa986d73a93e735c6e4fb592a971c6eec890c9e4af1
 DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
-EBUILD sumwars-0.5.8-r100.ebuild 2053 BLAKE2B 290340af0e0a176c5f20ccd4a7be053a1cc849c1f4567691fe13f5704c7babfc8fbe8292f399e2c57c61b78d4f3f1f8ef8a1e39b006912be9bc7295f7e0b4111 SHA512 a856057bdbbb59b88a7099961ebe7a65e129533c303945bf7e7759c5e025b36732317a472ea51d76e170c9f66f490af47f41110c5c56f3dbd6e01e8d97e2c899
-MISC metadata.xml 522 BLAKE2B 627ddf8a130658dd4b86eb6c163b193de7b8b09df888875159cf9fa2868aa40fb247757a3f2f4a933d6755cca56f472a598c7c3cbe53120520e459d5d69fec4b SHA512 2069d6d03230d619c95f0118170a8efea814cf424df65bdbe77bea77a4b0a133750247a3082b6ab3d7a0465e29066428b7a841c1c5da9156af237f0eb07560bd
+EBUILD sumwars-0.5.8-r101.ebuild 1629 BLAKE2B 4d0dd8c2aacc52b88579e6b20b0dd6900bd5e8e051581e3cab34a90e893e4c5c29e2726caae72786cfec1baf2b591773972a8b911bfa17c5634149a711bf733b SHA512 29a4d12c56a597117bb6f76f576d5f46fc7230d0c8401683bc52563995ee3e176a9f5b87fe15ac44a68121d04b819e3eeb0f49f32bd83d2a6c7d1f82a83adea4
+MISC metadata.xml 394 BLAKE2B 5e8e48edcb035a6be70458f84861f10f459a4a7342eb93e4ffa5214082001c6b7756aebe290bf512b7fea7d5be32af8477689dcef95bd0f6ac2a8047dd68cc87 SHA512 afde8de34962c9b448d081a5512dbc3cffebae767f5f5495ecf4907d9b9a67503009d98ac189072c33ef515c3eaea5b933dd0d714fe418670e19c430259331ca
diff --git a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
deleted file mode 100644
index eed17e93dcd5..000000000000
--- a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -179,7 +179,7 @@
-  FIND_PACKAGE(GNUWIN REQUIRED)
- ENDIF (WIN32)
- FIND_PACKAGE(OIS REQUIRED)
--FIND_PACKAGE(Lua REQUIRED)
-+FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED)
- FIND_PACKAGE(CEGUI REQUIRED)
- SET(CEGUI_VERSION_RESOURCES "gui_0.8")
- 
diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
index 38362758353c..b6bf04ac1ccb 100644
--- a/games-rpg/sumwars/metadata.xml
+++ b/games-rpg/sumwars/metadata.xml
@@ -5,12 +5,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<changelog>http://sumwars.org/mantis/changelog_page.php</changelog>
-		<bugs-to>https://sumwars.org/mantis/index.php</bugs-to>
-		<remote-id type="sourceforge">sumwars</remote-id>
-	</upstream>
 	<use>
 		<flag name="tools">Builds editor tools</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">sumwars</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
deleted file mode 100644
index f6f1badd5aec..000000000000
--- a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit cmake desktop flag-o-matic lua-single xdg-utils
-
-DESCRIPTION="a multi-player, 3D action role-playing game"
-HOMEPAGE="http://sumwars.org"
-SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools debug"
-
-LANGS="de en it pl pt ru uk"
-for L in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${L}"
-done
-unset L
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	>=dev-games/cegui-0.8[ogre]
-	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
-	dev-games/ois
-	dev-games/physfs
-	>=dev-libs/tinyxml-2.6.2-r2
-	media-libs/freealut
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libvorbis
-	>=net-libs/enet-1.3.0
-	x11-libs/libX11
-	x11-libs/libXrandr
-	tools? ( dev-libs/boost )"
-DEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.8-cmake_lua_version.patch
-)
-CMAKE_REMOVE_MODULES_LIST="FindLua FindLua51"
-
-S=${WORKDIR}/${PN}-${PV%_*}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local l langs
-	for l in ${LANGS}; do
-		if use l10n_${l}; then
-			langs="${langs} ${l}"
-		fi
-	done
-
-	[[ -z "${langs}" ]] && langs="en"
-
-	# configure sumwars with cmake
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=""
-		-DLUA_VERSION="$(lua_get_version)"
-		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
-		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
-		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
-		-DSUMWARS_LANGUAGES="${langs}"
-		-DSUMWARS_NO_ENET=ON
-		-DSUMWARS_NO_TINYXML=ON
-		-DSUMWARS_PORTABLE_MODE=OFF
-		-DSUMWARS_POST_BUILD_COPY=OFF
-		-DSUMWARS_RANDOM_REGIONS=ON
-		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
-		-DSUMWARS_STANDALONE_MODE=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
-	make_desktop_entry ${PN} "Summoning Wars"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild
new file mode 100644
index 000000000000..c77b37294846
--- /dev/null
+++ b/games-rpg/sumwars/sumwars-0.5.8-r101.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindLua{,51} )
+LUA_COMPAT=( lua5-1 )
+inherit cmake desktop flag-o-matic lua-single
+
+MY_L10N=( de en it pl pt ru uk )
+
+DESCRIPTION="Multi-player, 3D action role-playing game"
+HOMEPAGE="https://sourceforge.net/projects/sumwars/"
+SRC_URI="mirror://sourceforge/sumwars/${P/_/-}-src.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tools ${MY_L10N[*]/#/l10n_}"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	dev-games/cegui[ogre,truetype]
+	dev-games/ogre:=[freeimage,opengl]
+	dev-games/ois
+	dev-games/physfs
+	dev-libs/tinyxml
+	media-libs/freealut
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3=
+	x11-libs/libX11
+	x11-libs/libXrandr
+	tools? ( dev-libs/boost:= )"
+RDEPEND="
+	${DEPEND}
+	media-libs/freeimage[jpeg,png]"
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local l langs=
+	for l in "${MY_L10N[@]}"; do
+		use l10n_${l} && langs+="${l} "
+	done
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+		-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+		-DLua_FIND_VERSION_COUNT=2
+		-DLua_FIND_VERSION_EXACT=ON
+		-DSUMWARS_BUILD_TOOLS=$(usex tools)
+		-DSUMWARS_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DSUMWARS_LANGUAGES="${langs:-en}"
+		-DSUMWARS_NO_ENET=ON
+		-DSUMWARS_NO_TINYXML=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon share/icon/SumWarsIcon_128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Summoning Wars"
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 53f5c92c5b64..75c895d58e4f 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 5ce1aafd07df..bcbb8c4b5f7e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -3,6 +3,6 @@ AUX flightgear-2020.3.11-fix-assert.patch 490 BLAKE2B 4bfeaa11b36568080a0e687878
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
-EBUILD flightgear-2020.3.11.ebuild 4346 BLAKE2B dd769930c84e0703121e0b339f854201b416056339185cf8728324da3543012a56f2ae7ba5c8e26b481fa82dd541848981cdb2bdd55497c94133efdb723d05bb SHA512 871064ed22a065a10157819d1c96b9c9bbc1cb59f2bd8ae8e9c421d9aaf37c27efd66e6789ca2ddd25eee791ff929c8a234c4e667f3bc3a1cfff429850154da6
-EBUILD flightgear-9999.ebuild 4348 BLAKE2B 612e0e71deb278b5ccdcff04a815a8fb0813ee0680e76234bec5d55bb1c4368c24fc825a4775f6073423ba66ef02534200ef9d38ed5c24f64e211d8846e414b7 SHA512 ff32d8cf76d6f719b7469919cf3c441653208903b26557e6609871596e45429c4d3a15acd0a720a67e63f80df3bde198d56bc282a3a43a5ae800c72ed7f37f74
+EBUILD flightgear-2020.3.11.ebuild 4346 BLAKE2B c414a8fecdbe98d83d8d97fc4b8dbca8f4826861fad41b4256fb1c41c6db0356124ffa78b6766d1109f68c35d001501da0dab47d114c9a89bc0df55e84089a9a SHA512 0bf78c006c2fe16c9b873968bd406b30a316cedebed3512673bb1f6fac5b97cdec315ef6eaab98ba61fd07ca99450d7a3fd4cb73240eebe5a643f5abb4bdc02f
+EBUILD flightgear-9999.ebuild 4348 BLAKE2B 0f084f038d9b973fc9fa1fb652e1388d31ecfdc9740e9b6ce83aeca262809fa7c8acbe1fff7a16fb08cfd77fc4d46249b01efcc6ad21e27d6692b385bcdd786c SHA512 764f056eb4935d2562df4dab29d393aed0884f3568c414ed36e55ab647747c039151a5d9353747cd1aa4e86479df9097e9a4ffbf698fa63a53adcced270139b5
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/flightgear-2020.3.11.ebuild b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
index 63fa5defb424..5467dd59b859 100644
--- a/games-simulation/flightgear/flightgear-2020.3.11.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
 	dev-games/openscenegraph[jpeg,png]
 	~dev-games/simgear-${PV}[gdal=]
 	media-libs/openal
+	>=media-libs/plib-1.8.5
 	>=media-libs/speex-1.2.0:0
 	media-libs/speexdsp:0
 	media-sound/gsm
@@ -52,7 +53,6 @@ COMMON_DEPEND="
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
-	>=media-libs/plib-1.8.5
 	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 849f3001385a..f48409f1c9d4 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -26,6 +26,7 @@ COMMON_DEPEND="
 	dev-games/openscenegraph[jpeg,png]
 	~dev-games/simgear-${PV}[gdal=]
 	media-libs/openal
+	>=media-libs/plib-1.8.5
 	>=media-libs/speex-1.2.0:0
 	media-libs/speexdsp:0
 	media-sound/gsm
@@ -54,7 +55,6 @@ COMMON_DEPEND="
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
-	>=media-libs/plib-1.8.5
 	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 40d7a9941d30..c0190b144f61 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -9,6 +9,6 @@ DIST openrct2-objects-1.2.1.zip 3381089 BLAKE2B d7b26e45dad74e5c2b30669bb9bfa96e
 DIST openrct2-replays-0.0.43.zip 1669525 BLAKE2B 41b9b1accd877b98c7e244abfe799233e0bf75c14fa7e83e8c1fe996406303dec009c396345ec554a5ca1549172b1497e3adb5d038179c42ae1e719c9707567a SHA512 bed91fdfb7c67449f46effc7102ecfb46f3f5b43130cdbfc1343067a95a046714a0d2e9444b8059845c48bec5d0d4d8560ae7e3a3b6ec7182e7eff5bf40a5131
 DIST openrct2-replays-0.0.47.zip 1589556 BLAKE2B b499f7acabcdf203662aaa98e75b08fa9c76202c0182beb28f458fd55ebea198d6d1e8d4621c6c531387c474197a08b739313a520c7dcc07c2d5a6762cb5e96b SHA512 49ea856a5bf7e6bc40a1c5480be4aa26bb0fbf353fd1db3fd8ca9b1eaec438f8d394938616bd60bdf163bf8262aea89b13d88b5c5d11c664448e049779a98720
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.4.1.ebuild 3907 BLAKE2B afb084d11dc302a5bbcd012829a3eee84d235ccc10a6286ecdfa2b0ba3d69347d2b76e7414518dc94c71013b6fd27a34033d28a983199e72cbe48da2097737ef SHA512 33cd727418f2b5b5b02dfdeb571093665292dd326fb468fed9c5c99e082f5bb1420161eb9fee265b24246afacade9711ac6c10d54d62a350069adbf6f620b399
-EBUILD openrct2-9999.ebuild 3863 BLAKE2B c204db18ce6207233f9433d07d0073328c56c8fc2a4e5d2c504d10b5e7830bc5a7d452dafdf33e23c19ad88d0d93aee3f335e18666904e3497567742b06ded12 SHA512 b0a2fe815c2c8e6698afd733a42f24a5e28c2b2f47b657e851689c201d9319bc6729021d526ea01f6fade3fbeae084cd1c52796282b0e9a8c8c2ec5526f7a035
+EBUILD openrct2-0.3.4.1-r1.ebuild 3909 BLAKE2B e44800b080cb0469490f82a7e79dbf18c02f217fcf6c34588eee95f6e14b30a8725cb3277374c2a0052a9f1cd5bb11d4f37c214c690d5494281a02e166e2b7bd SHA512 5f274a1b7056b850906b9e14f2117ca11263c486ae085ba4d47a8c65fdc5feae492f5b6d5adcd2c8b5453f43547af54308e8c7d98ca79803eda36469c916e33c
+EBUILD openrct2-9999.ebuild 3865 BLAKE2B 0dc46bf0c1380d762a99cfa84cd6d6767ce276ab296162716650c5e813aafde52207547c1485abe8e716a4a3a0787b985817e6d1831e683fc74800434973094f SHA512 125d07c543286492f2d456d1577939bf5f190f8c12b16346cdb66012400720244c42f9777405ac638471c920e52779017f5ce907529811f3ca3d23c51226802b
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/openrct2-0.3.4.1-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.4.1-r1.ebuild
new file mode 100644
index 000000000000..4bf5c3e2949a
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.3.4.1-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.0.21"
+MY_PV_RPL="0.0.43"
+MY_PV_TS="0.1.2c"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:0=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		opengl? ( virtual/opengl )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_LIGHTFX=$(usex lightfx)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		$(usex test "-DSYSTEM_GTEST=ON" "")
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-0.3.4.1.ebuild b/games-simulation/openrct2/openrct2-0.3.4.1.ebuild
deleted file mode 100644
index b734ade37c73..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.4.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.43"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +lightfx +opengl scripting test +truetype"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index a86f6fca2c97..e4dfb6839dab 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="dedicated +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="
 	dev-libs/icu:=
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/libzip:=
 	media-libs/libpng:0=
 	net-misc/curl[ssl]
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f2e4881b0a11..fdbeef12a476 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index 3e41a5f94f82..508979066e90 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1,4 +1,4 @@
 AUX dunelegacy-0.96.4-init-mid.patch 1926 BLAKE2B 47c2f502e9428f0534a1684db50aa1a41103464770f8da66f69b0add7687f42e07e4f5e612f3c425f3d0f932da29d7a6049342b6bbd0b0166cbec4d5076703c6 SHA512 a10fb87b3bceb367e53dd3687354871fc8bec3dff2025b37c4426994a206c7afbd416c003f2eddfe3d1cef7e845942d2a8db4529e84c38d4b29d75d016fa8729
 DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0
-EBUILD dunelegacy-0.96.4.ebuild 806 BLAKE2B 03ba909beb05d2eae3aff020116b962189cd4ef4497154f3050100127912cdf33a33481ee09334c9564f772883ccca4c11baed1519d7d17b61458c87d2b57501 SHA512 c17ad6aa55d7698361ad6ce55906e8e97cb8e90d2b4564a8d161a21416269163ace3ddcb1851ab26b3a23678fa789400a20c1790f90999ed78c576409bcbb365
+EBUILD dunelegacy-0.96.4.ebuild 813 BLAKE2B dc68381e7f322895061a94a79a5f3ea6a6cbb055d0390f6cf83288d1616aece85a4666fe81d1f8468084937b64857cd87a4fedaa447a1b818a5b3a9e7042d252 SHA512 8d467f0f7ff8820b8ed6e3d07d77a981d7c55ac70af32be67ef699f9226620d1234ea3c7efcb1a543a0bca56ef8c10a778bd85fb86fab8ce969a0def6d5603f6
 MISC metadata.xml 990 BLAKE2B 061e344e58047df210eea2e672e1c38cacb01ac09b9c56828e4ac253ebff8b7aba40249dbffe696dc2b0343074c3c280b677dcb8e8bc64028c9ca85b51f260fd SHA512 b43c0f161108abd41a3fbe73ca1c1751e828d8fc909be52dd46ff145b5a3efeb6c8876d94d9cf4c7fb24e7f711830af1645ff9595500def47ad5833341f4d3e0
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild
index 5270312de457..598e792c2bd9 100644
--- a/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.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 @@ HOMEPAGE="http://dunelegacy.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 
 RDEPEND="media-libs/libsdl2[sound,threads,video]
 	media-libs/sdl2-mixer[midi]"
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 67cd0cc541cb..f4abeec885ec 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index 94dc720b4a50..b4e6d4c4b429 100644
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -1,3 +1,3 @@
 DIST atlas-hgcode-d4e5360f8273823205d9dc066547f5077ffc13e2.zip 795465 BLAKE2B 2e3afa478bf791bd96233bfcf8cfbbc9ecb41458591bbf8262c4c720bc4393b8f3b0c023fdf7a5f98a9e68ae89bc478660521eb79fe7a2b8f9c0b156917754c2 SHA512 fbad07ee7f416506bff6c338bb53f05b3c59759df23eeb732c8e525f2a4d7622941d018871357c3367ce8dea81d6b38d8811f65b0678e8e0bf572d5757f4221d
-EBUILD atlas-0.6.1_beta_pre20181202.ebuild 1269 BLAKE2B cdab8922997e0583cba1fb6c327c3a4d00332d3e5de6066c4bce7dc5214423264e1dfb0549d045372a245c429c4c3a2df6c366ca0cbc43096743e62750dededf SHA512 22c871423a868bfa7704b7ae61d10128878db4f4c411dc36b5eb0a6a122ce98075a782634ce76c542da7d4b5c3cf138612beb9674ae286816c7b88ac959410ac
+EBUILD atlas-0.6.1_beta_pre20181202.ebuild 1269 BLAKE2B 51aca8ea390a92cd930683eacba42770fe57e7bb45518cb3726b5bcf367ba567bb5bf19edd3096a3e9f9634e0b6780f18ebb58e4342a6f32387447071e5f289a SHA512 c7412aac71539500168821105525cd62e99089747d457b9862fc7d9ef35c381674a68ab03434e7b2d1ce7ba8ae6e3f57471a726666c49ac76a38ddd5a121ede9
 MISC metadata.xml 441 BLAKE2B 582a84fb1c6ca78342a29c2d7ae2e7bd5359f77ebfb618d1c5e0040c517a55232f97859ed259818d803de545c2471f0ac187a938ec290a98161ba573e33aa3a4 SHA512 2160277e85a96fd35d47c6ed1fbb91b6031b5a9c2f90f87452f36a3bbac9869070789825b02f574f0d8768876594131f091206087d0e32d4e81f4c8f7362e313
diff --git a/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild b/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild
index 6f986b280580..b2884fcbdfcb 100644
--- a/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild
+++ b/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	media-libs/freeglut
 	media-libs/glew:0=
 	media-libs/libpng:0=
+	media-libs/plib
 	net-misc/curl
 	sys-libs/zlib
 	virtual/glu
@@ -29,7 +30,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-games/simgear-3.0.0
-	media-libs/plib
 "
 RDEPEND="${COMMON_DEPEND}
 	>=games-simulation/flightgear-3.0.0
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 7b71b5ebb782..5a62292cc875 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 94f8b431d53b..92a4b8afe1a2 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
+EBUILD gnome-keyring-40.0-r1.ebuild 2162 BLAKE2B 422663d6cdcf7eab1bcea2318af0f4d854542494448b7ec855b4133853c574c5fe371e88da04e93d9ecc4d964efb6b409e2579a222e3c5b8b6aa18aa959ce9c5 SHA512 e83fd59c871e579358843ee9f1f320e5eae63ff0fd3057f46ab8173bc8b9856d6486a55a638606ba614667abaf085657671f017210eda5360481d9b1a239582d
 EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B c79a2de4457666987941707a1fe784b504d2fe820661650039e22cf420597d239f8f6939233d7fb2198e5e537d7eb79cf298fb2448439acd6d4375271c9177e9 SHA512 3994d2754c8738f0630a88dad84a7ac62d0ded284c098173324361bb7224f387c1973e9f724b86875bb3cb6fcc1dab1379f228553d58f5256c6af0d3ef896d43
 MISC metadata.xml 884 BLAKE2B 7453133f82b652fce07202db1a10c488a32355dd9398847e3d2f7d1cc62ad466c25febb6713318ba6d77d006e3f87b15c593c5020d1f187e2d7704a4c676dade SHA512 d5419c6a5b09fc57cb877210e59f82717374ea5ca7914fe305b2f3625e190c4438f76b24503698dffd00633ba17bcd70a0068765284ccfab730c5b7e8c1b768d
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
new file mode 100644
index 000000000000..a6174f16178a
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome2 pam python-any-r1 virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="pam selinux +ssh-agent test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.27.90:=[gtk]
+	>=app-crypt/gnupg-2.0.28:=
+	>=app-eselect/eselect-pinentry-0.5
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	pam? ( sys-libs/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--without-libcap-ng \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc
+}
+
+src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng, but that breaks with glib-2.70
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 90e6e3d53668..b868a496484b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,5 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
-EBUILD nautilus-40.2.ebuild 2893 BLAKE2B 58ce39cd1d585f6c280aa96dad4a210556c71607087c73f70ba756e35b704c067207989d070bf90279869e233cbd2ed290aa4e993a07c8966ae3d79395ebbf0e SHA512 d409795bab3a1c0bedf214adb11a08f417bebb711b1fb166d577077d23fa924ce7c3fe693bebef7fab2e2cbb87ccca7652007b3ac5869e0cd260f4d30f9c5e17
+EBUILD nautilus-40.2.ebuild 3065 BLAKE2B 9e69ced68e66e213977e927dc86865eb71211388aed72f190377c0af5c45fc7e3993ae53e98f5123305b42bf6d3167749fb0593e9df7307832f2169be520994a SHA512 66a918c5ae9fbf231684fc76d19b817dbbfaf4e887f52eb7870cdf9a0ad1bd6ed075d31db5b7b678dcd5217986708542d7c84781506ed2b5b4a79375a7a0fe85
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-40.2.ebuild
index 60b6475d5030..0ed580949d00 100644
--- a/gnome-base/nautilus/nautilus-40.2.ebuild
+++ b/gnome-base/nautilus/nautilus-40.2.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
 		$(meson_use gstreamer) # gstreamer audio-video-properties extension
 		$(meson_use introspection)
-		-Dlibportal=false
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
 		-Dpackagekit=false
 		$(meson_use selinux)
 		-Dprofiling=false
@@ -87,6 +87,7 @@ src_install() {
 }
 
 src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
 	virtx meson_src_test
 }
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 138e05542ff8..7ffb82898bf3 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 1dacd4de369e..ddf09a68cb1a 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,4 +1,6 @@
 AUX gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch 1659 BLAKE2B af3da54697f7b9101fc81f442c5d2d3712866b1da81c56ed24478d21551ca0553d3bf259e54162c04e0a5c2e06cc0c460c23ce0dc47fed493340fb9960fa82b9 SHA512 c5adb0101fb7a834a10316d1bca48a0215cb3cf1c00beb17b9c2c2005c07c9753dbcaa6b4ee5deadae6aa6595b7a3b8cdaef9cd537b2bf236b955b9ac5ef53b2
 DIST gnome-shell-extension-bing-wallpaper-34.tar.gz 4308799 BLAKE2B 5c14895fbb42fb726e1b6d93924eebfd7b93ccea893075bfd698476579962a88f8e0008d7e935304d56caba1db1f8afc8fee3498f63044e4a9da13f568025e84 SHA512 7e1e26b5494a9e66d74c3d1045827445935d1a0ed20b095cb72b3b06b622ae5fda7980313dcddedf25c5ed3b40717a8e322bc80764f502c5eb7fe7155ec84ca7
+DIST gnome-shell-extension-bing-wallpaper-35.tar.gz 6060072 BLAKE2B cc37ccfc193b10d7e9e96bae7684ba4c247fc625876b2ffaedb56f7212bf211a4ebe5b33b6a1d072ddcda0a5be7ce026d1e05549f6d7d40f38b02bc0aa69fdd9 SHA512 65cafd6da9788e705d3a52c4e461fcd199455b2a90e431cf455cf2460f772eef54fcc6be78397f34f34d710f20e3fce1f18cde9312aba56efdb438e47e417958
 EBUILD gnome-shell-extension-bing-wallpaper-34.ebuild 1230 BLAKE2B 8b539ff6e099f97b6b0352765338667ccf7cb670d2d95c59e603624fbd85058235a1679429eba59423ab74b38277554c7ada57d1c25e05387c214a5ddf543396 SHA512 0627ac6dda7303c0772b24c687618c34398c60bbc32e7ff06ebee13391b4f159404f3ffb22e1bab477483c68afb47a175b30d50bc8eee83ffbf15ed7fef7fab6
+EBUILD gnome-shell-extension-bing-wallpaper-35.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-35.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-35.ebuild
new file mode 100644
index 000000000000..c31bdf512404
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-35.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
+HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
+SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.28
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
+extension_uuid="BingWallpaper@ineffable-gmail.com"
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index d6befd095b9c..e1efc1db477c 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-bluetooth-quick-connect-20.tar.gz 20334 BLAKE2B 07998362457b4f8ccca56d22891d4998a00ba3eb8698d610778aa094df73f964a2e1bce1a1cf721b7ff037499a10b5356f3ba023fb4a04f898291a3bd7eb72a7 SHA512 947a181de76746a2a2f6d69984427b299f9e9f76c77e7e2afefd0e8c83f33226ff4c0b9a296252a21136feb481b5241d31a57f96360b9e8b1f911b043c7757b8
+DIST gnome-shell-extension-bluetooth-quick-connect-23.tar.gz 20319 BLAKE2B d43c8291de5e14922046ced9e3e097c925788f7af444ecceb52a175d71030a7583f3df61a2badeca6289ab9f5f2361710004e9e0ce2ff18627b4a7d667138443 SHA512 e13d95073a8450efdf68ae1ac2df8e60832ba6e7b7238514a9f5d799257167bc71c7fcd2a554ea8549a5e59e92d25f39ed10ebf251e15afa7a3d106695415aa8
 EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
+EBUILD gnome-shell-extension-bluetooth-quick-connect-23.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild
new file mode 100644
index 000000000000..dcf84bd1bafc
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-23.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
+HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
+SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	net-wireless/bluez
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/shell-extension-}"
+extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE Makefile schemas || die
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 274f189e6b31..f05065a57de9 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,6 +1,6 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-13.0.8.ebuild 1506 BLAKE2B eceabffc13dd3bf5c5fc3e0b0fec03de5a469a97a79143a5c8de9fd87ee2923b173c73b33bee6e575c4f23ca7f2dde1c430edd02e0b64821a25c821b033acaa2 SHA512 58561877f38ca9d8b66a599cce704e04e04b698f42440266bb52c9c98bbc4da83b2b0e0f855a513cac41c547f71913b3a1d0314b63789a936ae5cbbc25373f34
+EBUILD gucharmap-13.0.8.ebuild 1513 BLAKE2B b2d035506c04b189660dd7cf90e13adcadee5f01090fed944600be4eb067307e1a5767f5980b155b7d6c43858f8753c8a596216d055f43ca0af55df5d0890d97 SHA512 4d0e19912ebca1fec4906730bd520d41c4d08db5ced4da9323616f80aa90010cf3b1c7a9a789d415c78a42faddde04dd1180f744d674faec7abebefacfdd5e7f
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
index c5ddaa9831f1..3e9ee44f49ff 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 UNICODE_VERSION="13.0"
 
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 382161d71192..d00b89d1493b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,3 @@
 DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
-EBUILD nm-applet-1.22.0.ebuild 1221 BLAKE2B bdf8f5de4327a15b8694cd7322c705d1755404a9bf418b3e21e837656fc67242cf8e3c07f8b3ee03345cf51d6fe6857f94be887de769ae5c832fc76ace245c75 SHA512 b2004e1a113da2307ba61d892254188a4f384a6e7ef9bed6bd7107c1a5ee635b537945c52504040cf9766f3433c6fedc674f21e12228c6f38391642d9d1c057f
+EBUILD nm-applet-1.22.0-r1.ebuild 1223 BLAKE2B 0dff6055d849a1c8dbd45ed5d6f65881f8204e25daa8463ba7ca5b6b6cf6d70147b3c913f709cce638c621a3ce4577975f1452148a6517d11b8d3f71707a852f SHA512 53725fca8fecf6df0975ead5fb686454659d06f8602c309d42f0ec659766e11840bfdcd34f6431edc379d98dbcab8e939f7a4cba02a529cdfcd0f3a5cb4565c1
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..57ab47600412
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.8.27
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=x11-libs/libnotify-0.7.0
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7:= )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ubuntu no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
deleted file mode 100644
index 06440230a7f5..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="NetworkManager connection editor and applet"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=app-crypt/libsecret-0.18
-	>=net-libs/libnma-1.8.27
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libgudev-147:=
-	>=x11-libs/libnotify-0.7.0
-	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
-	appindicator? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0
-	)
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-
-	virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dappindicator=$(usex appindicator ubuntu no)
-		$(meson_use modemmanager wwan)
-		$(meson_use selinux)
-		$(meson_use teamd team)
-		-Dmore_asserts=0
-		-Dld_gc=false
-	)
-	meson_src_configure
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b99eaf3f9899..e90748367ec7 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 148852e4734a..63e6ecbf2e6b 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -3,5 +3,5 @@ AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19ed
 DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044
 DIST akonadi-21.08.1.tar.xz 1607852 BLAKE2B c7c96efaaf16fc925b7021319791c248631b01ff644d4c75193a1666a0f9130cf6229e8a14a3ffd3531ef0f55a7fa6fcc8edd75b2e501aa895005371a08a7695 SHA512 9388eab776652cd9dbbe68fb17307e9861483aaeaa3ab1045281763bb6e18e1346f996daa568e5978f5493d8bbcfe31f2549955b22671e32a386e9c7aa5a4c58
 EBUILD akonadi-21.04.3.ebuild 3445 BLAKE2B ed1f409fa9071cae93c60bb87c19080b9f7e99dc38a39d725d7b47d6ae730a553cca682670330aaa7b3b6e4aa16e09b3395e949051f0f77342d54355f4f40c89 SHA512 12c591753e9168abff23bab19bab947f155e39d4707a248b83fa53f59e7c82f2973d98ff60b1b12c78fd57045f41aaeada5545ee968af7c73d64bc51739687de
-EBUILD akonadi-21.08.1.ebuild 3446 BLAKE2B 4ae0e8f748228229be578e470c010c8a7ad8a9ad8294f73c85d76e225efc24262fc56248f836da1e8658ca1ee08a843f4cfeecc4c221d00385baa064049f957b SHA512 c2f7e685aa3805fda53c10d2431b6651bd1bc5deeaba992100aa9a1e6d74e2c87ba3daf83418895f9106af82dedaf0bfec0ee499d79bebb15bc3306f424bdc1d
+EBUILD akonadi-21.08.1.ebuild 3453 BLAKE2B 5704bd49a5cd49b2291fca2cc46d02d06b260b071e6379de61642e6fd100fc826785f532bb35bcdb82f71ecb65ef30652a70a4fe958b1e27082604858650ee63 SHA512 a7872da820810dfb26fb011c4f673d0f9b1fd51158fca190b68a398ba3565fe888a2c9a82cf0fa836de19f5e2765771bc7c3e4db25c663188f4d2b0dbe594ce2
 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
diff --git a/kde-apps/akonadi/akonadi-21.08.1.ebuild b/kde-apps/akonadi/akonadi-21.08.1.ebuild
index 249da7cdb31d..aec1c3a750c3 100644
--- a/kde-apps/akonadi/akonadi-21.08.1.ebuild
+++ b/kde-apps/akonadi/akonadi-21.08.1.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 ~riscv ~x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index ccaa5e10e401..c1f3a7e726c2 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-21.04.3.tar.xz 1911316 BLAKE2B 90400c96735ad0796e3e4a3407d303d1a3e55f05b4b999c23e042868d0f5be73f23f56e97df199b1d58fb359b787eebe79b236bd13bb8d17320495c1780141e7 SHA512 bc1e39adb48f24c4ea687871109a5c6eea8c389de4599a12e3489b523081656414a4f8cab42e1f0e077542c1fabc7663d7105c655f9aa1c50bfed55471a57b68
 DIST cervisia-21.08.1.tar.xz 1911348 BLAKE2B 5709cc8a2d05edb2e66d43fe40e4ffde0354766ff4cbd06b024fc50ba61133e287495ddeaa3d68b5097081cded24f06bc9adf80e746e6c5c4db63c9e9d4ecea4 SHA512 ac18828a5b13315793a391fbebf7f38d65e462a75687ed3265fc3a9e1bbff79693604c183963f41a717129a4c95188869c01745267bfe89836ffdca1fd8e9d53
 EBUILD cervisia-21.04.3-r1.ebuild 1095 BLAKE2B 7b4b1b0226fdc8be83c75b1b308698ed0859aff42e9eed4249e016155b80902357625b5929eff4258c669886807efd934c7aa6f6769e025f11c4779d513feb5f SHA512 2dbae3e07c8c251a84f3b5bcff68aca69c4085467b450196a39ae00e862cddcb7949c88720953ad1493746a512715f2c8bb62931d998ed4c43b7ed181a5232c7
-EBUILD cervisia-21.08.1.ebuild 1098 BLAKE2B 4706386357c5d475a3dd06d8e377a916d00568eaadea9e34ae23389314c63194112db3fa5c34d1fc60b8133e7d7fe6f7e03fa56229f7396e1f6ce62edaa1814f SHA512 37d9d3b1dbc4c36f8baf82c2d32c3de8193a5e50127030e17fc6cbb6ce3f783273c66ebeeff931000fe814c894c5e605042d2dc110ee2e43342bc1ea099b05e1
+EBUILD cervisia-21.08.1.ebuild 1105 BLAKE2B 182006f4fbc5b0f132ff24cfc5eb6f0094a799436e9eab234b13bdb697e9ffab0647665d194aa130544c6fb30bf1ed050b6b6ee83ee3d05db698e0a8595dd31e SHA512 ab948e0a4cd0bd19a9ff852c8d5fdef0a58f985b3c9fc728ddaa103441610703d744dbed2e064300d2bcd99f476f3d0a0872e88ca792d469598889b4a7ef24d9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/cervisia/cervisia-21.08.1.ebuild b/kde-apps/cervisia/cervisia-21.08.1.ebuild
index d5cf64db67d5..dc8272a685f1 100644
--- a/kde-apps/cervisia/cervisia-21.08.1.ebuild
+++ b/kde-apps/cervisia/cervisia-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index cb82fbca2fa6..fda0846519d2 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-21.04.3.tar.xz 33620 BLAKE2B a20fc3791c5a85fabc6019b5467ff105a1de84d32a17337b6b956e4259175ce06c8f0f6782def58bc76acdbfe1130650369a61b51dc1e7064b5b3122bac40690 SHA512 a52ae4b51611dec6822c9817e90f62379ee0a7bde1c00733dc49533b0a189e95efe82a8316d098419435d4b3d8ace92c33f4cd19923cb1e136f9137789eba29e
 DIST ffmpegthumbs-21.08.1.tar.xz 36892 BLAKE2B 97398abd337a1e9aa487e6bcb9560705fffe2062e57149529008d8855696a569a138574d5aee80ad72439132972319b7bdba8a1dc02fdd9decb2ed4441972ce2 SHA512 ab9580a78d2c136eb6a01be3103c130e2eb0290eee62eb9daa3d4e20c71cf0f68bb1496999dc814939a95bd463a4c9a18ddd00b0e715d97071afd147ec0c62d7
 EBUILD ffmpegthumbs-21.04.3.ebuild 560 BLAKE2B 3172682fae508fa88a08b9e0fd87534781b0931a94c04cde6e35a9616857e6fddc8d864842475493bab5c0418facf141c735b1b1ffd009293c43f57bee13be06 SHA512 9cb845238a6a84caafa99fddf136285bb63414eafe3cdd52935ef5f3807dacec3ee67591aaac8931eff299babcf91da167b271b9c442f528d031879c13d09e3f
-EBUILD ffmpegthumbs-21.08.1.ebuild 563 BLAKE2B 017105e2d6c5175058ec9c762ba7114008ba1fab293984c4c88f9421ecccc540475128fcf14b6278d050f823c99fb4bccb85d6d70718f7a87d18487c038d736a SHA512 ac175a66513b381258baacfe2e7d03af9a9f8966c29b3531b1179f55cbca4a2fa9182a3ba970a4b2d2f2021ad5fb29bb0d5dbf9e9a0a5a4e2085ee75d2db5edb
+EBUILD ffmpegthumbs-21.08.1.ebuild 570 BLAKE2B ff03cf030fbf839d0979806010082dae7bbd9f72dbb91b2d8d74ef0cbddff383416bd909386bf62c14596d08296f784e3ad9f512ac6321488af299dc6257cc8f SHA512 3a2bd97ea73bf6c9b9d1e0b5ef0aaefbba0f9d397afb104cf9f159f9592451daaf6fec48f389f7daabc866fd8e0042ebf1abd6e5e8539c748ddfe9f3477aa9cc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.1.ebuild
index 2f6ca3727fdd..f967178ca354 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 8eecbf679e53..4b26a6646302 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-21.04.3.tar.xz 680804 BLAKE2B 5d90c567752923d89f0a896cd9180e19e834674c0f10471ca301cb004b1cb56aa9946799a34000f94834fae7091ee58aac871c336fbca8e36d81015051eb86d6 SHA512 7f239b0bbef95a111407d85cd7da6f9523a3b12e8ab13a29b4a7f661315e47866bf04a9863464124edd14f4e35b4d45e23cfafe059bd325b7f9f6ed3fc416a7d
 DIST filelight-21.08.1.tar.xz 683588 BLAKE2B fda91fe7904268bc2cbaa0e7f6f34bd85acf6d9dde61a571ff180ed5e104de5dcbfef6ad7726c16cfb28b16c0dfaf1ce0db41fbffe8e82a53b8e6132b43f11bd SHA512 eeb2fb48e248cf95ae94dd552176ce14a7c9f1e0dc4cbbe5dd42bd97e46b3a4686861ef222ee09a234dc2ac495f611f29497451ce39dc6194160f07a74f255f5
 EBUILD filelight-21.04.3.ebuild 930 BLAKE2B b056461314afc5f72ed4209498d1fe8681b102aa8d8369f9753667a191edbe167546eebe852bbeeda92a1ca03567fa7a7ff69c85bf1d89c45520e01ddadda8ba SHA512 36c4abe2400eb0c301ef3b8f6c53a5296009f28eb1f78132a482a199aef0b95511da42697eb1fdc701d4b3445e6da4970f4bc29452da4bb0a182573f08dafe2a
-EBUILD filelight-21.08.1.ebuild 933 BLAKE2B ce3241c5bd6a3414e7637adcc52f0c3f10b74952be89eb60cf4bf3a9adf30ec9bb3b64dcc8e28eb46df264b044e1733bd2ab972dcbdd9a97eea12bd9e96ac37c SHA512 9f76ebd1cfbf26fb5c868fedfb854d9ae64f5a1541bce950f3c24f4be07074cab1d3862cae10d8ddd29e5143b67e0cfa877d067321afd40a37a77ae98b4b387f
+EBUILD filelight-21.08.1.ebuild 940 BLAKE2B f920532b4947be3769b7b70d2caaabdbf5543f70bdb74d09e2c0e06a0f842827908fea70e41b9e49476fe04d80f6b9eb2c758752ac6086fde62acfc6bf1b85f9 SHA512 7602890f1bf7f31e3a80e4d726d030e98cf3f88c63cf6057dd17e333f13815cbce1da0342a4dd13f2b6c3d566f672691c95134285de346727f4478b88bdc3a34
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/filelight/filelight-21.08.1.ebuild b/kde-apps/filelight/filelight-21.08.1.ebuild
index 93b82b090754..c76f9379dda6 100644
--- a/kde-apps/filelight/filelight-21.08.1.ebuild
+++ b/kde-apps/filelight/filelight-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 6af6bfc36988..47bc96a53152 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-21.04.3.tar.xz 60808 BLAKE2B 4106d32b9374019a84fa802bb016813f6c1b5b9e07fb6d4d10dcbbc0dbd088dade489c1415e80011e5c72da55c74d3d116b05c4924e48a2f1b93f2978bd76343 SHA512 040c539212ee5247953045343a128f636aaf2c0fc0d8af1b7b3d8c1aeae9378af41f00ff7eb55cec07b92a806efa4b5b219beb9215280b6dac235cb95b9f7cd9
 DIST grantleetheme-21.08.1.tar.xz 60012 BLAKE2B 8b9fc7a61f75813bf430e35d19f5b321d6f18cb35051e85e829e7dae8e5467eaaaf2910aa7d6d729486371cb940cd1d368278289d89b4ecaea4e0064f8db33ac SHA512 5f4981ff303e7bf4163c6707640e87b0721684cde2e294a754a13d1c260a2cbf690aa74a82b1bf8d489d71a4ed1d050990a6c5b902aee46267c39dd73e4dd523
 EBUILD grantleetheme-21.04.3.ebuild 825 BLAKE2B cabc812eb3d4c2d5ec4e09baf97e4279ea5d69ef7f50b853724d8f93de938de6b2464b9992e178f768b80395592f23aedc6aa01679ad3a432568b682fad68cec SHA512 183c130373d549a7f5040a92823bba74f4cf151afdfaa6a7b584fa92783c9d4e87681aa6eaab1c86579696b68844b81a668ee108dd879590a312b51a2e009668
-EBUILD grantleetheme-21.08.1.ebuild 826 BLAKE2B feb1979b67f102a4f29c47a36572ce76c58e2f50594aeefaf4e704c140eb59d8c10afb83010d703bdeb14355ea16bda5ec3a9f1122fb3e873f48411fdbc78984 SHA512 a1313dde911e7790937e0ff2f88721863f91a25554875f76196b736be1ac24157d56aac0061ae06115cf347490e6ef26b2c759285abd21bbd5bb95ae3e953ff5
+EBUILD grantleetheme-21.08.1.ebuild 833 BLAKE2B fde97ccdcb30caf530d7955debd4f9ff3003d34f536d6a0c51bbf72bf53930b85f3e07781c9099592b1f576fdf0aa346c669d932cb4af71ce79af4c8e5ba5497 SHA512 2fd3a90abd45732804565cee53604ed226aa4f7f244a01a4f8526556c241703378e3d7732cdea0c587b62b52d2bce6e126502032cba3b21d3faf2ef3b26036ef
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/grantleetheme/grantleetheme-21.08.1.ebuild b/kde-apps/grantleetheme/grantleetheme-21.08.1.ebuild
index edaa6892b1c3..f1dec5488532 100644
--- a/kde-apps/grantleetheme/grantleetheme-21.08.1.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index d2a836c2e09c..8e453029aadd 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-21.04.3.tar.xz 10743696 BLAKE2B 22b58150fda55a0da3c20cd7ce85a3460f5aa195e7198e8ecc916dd3457718136648717fe2e80e37abae1d2b9456105fd1387df4afb112c8683c411304917ef0 SHA512 2bc61ebc26c73513d25a7b54e43781e5cccf2a140a74ffeef0e37a9c3a1bc823066b65c14c902bc3de8fa0b83fe620be4cfce48c880ddb271b8e399d659f4e9e
 DIST k3b-21.08.1.tar.xz 10746456 BLAKE2B 5437ef048bace39f5804d4b2ccd3db1bf097550438c5cc4772ee3b3e54c4ad18a31ee074be1596b52d161e54417144a6e9190b12a0494b6ca78a3a4726b2bf86 SHA512 06d4138765df7a71e111cc24322973e5f9c6a23ee148d332989a55eb95bce65f665bb0af727e08e9a8fe091e6e4286be64f153ae6e0c613cf5266833fd322a2d
 EBUILD k3b-21.04.3.ebuild 3436 BLAKE2B 1900cfc5fd6ac949aeacb8dac4f0da00d66ed2cdb8cec7254ab47ad741c1410bd2b46f83f8d321a50060695f60d2be032587b65a1e5ae8c516de76c7c9c5fe13 SHA512 558b02bf1e8dc9ae7405ac50f8ca03544d36ecac08e2e2b87cb577bde4bc705c9dfd1c55bdcd2383fabff18d35c729d7fcefba0df199e056f2dc2677c70bbd30
-EBUILD k3b-21.08.1.ebuild 3439 BLAKE2B ef19729ca50003f9f34c10c172d1422fd36b1e1d89440d97e7ddb1362bcee27dd4e6a84069d7e5c508cf68d1dc71361f5561998970652e6e6513cf5f540960eb SHA512 ec24548335d7e542df19346afbdd9401bd45bf9022f3bdb1603778abbd2ae8258e39c0abe74e461e609b23c5d908b95efb8e7d7924ed4cc20e80c09aea74858e
+EBUILD k3b-21.08.1.ebuild 3446 BLAKE2B 8e87ddd907bba39b6c8ca2152561202dedc9c5770e070a7cc5e0765ee34defa054ad9cd44b3fe674d272b2263d27e6a0fd86c0833eba6599ac4fb1156b64bfa8 SHA512 271864debc95cda5c7172aacd161e38e29b21ca5346c9f10fe04354f82be1170591fa91b93c2c5b212997034dd1b98f8ecc587278578b0e388b533a3ee48d4f6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/k3b/k3b-21.08.1.ebuild b/kde-apps/k3b/k3b-21.08.1.ebuild
index a9d464b2324d..75c6a9253a39 100644
--- a/kde-apps/k3b/k3b-21.08.1.ebuild
+++ b/kde-apps/k3b/k3b-21.08.1.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 ~riscv ~x86"
 IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index a0f29074017c..688c51c7d8bb 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-21.04.3.tar.xz 629092 BLAKE2B 7e3e8ef9f123943ec1b8ec1a48d9f141495ed95a338fc528cf0cf9dd634b58a1c3ead0df1a04e8cad26883f8ca70dff3ef27fd3dd80ede5cb525afe862358451 SHA512 3db4c4d3e8e1d3b552f5f094a87d0b283e85328990f992783e93384a02cf2247a8042c8447500e1e238feb32b405f977a0bdcb5aebbd9860ea47872e9ee458a6
 DIST kalarmcal-21.08.1.tar.xz 629340 BLAKE2B 95fe11b9a6ee3c1345a3a93b9647f81d02f82607f7706bca3999ed1cd00bfdc2c97cd7ed90ed06da57df4eccaafe2f14423a2058b69c83e0089885b942c781c8 SHA512 82842d89685613c6403783050fc7db63f808e1776e832a07de1d94fe16b66a880891d69b44cba859efa3e2753a07967b1991f46e83d9d820b597b4d74b8c518a
 EBUILD kalarmcal-21.04.3.ebuild 766 BLAKE2B 59a6acd2332ce4125d169f4397f04ff52aa7b92698a144c39d6b3eec1c851ecb0cf7cd3d5275725c945d7e0e37c8d41ca6324a140cd86ffbe29031275c7bfcba SHA512 eb84a2333df402530b1267893700bba2bb4cf2fc8c198d4dcbc52a715c63575dcf75bb8e9a52013a8ea5fb9aebb4f4527d04c4ebdec290b787f194b17f9c73c7
-EBUILD kalarmcal-21.08.1.ebuild 769 BLAKE2B 733612307754c9315c2400559870b70db54b27ce43f1d62a2054d7fa0d09fa6a003223bd7bd64be5a98db0a79b7c6d1198ed9320220058fecf668259e0f9ed6a SHA512 faebcd76a68b1beca383f43ede8ad888b3982d104926b8eb8920b226e64ed66f1fc39d7cb23b7fffb216708b06139708797f54007c461a627e605b7341736fc5
+EBUILD kalarmcal-21.08.1.ebuild 776 BLAKE2B 0910d667f764bf120868c71378b43232ab0ab1a226bde45caa33ed125e310f10d66bad67c7eeae43e82275ef94fe334550c8d0679f73d3e29e1dc3a38ee8eaa0 SHA512 9318966510836967826a47e78c0e35e4b7c4f616a336820ec16fef89c399009fe9756104a5f13d29621577af0364ac9c8b89aba2919eb0a524160b66f002e920
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalarmcal/kalarmcal-21.08.1.ebuild b/kde-apps/kalarmcal/kalarmcal-21.08.1.ebuild
index 3df89d50c1c6..2d6f9bc10c13 100644
--- a/kde-apps/kalarmcal/kalarmcal-21.08.1.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index a7f40e0fca5d..b6a8aa32f1cf 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-21.04.3.tar.xz 212040 BLAKE2B ca11ae524f736af7591dbf6c54116f55ba12f0ab5fd80591a0c7b4461ffd979ca93afd9c1619d173868f0ec1a30e84389b252527370d68719f29d9b3d4dc56be SHA512 e15e703e0e3f189cf065e1709914416a0a1e51f58e512fdc816e06ec9af58c84711b33eda17883ce30074da4b5dd4b924ad402b07899ddf2491b4363bcc8ea9d
 DIST kamoso-21.08.1.tar.xz 214656 BLAKE2B 8b167bb1869a15a72237c9c918d4cf3708058585b09d8d5baa1cb15d3c6786125f1126670e850a38e6b19e146bfd893572d86d2291825678161a87eda519bde1 SHA512 592d1ec7a75a3b36e319f8c183ce8f4c5a82054b3b600f0b479a1d3b7c9d9f675c08d8f39faf071ef5f5fdb4634c779a19e77a0a33cb94a82c09b5b2a0a9b054
 EBUILD kamoso-21.04.3.ebuild 1090 BLAKE2B fc3dfb658c45a9fccaf7789cd476ba12bdef4a872c9ae99733839b01780f03b684451d2ea5536083a8ea4afcf1957cbd2a23d8be8513a96f849983ea56f24522 SHA512 736d5e3663b9bc53b42f7651d84edaa8ace4dc9d5194736a5d7215ccc077c4f594eab1d113a8430f8e49cb8c50d56539e9b724662b561598a291e797d5145b7e
-EBUILD kamoso-21.08.1.ebuild 1119 BLAKE2B 57b765dd99fe20ea142a9a38103764eb2e7acb122dfde99aaf6dc27b632d4fff526ac3d4458039b0edb8252ea0a2ae39b0e13c686fe33aeeb924b9d7758d5058 SHA512 d50d0ec96f7a316c9c86048a0e68d120d92214183f909d24ff038357a6a17a4a624039c770806cda61feda9d130895fd8ec063dc51a97dd387acadd6f2158818
+EBUILD kamoso-21.08.1.ebuild 1126 BLAKE2B 888da664f43a4c4b7c6644d27046b314b9d2e89605defef038ff4430a2d7e4b9dcab307863b3d64b295e16bfc41f76dd115795c7dcb07f974ef116ce38929242 SHA512 ec9443a27a75423110c9285dc0204c886b3699615655ddfe24c2bb6a2f80cdb9969560aad0c3be582ab8cc0fa7f6bbc5e60ff2f41653933f5aff2879e51f33ee
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kamoso/kamoso-21.08.1.ebuild b/kde-apps/kamoso/kamoso-21.08.1.ebuild
index a75cf7497f9c..b2aa349da35a 100644
--- a/kde-apps/kamoso/kamoso-21.08.1.ebuild
+++ b/kde-apps/kamoso/kamoso-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 653674
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index e49d83426441..1dc6bf907ba5 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-21.04.3.tar.xz 8039740 BLAKE2B be7b164348037e961f9780456eeffa1afbb12b526bce7aa947d41f6516dc1c31b38f5818b199b2f8a9703075123a752aad95cb01be297dab6bf6f31a91d654af SHA512 33f0d4f1f2521b057674cc1a870c014716f1acd60bbca5d0b8afdcd1353bb46af468bda307e3c6a0a8e0945997c2349c3e95408dfbae9176e87d626056b03929
 DIST kanagram-21.08.1.tar.xz 8039640 BLAKE2B 2c2506d92269d3ec54f94796d5477e0df433d4c0c162e470e8b51323c9e8782eac4310fa4d16719a0c8fcca1440cfa0ee6ce1fd350bbc9698fedaf8645e55088 SHA512 a1b217218e76c57971a6d30a78bdc32961ee305db9910ce820cb2766bfc3cc3b7601d0426ff343df1b6b7a21ca8ead9537b953166ebd0476128a42b86d951fe8
 EBUILD kanagram-21.04.3.ebuild 1223 BLAKE2B 4c805497a49270b615b72324e36185a2a9113cdf8790a30ca0aae9e74c6d52a98f3659c4467f3dae32529e787e74fc507b94f923d1a3c3b0e62c9040076c7933 SHA512 f3cff4f250ca700417e3afdfe98ed50ddbe840a64c013fcee268aeeb7d832ae6d913832c5382bf4fc03d0715a51d55ae591c5dabb7fcbcb747769dce91cb1bae
-EBUILD kanagram-21.08.1.ebuild 1226 BLAKE2B d946849ed9fa1c3af9f8fdb553cb78a09559903fe409a044a6fcd080bac207ec09e3fb9771deb675f8f3401465c7e6801cdeccf076e64b9d56a5eccbbef89cdb SHA512 c6660399962e1ee2e6c29f54ad8e7cf342fd86554da6d7238b0fd6aaab44d792b9bc7333bf49bfd7d2617a78db23789745eaaa88c9416083ffd1d2dc4a1af0fa
+EBUILD kanagram-21.08.1.ebuild 1233 BLAKE2B 2fd0433dc747d9ee74272f7f04d459ce06c8e5c3d92fe5360be9859286f77c316092caad5bf3b0980cfff70990c9ae4cebcb387d254a619994d3a3a1cb0e76e8 SHA512 80e727b5fb129d8d805025de12bba54e9c772bfec72726391ca72e35827c8caeecd48bf8c0c789239fdafa8d7e1c507b6da7afa4817669dce43da40ee5bf3bcc
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kanagram/kanagram-21.08.1.ebuild b/kde-apps/kanagram/kanagram-21.08.1.ebuild
index 54b5f8a562e6..d7b01cca65d3 100644
--- a/kde-apps/kanagram/kanagram-21.08.1.ebuild
+++ b/kde-apps/kanagram/kanagram-21.08.1.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 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 28cb5bdd9ebe..d9e77ab64f08 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-21.04.3.tar.xz 334000 BLAKE2B dee8618b3e4e6968c1f1a243355a3f20abd82d20d31b0b9750b0515535dbcdf3823d32332febac00989efc27a27290d5dc235f67c36662287a3ed1d157a17377 SHA512 15a5a8b143ac58300f9f01ca0c37889ab6498b214fdd77c8aa50743015e6ce40f93578b0eb1cbef39fed8505851db2a170eb8f3850a126a2c38a8e4f49984ad2
 DIST kapptemplate-21.08.1.tar.xz 334008 BLAKE2B 5c1c971eeeaa110e6215d3e0dcbe4480f957356ea64e7ab903765dfc7c8d1cb8f04ab43e737a04a793c5932963ccbc5ba8c4178263a65b80f8ae4ce955f777c8 SHA512 3327a1e3e43be6235ede51665071e47caf6307ca2271a2f356817db57c7891b6aa984bc6727c9e1f23e27d82f4c5a5d2b282df58731f39b9f8fadd997fc5b8f8
 EBUILD kapptemplate-21.04.3.ebuild 827 BLAKE2B e45a98ce1b2042b415789ffd86c4871a1abee86da8d3789a6849e9c14023744cb43281c37e83e9395100bbeddad84cab80c618a3a8ec967075854edf6b315024 SHA512 90185ce4a04ffa91fd04f0a6c89759dbf12a1baa2db2b6007352d0323c2020c8a54587f4786b2c179db3b5520aacadd05951d09a449b7e8640d7cf47bf244e8e
-EBUILD kapptemplate-21.08.1.ebuild 830 BLAKE2B 97e749af5bedff23b3115340f5f60a6584cc327b83aa3067cb4e271b67ab8b70bf555609cf5cdacbbb85dda4272ceb87302313214cb9352141861e21c81406e8 SHA512 d7b94e4ebe279a86ee295abc9db77dddc003d6d6dc815e0f3308fb551101f9e4e71dd15aaa21e6b573a7306c56b4c5568bcde4d591337d66983635826978923a
+EBUILD kapptemplate-21.08.1.ebuild 837 BLAKE2B 832c77b99abe30d4dd129d06cbd4606cb80d8a591d2e405cb8dd4979af72cc4c425d39291975050dd7dbb2bf0bf7775d74c5b643988e7fa3c1a75a72e12c2edf SHA512 6ea52124e24a07dc43431815f52fe3c9471eeecfce0183d2e9087e1a48407dc62860eba4dd69381cc4a0668fcf7c0c12f79c3bec8f9512d3ac404563b873d86b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kapptemplate/kapptemplate-21.08.1.ebuild b/kde-apps/kapptemplate/kapptemplate-21.08.1.ebuild
index b9d1c0ce9f6a..d11122bb8c6a 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.08.1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index c033e8729dea..4bafc402f6f2 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-21.04.3.tar.xz 383704 BLAKE2B 15dc6890fa5fdcc9400906eeacc3abe43e15c2293c0dbcd0b94ee74cfd93a0befaf699f3a66688c324fa0a865d377a261314a31653d3272904e9628a203089c2 SHA512 749c7611806ec78542cf1f6b56229121d584ef492646fce7a3d50b85024520701e9b61a08b56b3979326bfe823130665552d79ef01dc3c2b95138a6fdb49e8dd
 DIST kbackup-21.08.1.tar.xz 388864 BLAKE2B f8e8030c54667c24aeb3b4bac7a1722f3570d6c1e168cf93afac5487969be8d7800c3aba835248004042c7fa8bef393bafb0ce1b143b545166eb919d1eedb9f5 SHA512 e556498174c7cbfd5ef264f5b2cfe3abd3c81bf7e65a8d670ea2ae405847b3f9edf04d9510d5a6c1cb025b2c5bc3392050d79fbe7cca548c3e96c90b5ceef0cd
 EBUILD kbackup-21.04.3.ebuild 930 BLAKE2B 5460eeef7fdaba5597dbf627328aefcf7383f482f5ad6f41887aa6a73116ff62484fd44302f5c297ca7cc5e51ced85938178df9aab9216d85544a66f81a8171c SHA512 1b9d2bea8fbe7b30c33a22ccb46f83d50e5f936b595c709c4f2ea9ce988c466642abbc832a7894bfa3cf3c4c68daec486134715fbb7b45a83a04bb6021b1ff3c
-EBUILD kbackup-21.08.1.ebuild 973 BLAKE2B 9b27a9ebe3b15f63749dc627cdd68fe59ae511e02f96ee699ecb668f87339cd6c269e947cfdfd385da4eca22e190f3347d296b918193163646ff3d68e55e4221 SHA512 777c00b42f6933268d164d5983708c525a6c33873b55fa2907d2388eef4c3a36208dd4b78ffa34eb1b78f1370da52754cd2b0d0f724e8cd3fb2c4c56db608c29
+EBUILD kbackup-21.08.1.ebuild 980 BLAKE2B fa489f2e13edb0ea7ac5600ce0619f292b5e16e6bf914991cdcc90cee601867f3a28abad368a31de91ebba42e9dc5fb0cccf4cd8c2ad3c42cc29e95c68a1036d SHA512 1a6533cd26422d6c52994310f991378a11566b4cb6d23759d4b048a3f20123eb08173b3b25a70436ef2d3693ad76b1672bd77d34e91f4a18c33c14d93c7e20a9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbackup/kbackup-21.08.1.ebuild b/kde-apps/kbackup/kbackup-21.08.1.ebuild
index 37ed32d9815c..186cd4bd0082 100644
--- a/kde-apps/kbackup/kbackup-21.08.1.ebuild
+++ b/kde-apps/kbackup/kbackup-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 396d9be035b6..21094bc3ddfa 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-21.04.3.tar.xz 5627384 BLAKE2B 1c87c0efcdadca11e7e56e7b4dd6d5c43fa8fd98ff70e5b8076a32f8d5e4e595d1d966c1303ec91d427f1286e4dbb65b17911db4dcdf96be7caa7548c7d6ca49 SHA512 9e7b9ed8314554f6decf184606d334de87f472532ec7e44d296316884f112382b1f7eb49de275c83dab51048d7211f337b0718cea91fda5df6a1f43aaf0ab09d
 DIST kbruch-21.08.1.tar.xz 5628120 BLAKE2B c452b03da58e669fcf47501b6576fe39abd5275d96cba722fc0b898d2830eadf1020d56cabc96271e5a837ed82075cc5e3cac191a5b09a8686fc923eb1c681ff SHA512 0feb2e6499228fb462971926e616dc7e9e626c4fab62072ff50c61c4e714cedc5df644d2481aefa466a8a9cb0ea360d75fe9b0fa02e275cccd5a9d8129a89fa8
 EBUILD kbruch-21.04.3.ebuild 734 BLAKE2B 71502fa13fa6c57425da514c0d73af02aec05418920e7c7d631f27cfe833ea7950c783d2b648564563431d962602a33c21f8caf7b2b0d6aa753980122f73e3af SHA512 59ab97ad625832f367c568375fb8c35f2779ea7a500337787e3c5d73fb09f0e914ca4deb40105a1d89f4755d7eb5395a433103eb5ed38344ad28c3f6c3f74706
-EBUILD kbruch-21.08.1.ebuild 737 BLAKE2B 6eb1b48141874dbc3e2ec86204b8d71a72645b3da84a4073d4d1e30398a54c651dd733340a0fe1207db33b0b7b6c62c8b07d241f581b8280ca0a8390a0b0db1f SHA512 c2f939599d38ae10a0fa8f846be843795e808e92f4b94f15cb9f68ad67450d3707ad021b01e3c14ef1348ed87c895bad7fa39896b31701e39a903a493ecdf170
+EBUILD kbruch-21.08.1.ebuild 744 BLAKE2B d4da0d99d4d12a344d7be6992ff239da085c81d9c3555b66283f847e731338d009487de0bf73d7bf146309b01f5ee95bc6d30a8977d4332910b808ed33f4f823 SHA512 8310a431adc7c11ccbf5fd8e1d567be021a57aa5fd42098ce392e571f94dc42d8e3ddb995546daf9db86002a9b0ca6515e986aedd525dd6094a115682b150ef9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbruch/kbruch-21.08.1.ebuild b/kde-apps/kbruch/kbruch-21.08.1.ebuild
index 53d6f48ceb06..ac9fb7867cb4 100644
--- a/kde-apps/kbruch/kbruch-21.08.1.ebuild
+++ b/kde-apps/kbruch/kbruch-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index f95fa5b1dd90..a1ae9061c8b2 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-21.04.3.tar.xz 854044 BLAKE2B 5453bf99c11740f6cfe90f4c0051613aebf1fff832b492800ef9c2e21fefd86c8a8becd2e91d2e82a3a56e1e88450b5f9498dd85c73ceed53d49de00efc9ad95 SHA512 b2823ef28686e4e3f25a0b45d163be55899297ec3115a6c984e361c859eb94d537102add9f630abe5182eec097747355cdf259b7eb1ab9de644414cf7dad92c1
 DIST kcachegrind-21.08.1.tar.xz 854804 BLAKE2B 2612228aa820c3191f77836948132792c088242361c7a9e157814872afa0104c88d97f89fe44756cb0b3c810f1d155805595efca6d43b2fa8a4182bfd13e3bf2 SHA512 792aec8f42feadf45e976a196283d6feb8344fb1ce428876373ddbc70f85e80b9ea04bbde08ef8f15606753d57e9b0ffe24c1b6aeca31e9269e07fc42d25229b
 EBUILD kcachegrind-21.04.3.ebuild 975 BLAKE2B cebe4e0f58e6c99b46be5e885df0683948cda5667da8088068eef312b1c84ce1363df3c84d2579ed64b07c90c7a65e5fb037dee9a8cd37de2d7c366334b8a798 SHA512 df7d8a09b6647b86f6f84dc834e0072cf85e9eafb86a2034db5907c29e628d36c4300e51149b0a65777ad49674a6e4542cc2fc840df5f039ba8b385eb0938197
-EBUILD kcachegrind-21.08.1.ebuild 978 BLAKE2B e6ae87259a473fa6e90cecd3127dea7c617dfc05f628c352ba54c0f575238e168eaafc232bcbd6251007aea29d650f3e71b8ff77c445b23862887014e758bb11 SHA512 ec6ba31e528df4a678344f98814293511a3b44724eb54afd353f2c79e050bd51a23284b39acc0dda78dd990cd4322b9db3e10a783ad3278d32ca45104deaeda7
+EBUILD kcachegrind-21.08.1.ebuild 985 BLAKE2B 2c0ccb13009199b1c887e425e40ad8a440db4e61bf2ed769e11af1535c1326a8910281166b61a02ba1381786a19d5c0c95ee5e9af323d4e264c46cbecc100898 SHA512 d1c314f422c668d0e58ffa203a9c4e06e84a83152fa4a99ed7cb7356895b3b5cdfcd76d5a4836828f2ed4e13c49cf1dc25c4bb2e14050a7c330b8b0d44e099b3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcachegrind/kcachegrind-21.08.1.ebuild b/kde-apps/kcachegrind/kcachegrind-21.08.1.ebuild
index a4ea7e672843..b0a90a53f169 100644
--- a/kde-apps/kcachegrind/kcachegrind-21.08.1.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-21.08.1.ebuild
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 7f44b22f0404..345af4940c09 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-21.04.3.tar.xz 372240 BLAKE2B c7fc9a7bc0092dfbd2177bac52599ec01bbed56a6e428528ccfee0c5ecd6a6bd83e1d18496c96fd79a6e10d5a449186353fcea71aa900c6d97be475588da8d46 SHA512 5a5cf142d2a54a4a587a19fae65b93e08e356d352c0dee477e9258a730b659baeca956b47d59001822f0ef3bb3ff3e127135f61ee0a1b9edabb07fc2457f5f3f
 DIST kcalc-21.08.1.tar.xz 379396 BLAKE2B 440c0d48cb5e495677eb053f156e1b78ec0709f49b3c82d9d91aaa274a988cd9261a08cb505403f46f1cadc24c018a6e0f339316fb32c91af39c3bed96975b14 SHA512 88d02c29f086a52043d5b952096ef9c70c5aef0be7b662b4da911c36aa195639672b22dd8ee1ea52ebd0ad1c07a13aa8706faf729c883739a9b8fa956c0be1ae
 EBUILD kcalc-21.04.3.ebuild 969 BLAKE2B a78ef1319e6bc2a5588aec7520a5c8280fc969620f46705c786dae02aeca7a5b7bf08dde8356b102a0a64ecc431a7c543144dd3e8ea73cb4c041cd0e8ccd4b36 SHA512 f30f6c765e979e84cbb676db8ceb90c1edd9405efd598a1c088aedbc35c1db14386d72ee6d5d6168e9e995ee8c12c3cae2e2386f62c85b67f806fad1e7204a14
-EBUILD kcalc-21.08.1.ebuild 929 BLAKE2B 5322424ea14cf7d775a9c5087cf925e0dd78d8b852f9f739d92bf48096037356e65f1490d83179a68d69ff45b7ef7891d621bf6e15e5cf572f1ca18e5447bc35 SHA512 904adfd25064f869c2972c0c5eb7d785c30c0407cbfb8d10c677a5b6121bcdd1ca7e0a37ef81e3b0c8973f21be9f199736c4fb65b4bf4cdf1bd0ec5c5019e4b7
+EBUILD kcalc-21.08.1.ebuild 936 BLAKE2B d585af7cc65dac08ca3a4eb62a5585e1deb9884222371b42b22c80000fe12d98e3eb7511818e086b153354b03048af56bc6cc643004747a545c2e7a520dca353 SHA512 5959cebff94e8e73395a898a56e7dcdf916c9b4208b4811b7c47be57ac6b67d973af2c22a3813d9c8da3cdfc7a01e4e8f916078662f776ccf7095933f5d530f1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalc/kcalc-21.08.1.ebuild b/kde-apps/kcalc/kcalc-21.08.1.ebuild
index ff4867ee18c2..207c407ea47d 100644
--- a/kde-apps/kcalc/kcalc-21.08.1.ebuild
+++ b/kde-apps/kcalc/kcalc-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 034c934a6206..de1c12377506 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-21.04.3.tar.xz 334160 BLAKE2B 76d4c74d0374a1d4d82385a433d246d935bd25b83e142984383f402290bfc026782ead1d2e353e85e0fe55c7967cda7a80397240ce5960d138d806764b41f0af SHA512 0f0cd2112fd014cf824b0c419d952c7e6b41910307d0f6abf9c121029e6754b903b773f92a5d3405344ad58d9fc1fa7fcddcbf4b58aa02e07797b2ee1726aecd
 DIST kcalutils-21.08.1.tar.xz 337700 BLAKE2B b89bb0819115af00e142fb73e653f8d5c638540e2f2ae744f469e8023c265dd9e776cf83ee097ea443e8a2b8e7316f1fe54faac16fcec6e41c0c702ecd34e1c8 SHA512 51d1277edff36205a2cbf4f205ab62b9160e355fc4cb896c61673bbb9c8694c3f60c6e8edc1636f1864abea24a0b96e7f9adb441590b2701ac8bcec628e82a8e
 EBUILD kcalutils-21.04.3.ebuild 974 BLAKE2B 4563c7d786b2280694a3ceba3cdedcfa333b628ccc6aa82c3c1b991ef3dee381ac201d81e79b4107309e977f1ecf1bcbcb8b66da14cb93a2e1ad4a260ae6b710 SHA512 80ea70c248ed9d7ac2d3fdf10e43533fc1b700d54219dfed61f3c3c48df7e0c78a813ce3c2b1cc2c69fe52ddec1b2902f61b8345e1fd8017fee2c09e25b9bbe7
-EBUILD kcalutils-21.08.1.ebuild 975 BLAKE2B a1d3f16625d4983f63343e1ad0630aadb0a63f1bd2ce17be0fa755e5327a288958aa2e00e765b014802983a2a6f4e3b2b2f76c0fc9bf9a56d8d4c38634073fc6 SHA512 8f9f89c62123fe476f00c52b88c2f95a0a2a271ca697af36daa3566a589d352de24416bbc2312f92801c7eeca8f6c2184a8498e1a2a31db934c5e875b0c1bd76
+EBUILD kcalutils-21.08.1.ebuild 982 BLAKE2B 73d8abe68cf7f6be6b703b7e7bfb53df3f9502ab12ae1702357bda792ef4939038a80280de5056f060365c7fde8c8360ba2043bca952a2789e78f48dac2cece3 SHA512 e47f2815f86019cfa6bd6924e7ceaae96412b144fc0ee7ec552689e1d0bc43b919c47faa785218171a0c176aaeb87f2336e5e1b19a0b3e75267d3424c1485a7c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalutils/kcalutils-21.08.1.ebuild b/kde-apps/kcalutils/kcalutils-21.08.1.ebuild
index ad69a97c3dda..d1a55321e66d 100644
--- a/kde-apps/kcalutils/kcalutils-21.08.1.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 9d5b8941a8b0..a81b5c65b4cf 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-21.04.3.tar.xz 368456 BLAKE2B 4a3126a3e5a1383fc2c247fb6b308cbb1e1182d28f01951b60c2e6a03de3ef53fde8c4da4d057b77bb356bbd8af567bfe7706c8ad9e3869fd0618c74cfd2876d SHA512 fbd94b178133cf66fd57894147cd13a3cb48d1894c65330f94c661d52c51444b19f4e24d7649f484763ba5428105eacc7f83d48b56fe18d04ad26fcc0448e219
 DIST kcharselect-21.08.1.tar.xz 369272 BLAKE2B 4910b9b57f14cf31a4c6283580f306d3971d89dbaf4e8f1ad9db58466b822395ed38d32140a9b9a86e4d65e6e7b06116a1daef33dfdf9c527137cb046a8f01f8 SHA512 7a3f64715b35d368327289832b3ceedc517c0287367aef99341c026d064d58c2167fbbe006ffe40dcbf2a775f138d2cfa98ce472e2999f0912a6d254106185ff
 EBUILD kcharselect-21.04.3.ebuild 774 BLAKE2B 0a75d30a70c282889543d20e106e80c73fa2a21037d7cc780a2deae59a1efe3100902c25d50f70edeb35f3370026f6223e625a6d79f2c2c4e177d1ecac1046b5 SHA512 f390c4bfa2b6dd9c71be13ba9308e273134feca0ed4762c14a2345c26c0ee1d0e052856daec9888a47b32637402d1ae7ac3badc7355b9429b63ab4992a508f16
-EBUILD kcharselect-21.08.1.ebuild 777 BLAKE2B 522afee1806b66471a2ad075507ef64249a5b3815dcd4630d7cc928fda1b49d82eed94c3e878dbdf6f8be3836ffc1cdf671e23c2b0dee693515db83e3aba97bc SHA512 49a2cd746fc961a36401c04d06837bd51fefa529254e3f2f37c9ed497b71d280327a270af5c57b8db276a5e8299dc818745f62732389b582c7334d27500d1580
+EBUILD kcharselect-21.08.1.ebuild 784 BLAKE2B 89aec9b077a7693b320d04d72e11b2be75bde8f3f327d053477918a913ac93028a774b4ce725d6c9a1c13f2d568947f9e432606d33ebedccb3bef6c39d3cb149 SHA512 2bbc38293dda0b443ba2ad54c71f418415165bcfab5546dd6b813f4367c7762d48d0b8ed81853baa82bc05de6db862f8a5f15a85b61b5301afbc2cbfeb5188a3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcharselect/kcharselect-21.08.1.ebuild b/kde-apps/kcharselect/kcharselect-21.08.1.ebuild
index bc3fdc86e872..7c7a4d7b53db 100644
--- a/kde-apps/kcharselect/kcharselect-21.08.1.ebuild
+++ b/kde-apps/kcharselect/kcharselect-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index daccae151d73..7f9f08a4aab1 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-21.04.3.tar.xz 28776 BLAKE2B 26186c4fc2f3af8f68916871e58235a3abde288de200cfd0e8802bfa7ebeffdf9f74e25415272bf88e54aea559527c03c6f2cb9ff1bfa9302ed04ea136322717 SHA512 3d56a4640e3c5dbfd1870b5cdcd16794ae3a4d0553af69f79ff8d3a2c205512cde388cff9db5006152fe579c43aa25a7fc51eccc7aa0794f8ff45c95fd94c208
 DIST kcolorchooser-21.08.1.tar.xz 29540 BLAKE2B 5ed4be69f556aa5b4582571a365273efddce5b14502ac056c8948b4a535c9ec3eccaca30a94a6e5c8a4994109d844395f63e2226ab69ae8bf24361fb1676e03e SHA512 8a47fb2ccef89d336691a58c04b2a88b0e23503968cdeb08301a0e3731de0dd286b379d7e034992a9f67e28d667d6a1a3a8a31612a3862c0188e9a45c1acf04d
 EBUILD kcolorchooser-21.04.3.ebuild 516 BLAKE2B b91b71ec01ae7ac2ef9104d0aa865e4b5618db4fcfe776f9d58d78504e583c3a0d9d26dbb4df49046f36e8fed6e66f530b52ecae82f0ebb030112417d11ded1d SHA512 031f1bd1ce41deb69dfbcdb47839d07d713dfe974c8e5067abb30f697025e2e5d4e64e01d3e1c73123b4dab52913b01e7eb8267342c7df1f0d97009eda172392
-EBUILD kcolorchooser-21.08.1.ebuild 519 BLAKE2B 25a05d4ed1d5492fab97789abb39d58fcccab375c2b8641b329d3ea3211d433694eb80ecad5e4e3c797bdf5c8750fee4ba6ea108515f135cc65e9e0115beaf80 SHA512 b5bf31e3c5d756c6ca36335ef048987f7f4ec631818b67c0d1685d4873f81061b8ca3b2e5c845c2f9977c6f5131bbb2773795e19c41fd81052e2bec7620b6862
+EBUILD kcolorchooser-21.08.1.ebuild 526 BLAKE2B e94bc82bde42a0843b9dcc504943b3e51b9232a91f7b9bc2cd1a37f3a9f16f728649555cd9862172426858ac5d006a952c04bd7fb379aac959a1915a14b4be51 SHA512 6c61b011df4124f49ce7396cea7c8162bf7554a5ba20b6f6da7c8a9a3f75f46f73e430cb7faea2a6c9188abf930c1dc7daf466c16aef05119752c94a6d0f0534
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcolorchooser/kcolorchooser-21.08.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.08.1.ebuild
index 41bf1c2cfa8f..877d788d4266 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-21.08.1.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-21.08.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 27ef4f95d571..2e5414c88663 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-21.04.3.tar.xz 366364 BLAKE2B 27726f6fbc727d2f42fa5ad7f3c6bc7eebcdc0db825c7a0723b00082eb3d6a153f1d894393268a90392d8edc6afd80e86cd8e802480a5828b95ca53528a4a704 SHA512 dd35c0b79b7ab6f4dff36b91281a3e4dcd4b5d27d1de5b33d3c4db995dbc909a6d70897f2460659efab74097b95e3ebb1c2c0f08ece07a6fdc5bdba87fdef93f
 DIST kde-dev-scripts-21.08.1.tar.xz 366204 BLAKE2B 8380625439762ee15513eba833470acfb531577d7cc2c549efbdb76861e840dd832d110d72b6aa6f7c5d05d95c8adca67f1b21cd817faaa210ea8a9f6bc7e27a SHA512 5dd399ec5f6810406dbacae99308f46cf0a3abb131546306490f879c2e5699d2507d30abcde0a63cdb7a595ac5b076b5e7e8665bf023c0835485c47b1965cc40
 EBUILD kde-dev-scripts-21.04.3.ebuild 633 BLAKE2B 67b448190778b2e6266fbfa6fe2bcfa78018d7e97218c754fdfcba1abf00cdfe1095ef67a8b3a9c0091641218844d9bbdf16db4c1f48dc4cfd628eb97d42b7af SHA512 6f96d6e54446be65fb937c86b83171d56d5bdc199bc1f0bb08c35932beae5e9d386bff078185998a06f3ce17b91e14d7cba11179a6940758235bf09ec0c221ae
-EBUILD kde-dev-scripts-21.08.1.ebuild 636 BLAKE2B 0addc3dab13a6d8dc46f4e286abc8bbf1a5316067abaf91c47bf7ddfddc32f16de1cc34b3027dc9140ce5f1698cc92402b8dc7ed1caf172b5a8a9f9b17fe048b SHA512 cbd3d9ca151f7b36c20468afa5706b1fe44ebf30a1ea2a72dd6553ae55de6acc65835ab08cf920aa95196a9d5fca1440acf674cc1eba590119ae07e438f04df6
+EBUILD kde-dev-scripts-21.08.1.ebuild 643 BLAKE2B 38cab1e7612668637bed3d31770076b245665ae43463165050f4552d09bfec2d610ff8e66d96da97c7c82391ac1bfd70fd53607852be7c2509c970307b313ca2 SHA512 2d5a71df75a14ecd9541221dc6943db6492f31fc76fe8a15acca71fc89199208e01ae942f71184480370f7a7a01acf9c28a15080d26cf2e3b931ff127772e0b5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.1.ebuild
index 356a5ab5f9ee..cecac9391e53 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.1.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index d30916ce9805..cb708438d0ad 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-21.04.3.tar.xz 68048 BLAKE2B f8b2775d21f227b5c2c48e8fdb38a1e78064dfc4237ed2dab72fb9a7c29a073d34db61ac74c82617f5b9ae08ee4b7aa6b763b2183ecb5d95015a4f6989700e76 SHA512 5cc7fdf44779852bed67d7321d6a4918dd1973dd9868fe1c4cf0c275a0ae06c21fa388f027a0b15b0839be1c9d482f78db06c96285366a0530f58901353572c6
 DIST kde-dev-utils-21.08.1.tar.xz 68656 BLAKE2B 4558428b73b7dfed796cca14e42cc2f2a2150f796b21443d081e8dc466511fdf34f226e728dc903733a4e5858aec13b46a7cf0b22346f2ee8c80bebd72f4b2d6 SHA512 92536ac2dd2615625b7aaaf90f049f619709cbe5be84d5c0b1ad0af116fba76b34eb1aa7a73f1a4067d4720849e76e840889e03b75caae63dd4f9f953d1305c9
 EBUILD kde-dev-utils-21.04.3.ebuild 730 BLAKE2B abd601063b36d7e3029853c935cce648f4b727ed7f16a54b7c723c2149d01b415064c5564838b2c5306c00c27f23a16266619505712b32cd7d02dca60368bec9 SHA512 c906278b32f88220cfe84f889ca7565f94ed21a9ea51cc124b2c64b3e302e1614e09a189d723b08f94c0d9a35dc28d0b2c4698b82bed71451014aa5a4180e6fb
-EBUILD kde-dev-utils-21.08.1.ebuild 733 BLAKE2B b67d12459debc80c2532edb34f4d8543d89dd04252b014536372b012b33ac3a5aae54d07e66ac1d39f0e8332914cfe8868fbe39e29fc68908f06a6d5ee93c391 SHA512 1f66689583a34e8a7c4fea78cb2ad6a660189e7a7e0d1ecfbb8d47e6b03390d08856b7c851aadd1ea0172b5584147523f7e6b5734bef92b5564186bee518b13c
+EBUILD kde-dev-utils-21.08.1.ebuild 740 BLAKE2B ceeed7547f65199a56926d6602332fb9091bbdc67902e37219b1ae2dff544ebc3c7ae7b082ce6b8f5d91bf53c1f82262d75b21d64c1d34c12d756daba12e84c7 SHA512 d50c641f223247a99d46da36dddd3d8208410e6de29f48bc3b4f2f900a0fa46354f90085625ce46ebadfd57b0d34e27e03d40adb2eb18c98d1ab53d4ff68c124
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-21.08.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.08.1.ebuild
index d1ff85aa26a8..0c475025395c 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-21.08.1.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-21.08.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 01aa70c4e032..6ddac7d1a6c9 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-21.04.3.tar.xz 335780 BLAKE2B b6ed4e4c221df442154121a87f3208f46050bc9d3013916f4cb6a2b17cb176a6ab607e5558c0375e55877ad653087772d7c9ba6f92dd44901223c75e085a54ec SHA512 987c5d65be467837e458d5d74540ff6ec2d6a47f59043d7a41517642deda5c4645b76ae9cbf8d5f299841b13e4034aedf9ef9afe30b2453e782a6056656885fc
 DIST kdeedu-data-21.08.1.tar.xz 335620 BLAKE2B aff59485d129cc4499bb453ac024a99e7e715710f4c130626933f0d27d1b0fcd3dfec72bbcfbdfd56ac9a64fbbec26c487e7ba5e3af5794c5df46d46f3e76060 SHA512 254346cc27db337337a55e669997c750a937af02945ccd91b8d9a4c3cde2f5295185956fb10fdd7c2830781bb95795b1b95c01fed83d427f3a4a4fa064cd3373
 EBUILD kdeedu-data-21.04.3.ebuild 345 BLAKE2B 316a4a729327f22630b07b69ea3fdcbfd79d379ac7b839572c3c2b9c51b578c61c2fc42dab521cae492a3fbdb7f3968c75a745174a7c54505ca10209093f6165 SHA512 abb4b66376f439d879d02a6b9b19b84a800b8c9e4c866730d7c325d8ba4f124b4068ad7e1df0ae432a24686b9e6defad3d16e004e65a60ec04cd0c17b92ea3af
-EBUILD kdeedu-data-21.08.1.ebuild 348 BLAKE2B dc1a01e6f673434577ff507678c1752223c48306dbdefcdf2df7bd0ee9b4f5f02a53629ff8d06503e8e4553d2508b5c78d67c0f2db18f8a202b2488286b099e3 SHA512 1317bf76362684d867e8ef8f3b0f13639e7e30ecc54539855b020c0e5d2430c9a08c240934c178ba432841c86629128ab6cb36853c87e515eac3eb596eb0b37c
+EBUILD kdeedu-data-21.08.1.ebuild 355 BLAKE2B dfe87f8c2d979a421c8fa5c282638e3f0451f634ae110e3be2959b28472ec421f88f616a91abc6a0e02599ea3fb071db57c714d7b7652502e100f86575480fa1 SHA512 39a9b576666e341a4bba42c5124769e10da4b8e7c851027dcd672c4005565fc916141b0c37d81543bc08cf605e9e2b3c7f87dd92a87be4d69224203f4b92c3c0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdeedu-data/kdeedu-data-21.08.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.08.1.ebuild
index 679d982f95f4..184c5419aadb 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-21.08.1.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 4c938e176a57..9f1d6e9f9ee2 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -4,8 +4,7 @@ AUX konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.
 AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e
 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 DIST konsole-21.08.1.tar.xz 1374720 BLAKE2B b686def9a04b92b7de71d47fa16f0c1172baf6304dff6b0fcb3ebb11276190b1294ee77bc4245494f874bf39e33f39b5f791d96b8ea6150987ef1fb373b10f47 SHA512 ebac48f71bde793e39fc2f3c0dc39f8fc24e6f9ba8447988ee793ef33154bcbc7f97dfe863b708acc85c472e424c4190625fc8139417f4a98520c4c9a903903d
-EBUILD konsole-21.04.3-r3.ebuild 2043 BLAKE2B 678772cfa9534224af8933a8f00e215f05e7c24677ee4df2f747e77289b25a8f10710ace4904b8fc14b39a2ac383c3939b91dd3a8c62b8464e3d4c69122b5284 SHA512 fc01e7d0efbf1256c679101339f364ca3dcbc7db98f4d60bf41ae6a693367613a9570b677da7354dbbb208c3cb9af66f5e36c4422f25681a244fe9d36fc1e814
-EBUILD konsole-21.04.3-r4.ebuild 2123 BLAKE2B 3729dd83460e0e05f9640084b677f1d27c07e4f95b835fe5424545aa3eca1df38d673e227d7809a684af7e6e4442ded598711a88b433dc67164049c51741bdd6 SHA512 83d96897a10dd5907fa981e2dfc86f638cbd2acddff5b356574ea98463486e801674175b4832c9e7a6100dce5c6f494d08d1257e0ae742267159291687a348af
+EBUILD konsole-21.04.3-r4.ebuild 2121 BLAKE2B f80e85ff25f9af9427d11c4a4bbe897f26dd0c05255343f819150550ca92a9f74f78f67248479eee77b498a4443b6897657e3e5f554a01b5f3640eb7dd0adbc0 SHA512 37438811f7283834b7256de430e3b2e6c3a1ce59283ef512e586cd876869a8b482fb7e42cdc6b3ac2165b5308932fc0644ef0a637513132cae9248c8496b65de
 EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991
 EBUILD konsole-21.08.1-r1.ebuild 1800 BLAKE2B b377c0b18a1118c473cba3927a0b601d932b31f8176f56284ae9f8def5a160224098a33976b3e6a767ba98f282011289868764c5e4cfc410161a07994478b461 SHA512 065684dda647050f87d7207791676f9f5dbefa61d3eba3a286277635835e7f164c3f80fc0bd430b4c9e6c983e02cfbdf7f7a6fc3f98f74a39ac015eb8136ddf8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/konsole/konsole-21.04.3-r3.ebuild b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
deleted file mode 100644
index 8ebbdcdf1dd7..000000000000
--- a/kde-apps/konsole/konsole-21.04.3-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
-	"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
-	"${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
index c44e2eb15d3b..0a2128895e36 100644
--- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r4.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/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 390962cd0f1f..b99edb501921 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-21.04.3.tar.xz 217404 BLAKE2B 5751b9c6ed0cb7242d4a3494b3746c5c02bbafa5c63338c7ff6395e58d8eae5035687b3690e28ff34b9642c43280229c0012f24c5a60a3799d4770e1dff45bcb SHA512 24362a485cbd4348a40b2d96c51756ce7f962ab7e3c156d68fe1026f83e70a23f6c52907fc10a4bd74d4eac0ff7f2a9163bc03139d820a61c142e40855ff31b3
 DIST libkeduvocdocument-21.08.1.tar.xz 217708 BLAKE2B 1877a1c9e30f0dd9933497612d9fd0365a5f639407756b53725b8b8327fe53424d364fa1e1a6dfeb3b8e7c3b8c3cec647c799ad6d96b08ddaafacea6f64aeba9 SHA512 ee0f952115920e1a752d935c3ea9c056ef6d86465d95c67fc6db130ded6309edfc07dabd291048562bda6427447c9ceb3a4fc2e6f2d8fd2ca9754eb47c6d3f14
 EBUILD libkeduvocdocument-21.04.3.ebuild 505 BLAKE2B c00e867ef1f4fac957f459618fa2557c4376dd2f5826d434b2aaee9db10f51a86c9c2cf44df2025f9450e1e83052a0fb2765dd81085a4e383666d777dcb46e38 SHA512 78619833ee68cffe5e1dfa20eb90c61e1c2be673b5b2354f4228bd713c07910edb8ba3ed8fd84f8390d349c3b7c0142b432993fcca6ffb9ec4dbe08e5bbfad29
-EBUILD libkeduvocdocument-21.08.1.ebuild 508 BLAKE2B 231e43b5663b9b124324ee9f6c807c7b1873e5ea9a607256d1c97db1b8c579e700bc7284ca4f1bf4359b14668409a68c3004daf040d667660c53ef3177621875 SHA512 d64eac87d8909bde227bb38cddffca5ec80972b12078f34ee80814bebc5ed93cfc4cf0d67f99a57b93fe065fc39ba3022e928e95b209fbae442ad9b79fe78b66
+EBUILD libkeduvocdocument-21.08.1.ebuild 515 BLAKE2B bdbed2b3678e13c0f88c7446276d782355e8619730bf144c7d89a164bd5059c79687e3764219e2bbd2ad83737d531985be76f5d2b2cea59c83c7f1bbe282c712 SHA512 d349202162523c8f7fa798e302e2c47be37eb4d7ca53790d2cdab9cfa3c4c64c0a781fe7d86675af04f355ad63af7d9d49242ef8ba9d8f568312797678cc120c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.1.ebuild
index 1d626adde097..c4de40cb9646 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.1.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.1.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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 9f4bae887237..5f7314bc0180 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index a7a5e36de3d1..865da670db8c 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalendarcore-5.85.0.tar.xz 258044 BLAKE2B 469af118c30c5fa685625271fea5490a2d13b611541787e1998c5434bbea1a30fa283b9fb9cf60cbde75d9e7fe2ce9511ee9f81613c2675b09d594b72e3158e5 SHA512 91d37a49bcaace1c7717b1ea0e710b13f1e56edfbb0db2b7c012e7b86e0a4437466289a6770c745cc1993c6b1bbf670f238b3dd1b033225e6e6d36c19584c79e
 DIST kcalendarcore-5.86.0.tar.xz 260196 BLAKE2B a1db517f82216e33187f4d9660c315cda4dfda64bc63799ce26094d125a65681a113fead1239ac4d7c047e3ac830eb9398da7845b8381d7d558c801cfd7acf1f SHA512 255c8b0204f7c1dfca6b1cf9fceddbcb763136a7df5372cf5e755b2df038ba4126b7202ebdd307987c5f174ce4878a62f140d3ba7cadbda7ed3c9f214fad3b92
-EBUILD kcalendarcore-5.85.0.ebuild 517 BLAKE2B 423f8dd170cd48e7a70b335bdf38a687431268a4b7d5ed00348020d2a0096dbab66a2a13ed3b17e5085bed5fbe1c8fe509e28252cacaa1482e9b01b787bb716e SHA512 2a4f2fa4b38066cde2f8f14d34ee612303a88ca68e63b277da4b4f2853a9e9b1f6a4b2157d764a5e56f62dad4d2de394722cf427e09b3e21105849ab4d510636
-EBUILD kcalendarcore-5.86.0.ebuild 520 BLAKE2B ef086fd421abdc5e7029b24cf0433f46539b2c2285aadfa9626185633374e91b6f3fe056fd9f13ac59faf8f39f598b85c63209e4f81443bf517028e8051eb56e SHA512 ea9941688c57e77ee48650c79b5ca20c97333ccf9b9df89051cf55f8c3f06bfb30d30ad61ecbc153d2ec5427ed2769ac69d2058b1c376fba778ddbe1ad6b4d8a
+EBUILD kcalendarcore-5.85.0.ebuild 524 BLAKE2B 25afecbddaa0ba5ddffb6a4577c08207d1c1de699f320a0c67d4f7fdb1c75d1e0c76ee84b1c60e84c7606382780e5ce04b72e0b735dee8509841059108f3ec47 SHA512 42ed432a7c8fd5daa8532c7aa142ccd598aefec1d434d68afb4290483d8a927a3896bab2631469831e46fd9f7083d49cafffe10e139b32238670bf338bba2b75
+EBUILD kcalendarcore-5.86.0.ebuild 527 BLAKE2B 61e94abda31b0a4573a77a120c64847793f9336155eec0732bd4bfe0d20efd93694ea339b0dcfcc7a9182980687ac11d5abdbd751b7a301add7d881bff28cd07 SHA512 a7d0a622c9293a9bc8251c1914ddeba45386d93d7c5a7b977e3158dda7ddfc4234681aa3b6088ddc812432a55b577087a728c7a75998243ba2e56e929956a2b2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
index 60bd208e8154..928545c5c763 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild
index fe9cfac4fcd0..c8d79be4c996 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 3a5ee0fb61b0..68fc3bcdd515 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,6 @@
+AUX knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch 725 BLAKE2B 2395108343b6ead975779ae06c63beab4bf3f88eea3f16f7c50c9baebd639e933550553e7f664ab9a33f01bd4503eabb9ffe663aa436b063120063ea1fc46b08 SHA512 89d18085897197f2a3d1fa7164c2ca2957c75b519bc588c8c4981b934199a6e919ef1e293b80bff18c1e7f188898362d3f41517e5f1a14eaaa78a806f373c3a5
 DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
 DIST knewstuff-5.86.0.tar.xz 1142536 BLAKE2B 8b1aa8ee9e8dc54f0431f77516d3e39bb4f9ff33f72573fee27b749df692b32c850230a2bc566ee580a56b587af05822a0348cd61d58501c49b507fdf0d164bb SHA512 984291bb68e6bde5d90b35245c101c0feb64338ee4c0656802f4812c3a0619a5291307e8e5e2de99b7a34e29554e2283de6513156e7aac32f0d2198433bb45cc
 EBUILD knewstuff-5.85.0.ebuild 1269 BLAKE2B b1a564a30a07c4b50c2383fc79b216c770cf5f3e51cf979336decd4d5aecd4b6bb8e802484dc681cc49818b1995f930f826c53a33a1b430d30bf12f75689f94f SHA512 01511a2c8cd685a147bce2f43c7887de2f14d500f900f0d11fe3bfcde06390cc9c5ff8955d79da2c0fd6e7dd2af71d484945abaac280a57ce372b54323b08a3e
-EBUILD knewstuff-5.86.0.ebuild 1272 BLAKE2B 017a8aef427b4916fd4741cd8719d525514a73550e8db9ef9e5461697f1a277ef8e19daadd15a676060a34f07e07be13846011c6b6ee48a52ba8389a0f1c5799 SHA512 8d3d4e1c3ec22535f8f0feba2ed13b870d8c201faaa910c51318b63132b076380378826ec12638ead82d15050efa1953263bbb3769d999185a18b5089ffd89cb
+EBUILD knewstuff-5.86.0-r1.ebuild 1355 BLAKE2B b09a316b35af2db6185ee23ee517fa2748f77c0e1e269fb0295bcef4cb0e71b9a1a2a4ea3d116954620403cd40e71f0fef62d97f3276a316aba558716f8d3368 SHA512 932889d14d31b88d62e2315da78189214b05e9ac225a0048f1719ffed3b01f6c29eaecd0d83c98186e8963c8d2aa72499aa61ed7fff54c7b020845a73cd0ace1
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
new file mode 100644
index 000000000000..dbed97665d57
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
@@ -0,0 +1,26 @@
+From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 27 Sep 2021 20:05:09 +0200
+Subject: [PATCH] Fix crash in DownloadWidget
+
+BUGS: 443025
+---
+ src/downloadwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
+index 40df2e8c..36cfde37 100644
+--- a/src/downloadwidget.cpp
++++ b/src/downloadwidget.cpp
+@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries()
+ }
+ 
+ DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
+-    : q(q)
++    : q(qq)
+     , engine(new KNSCore::Engine)
+     , model(new KNSCore::ItemsModel(engine))
+     , messageTimer(nullptr)
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild
new file mode 100644
index 000000000000..293f9356d4af
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.86.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" ) # KDE-bug 443025
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package opds KF5Syndication)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0.ebuild
deleted file mode 100644
index 67d43e05a700..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.86.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="opds"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opds KF5Syndication)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 20a92fe00d7d..9f63d71084fd 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -4,8 +4,9 @@ AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e03
 AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
 AUX plasma-5.85.0-fix-svgicon-memleak.patch 1613 BLAKE2B be00da72ac0a1a8ce97cf771ea83db44fe97142ddadfc1a1b283cce5297568ec0566b7a2ce626ad7d7e4f7bbc82edf260dcda1db6ea8cf8ed1c132b3a25dedce SHA512 c8dbb37558ecf3491edbbbda6f93075d7ddea7561eb42b30416d61f7b7256966c609862fb8e0c746b9a93d2caff37b8afef9eff0d5db271d6e3cff8aef2d560b
 AUX plasma-5.85.0-fix-theme-memleak.patch 3873 BLAKE2B 8ec65e67dab0020febd483b4b369d26d4f9e7a1782b783c2910e80db643f92562559053a6319b57af4f905daeaa970db7d78e1a2c11b07dcdbc9d3bb74f52c10 SHA512 fe93829d4881a71bd4671af187a7210fb8fec1c92b29917d1530c58d1247976d59ea2e16eb0eec0c14e25824a9b15caebb7912f7db23b6088c1352e9925d15a9
+AUX plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch 14178 BLAKE2B 81c08e0e372842b83a0510ee0df24c8a78bafc4fd85a8a68e6a9ff84b8abb707b2fc5e680974fb0a4b1b91884ad4a271549bbca2cde1f975b9d9d95dc9cb4d40 SHA512 3c82fe85e0fd38d289d1611bfe637ab94305b4c5b7b3bc67fc48adbac10dac5231407787f633af57d145de104846e4d32b90b8e7eade6e1bed85ef45ce3906dc
 DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
 DIST plasma-framework-5.86.0.tar.xz 3147804 BLAKE2B 39b58d3613a5e99217b9cef3aaff0c5ef7c0563f3a6014b50ccd8ac1a7b328f6fc2a91af94c66c2bb702435f892b23605cda6a8aee049c6f7c9ea7a455fae57d SHA512 f94d9a0175141705eb8e384877d69d0b6bfbdc76a12f7f3fcc33587186a7ab5ed7cf87eaa9e13102932d7c8fad500bf479da111ea4b61c1e35acea9f216eaef8
 EBUILD plasma-5.85.0-r3.ebuild 2329 BLAKE2B eab27d4eea5e926738094e0e3f711369a229f87922aa1256f75e9b240111f0c6f8a430102c807ed4cb93dcfd392005f13c0f81f572134a51e0c47d32c49da4e1 SHA512 f40ddb75ef8316018d0eda6db3602ecea8958d26446517c790fed6776f297a78e7d22bbc113149f625b8b2f37b9ed98dcfad73fe7dd176db6e7c4388ecb8aafc
-EBUILD plasma-5.86.0.ebuild 1943 BLAKE2B 4f9cabe4ac6c36839d71bfbad8cd5b6652d22723eba67017ae7587941de3efb6595c4f472770bee802a4421f6c711e83832185e3a8d333e358a0b4cdb1a79526 SHA512 23aa0e6f6349402291049e4203dff1a9263fd797a749cb274e4d53b8032eac9931f1d457290499ae9694ef93dbbd82b329d9c55e707496906f89adc3f0b6c122
+EBUILD plasma-5.86.0-r1.ebuild 2016 BLAKE2B 7c20f1ac7e146094b3f92b7eee2c3fc87ba01c420ae1f3de8d2a067e2d5b3d3fb5b30276384807d541ccc8b4752050c708429ff2d4d98ee85d819f0005bb782d SHA512 3236c96b386da06cc6e7a58642e02e43d6ef0d02b9e0a15223d125d26638d6336a25a925ff3b514f5a9871a856219cb50ab63e46289097895a4766c5bcd9f9ad
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
new file mode 100644
index 000000000000..f0c8042d50ce
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
@@ -0,0 +1,206 @@
+From 6f8eae0ca24e1ca7e816906042cb8b6b14886698 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 17 Sep 2021 07:43:48 -0600
+Subject: [PATCH] Revert "Change busywidget to a gear"
+
+This reverts commit aafe6523cc0fe809d03fb6b98c624ac3c0f49973.
+
+This change has not been well-received by users, and exposes a
+conceptual issue with how app launch animations are currently handled in
+Plasma, with the loading spinner simply re-used as an overlay on top of
+the app icon. This constrains possible designs for the spinner because
+the backgrounds it will be displayed on top of differ gratly in these
+usages; what looks good in one context may not look good in the other.
+We will have to find another way.
+
+BUG: 442525
+FIXED-IN: 5.87
+---
+ .../breeze/widgets/busywidget.svg             | 80 ++++++++-----------
+ 1 file changed, 35 insertions(+), 45 deletions(-)
+
+diff --git a/src/desktoptheme/breeze/widgets/busywidget.svg b/src/desktoptheme/breeze/widgets/busywidget.svg
+index 2ca09f283..0eaf137a7 100644
+--- a/src/desktoptheme/breeze/widgets/busywidget.svg
++++ b/src/desktoptheme/breeze/widgets/busywidget.svg
+@@ -14,7 +14,7 @@
+    viewBox="0 0 35.983333 35.983334"
+    id="svg2"
+    version="1.1"
+-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
++   inkscape:version="0.48.5 r10040"
+    sodipodi:docname="busywidget.svgz">
+   <defs
+      id="defs4">
+@@ -75,7 +75,7 @@
+      inkscape:pageopacity="0"
+      inkscape:pageshadow="2"
+      inkscape:zoom="5.4632354"
+-     inkscape:cx="186.91665"
++     inkscape:cx="219.5896"
+      inkscape:cy="25.042129"
+      inkscape:document-units="px"
+      inkscape:current-layer="layer1"
+@@ -84,9 +84,9 @@
+      inkscape:showpageshadow="false"
+      borderlayer="true"
+      inkscape:window-width="1920"
+-     inkscape:window-height="1007"
++     inkscape:window-height="1027"
+      inkscape:window-x="0"
+-     inkscape:window-y="0"
++     inkscape:window-y="-3"
+      inkscape:window-maximized="1"
+      fit-margin-top="0"
+      fit-margin-left="0"
+@@ -96,73 +96,59 @@
+        type="xygrid"
+        id="grid4160"
+        empspacing="2"
+-       originx="0"
+-       originy="0"
++       originx="0px"
++       originy="0px"
+        visible="true"
+        enabled="true"
+-       snapvisiblegridlinesonly="true"
+-       spacingx="1"
+-       spacingy="1" />
++       snapvisiblegridlinesonly="true" />
+     <sodipodi:guide
+        position="-5.8455811e-08,35.983344"
+        orientation="136.00001,0"
+-       id="guide4155"
+-       inkscape:locked="false" />
++       id="guide4155" />
+     <sodipodi:guide
+        position="-5.8455811e-08,6.6152344e-06"
+        orientation="0,136"
+-       id="guide4157"
+-       inkscape:locked="false" />
++       id="guide4157" />
+     <sodipodi:guide
+        position="35.983333,6.6152344e-06"
+        orientation="-136.00001,0"
+-       id="guide4159"
+-       inkscape:locked="false" />
++       id="guide4159" />
+     <sodipodi:guide
+        position="35.983333,35.983344"
+        orientation="0,-136"
+-       id="guide4161"
+-       inkscape:locked="false" />
++       id="guide4161" />
+     <sodipodi:guide
+        position="1.1488343e-09,17.991675"
+        orientation="68.000007,0"
+-       id="guide4165"
+-       inkscape:locked="false" />
++       id="guide4165" />
+     <sodipodi:guide
+        position="1.1488343e-09,6.6152344e-06"
+        orientation="0,67.999998"
+-       id="guide4167"
+-       inkscape:locked="false" />
++       id="guide4167" />
+     <sodipodi:guide
+        position="17.991666,6.6152344e-06"
+        orientation="-68.000007,0"
+-       id="guide4169"
+-       inkscape:locked="false" />
++       id="guide4169" />
+     <sodipodi:guide
+        position="17.991666,17.991675"
+        orientation="0,-67.999998"
+-       id="guide4171"
+-       inkscape:locked="false" />
++       id="guide4171" />
+     <sodipodi:guide
+        position="1.8520831,34.131232"
+        orientation="122.00003,0"
+-       id="guide4199"
+-       inkscape:locked="false" />
++       id="guide4199" />
+     <sodipodi:guide
+        position="1.8520831,1.8520574"
+        orientation="0,121.99999"
+-       id="guide4201"
+-       inkscape:locked="false" />
++       id="guide4201" />
+     <sodipodi:guide
+        position="34.131248,1.8520574"
+        orientation="-122.00003,0"
+-       id="guide4203"
+-       inkscape:locked="false" />
++       id="guide4203" />
+     <sodipodi:guide
+        position="34.131248,34.131232"
+        orientation="0,-121.99999"
+-       id="guide4205"
+-       inkscape:locked="false" />
++       id="guide4205" />
+   </sodipodi:namedview>
+   <metadata
+      id="metadata7">
+@@ -227,7 +213,7 @@
+        y="285.35831" />
+     <g
+        id="busywidget"
+-       transform="translate(-36.777084)">
++       transform="translate(-36.777084,0)">
+       <rect
+          style="fill:none;stroke:none"
+          id="rect3016"
+@@ -236,10 +222,11 @@
+          x="36.247917"
+          y="249.37498" />
+       <path
+-         class="ColorScheme-ButtonFocus"
+-         d="m 54.239579,252.55041 c -1.250543,0.007 -2.495143,0.1722 -3.704169,0.4921 v 1.93529 c -0.8449,0.2527 -1.661835,0.5908 -2.4381,1.00926 l -1.370963,-1.37102 c -2.161292,1.27435 -3.963589,3.07664 -5.237918,5.23796 l 1.370971,1.37095 c -0.41972,0.77609 -0.75908,1.59306 -1.012872,2.4381 h -1.9425 c -0.31598,1.20946 -0.47768,2.45413 -0.48111,3.70419 0.0077,1.25055 0.17227,2.49515 0.49196,3.70412 h 1.935276 c 0.25263,0.8449 0.5908,1.66187 1.009239,2.4381 l -0.40516,0.4053 -0.965839,0.96586 c 1.274322,2.16125 3.076626,3.96361 5.237932,5.23789 l 0.965824,-0.96586 0.40516,-0.4053 c 0.776118,0.4193 1.593053,0.75908 2.4381,1.01283 v 1.9425 c 1.209488,0.3164 2.454088,0.4774 3.704169,0.4809 1.250081,-0.006 2.494681,-0.1652 3.704169,-0.4809 v -1.9425 c 0.845047,-0.2534 1.661982,-0.5929 2.4381,-1.01283 l 1.370964,1.37095 c 2.161309,-1.27428 3.963606,-3.07664 5.237928,-5.23789 l -1.370985,-1.37102 c 0.41846,-0.77623 0.756637,-1.5932 1.009239,-2.4381 h 1.935297 c 0.31969,-1.20897 0.48454,-2.45357 0.49196,-3.70412 -0.0036,-1.25006 -0.1652,-2.49473 -0.48111,-3.70419 h -1.9425 c -0.25375,-0.84504 -0.59318,-1.66201 -1.012872,-2.4381 l 0.40516,-0.4053 0.965839,-0.96579 c -1.274322,-2.16132 -3.07664,-3.96361 -5.237928,-5.23796 l -1.356502,1.35653 -0.0147,0.014 c -0.776286,-0.4186 -1.593221,-0.75663 -2.438121,-1.00926 v -1.93529 c -1.209026,-0.3199 -2.453626,-0.4844 -3.704169,-0.4921 z m 0,1.85206 c 0.62027,0.001 1.240078,0.049 1.852081,0.1414 v 1.87019 c 1.649396,0.2828 3.213623,0.9345 4.575942,1.90638 l 0.11949,-0.119 1.208284,-1.20827 c 0.995193,0.74207 1.877914,1.62204 2.622581,2.61534 l -1.327739,1.32769 c 0.96845,1.36437 1.616384,2.92978 1.895404,4.57961 h 1.880991 c 0.08946,0.6132 0.1365,1.23074 0.13741,1.85206 -0.002,0.6202 -0.0504,1.24005 -0.14112,1.85206 h -1.870176 c -0.2828,1.64941 -0.934451,3.21363 -1.906331,4.57597 l 0.11928,0.1197 1.208277,1.20827 c -0.74207,0.99526 -1.622068,1.87796 -2.615336,2.62262 l -1.327746,-1.32776 c -1.364447,0.96845 -2.929899,1.61644 -4.579659,1.89546 v 1.88097 c -0.61313,0.0896 -1.230803,0.1365 -1.852088,0.1372 -0.62125,-9.1e-4 -1.23893,-0.049 -1.852081,-0.1372 v -1.88097 c -1.64976,-0.2793 -3.215219,-0.92701 -4.579575,-1.89553 l -1.327738,1.32776 c -0.993251,-0.74466 -1.873249,-1.62736 -2.615326,-2.62262 l 1.208284,-1.20827 0.11942,-0.119 c -0.97188,-1.3622 -1.623552,-2.92642 -1.906331,-4.57583 h -1.870176 c -0.09037,-0.6118 -0.13888,-1.23179 -0.14112,-1.85213 9.24e-4,-0.6216 0.0483,-1.23893 0.13741,-1.85206 h 1.881012 c 0.27902,-1.64976 0.926947,-3.21524 1.895495,-4.57954 l -1.327739,-1.32776 c 0.744667,-0.99323 1.627388,-1.87327 2.622585,-2.61534 l 1.208283,1.20827 0.11949,0.119 c 1.36234,-0.97188 2.926574,-1.62351 4.575963,-1.90631 v -1.87019 c 0.61201,-0.0903 1.231804,-0.1386 1.852081,-0.1414 z"
+-         id="path5"
+          inkscape:connector-curvature="0"
++         class="ColorScheme-ButtonFocus"
++         id="path3018"
++         transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
++         d="m 207,7 a 60.999998,61.000013 0 0 0 -61,61 60.999998,61.000013 0 0 0 52.5,60.34375 60.999998,61.000013 0 0 0 0.0625,0 60.999998,61.000013 0 0 0 0.125,0.0313 60.999998,61.000013 0 0 0 3.46875,0.40625 60.999998,61.000013 0 0 0 1.34375,0.0937 60.999998,61.000013 0 0 0 0.0313,0 c 0.15685,0.009 0.31182,0.0232 0.46875,0.0313 A 60.999998,61.000013 0 0 0 207,129 c 0.15564,-7.2e-4 0.31314,-0.0292 0.46875,-0.0313 a 60.999998,61.000013 0 0 0 4.1875,-0.21875 c 0.20839,-0.0188 0.41684,-0.0101 0.625,-0.0313 12.83843,-1.3057 25.21151,-7.11778 34.34375,-16.25 10.43684,-10.43683 16.49999,-25.115076 16.5,-39.875 0,-5.534972 -0.85031,-11.052726 -2.46875,-16.34375 A 54.99999,55.000005 0 0 1 262,68 54.99999,55.000005 0 0 1 207,123 54.99999,55.000002 0 0 1 152,68 54.99999,55.000002 0 0 1 154.46875,51.75 54.99999,55.000002 0 0 1 207,13 l 1,0 c 1.10799,0 2,-0.892032 2,-2 l 0,-2 c 0,-1.1079685 -0.89201,-2 -2,-2 l -1,0 z"
+          style="fill:currentColor;fill-opacity:1;stroke:none" />
+     </g>
+     <g
+@@ -252,11 +239,13 @@
+          id="rect3007"
+          style="fill:none;stroke:none" />
+       <path
+-         class="ColorScheme-ButtonFocus"
+-         d="m 53.84271,280.06665 v 0.43717 c -0.248425,0.0513 -0.484716,0.1497 -0.696085,0.28991 l -0.310057,-0.31005 -0.561206,0.5612 0.310059,0.31005 c -0.139694,0.2115 -0.237569,0.44777 -0.288353,0.6961 h -0.438734 v 0.79374 h 0.437181 c 0.05126,0.24842 0.14967,0.48472 0.289906,0.69608 l -0.310059,0.31005 0.561206,0.56122 0.310057,-0.31005 c 0.211484,0.13965 0.447772,0.23755 0.696085,0.28834 v 0.43874 h 0.793748 v -0.43717 c 0.248425,-0.0513 0.484717,-0.14971 0.696085,-0.28991 l 0.310057,0.31005 0.561206,-0.56122 -0.310059,-0.31005 c 0.139695,-0.21148 0.23757,-0.44775 0.288353,-0.69608 h 0.438734 v -0.79374 h -0.437181 c -0.05126,-0.24844 -0.14967,-0.48473 -0.289906,-0.6961 l 0.310059,-0.31005 -0.561206,-0.5612 -0.310057,0.31005 c -0.211487,-0.13965 -0.447771,-0.23755 -0.696085,-0.28835 v -0.43873 z m 0.396874,0.79375 c 0.429013,0 0.839763,0.17364 1.13869,0.48137 0.28781,0.29628 0.44881,0.69307 0.44881,1.10612 0,0.42903 -0.17364,0.83977 -0.481365,1.1387 -0.296283,0.2878 -0.693075,0.44881 -1.106135,0.44881 -0.429013,0 -0.839762,-0.17365 -1.13869,-0.48137 -0.287809,-0.29628 -0.44881,-0.69308 -0.44881,-1.10614 0,-0.42901 0.173641,-0.83975 0.481365,-1.13868 0.296284,-0.28782 0.693076,-0.44881 1.106135,-0.44881 z"
+-         id="path5-3"
++         sodipodi:nodetypes="sccccccccccccccccsssss"
+          inkscape:connector-curvature="0"
+-         style="fill:currentColor;fill-opacity:1;stroke:none" />
++         id="path3009"
++         transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
++         d="m 206.90625,115 c -5.68285,0 -9.90626,4.76331 -9.90625,10 0,5.11064 3.86041,9.24196 8.53125,9.90625 0.007,0.001 0.0245,-0.001 0.0313,0 0.1869,0.0265 0.37435,0.0459 0.5625,0.0625 0.0726,0.008 0.11478,-0.004 0.1875,0 l 0.0313,0 c 0.0253,0.002 0.0371,0 0.0625,0 0.16207,0.008 0.3377,0.0313 0.5,0.0313 0.0253,-1.1e-4 0.0373,0 0.0625,0 0.22673,-0.003 0.46154,-0.0123 0.6875,-0.0313 0.0336,-0.003 0.06,0.002 0.0937,0 2.08268,-0.2143 4.08105,-1.19024 5.5625,-2.6875 2.29078,-2.85585 2.42433,-5.2927 1.42433,-9.29269 1.22819,5.24703 -2.45297,9.87167 -7.86188,10.0102 -4.24948,0 -7.87455,-3.58819 -7.87457,-7.99871 0.0682,-4.85133 3.99957,-7.98861 7.93707,-8.00652 l 0.15625,0 c 0.16789,0 0.31534,-0.15426 0.3125,-0.32394 -0.006,-0.3677 -0.0216,-0.97956 -0.0313,-1.32579 C 207.36994,115.1624 207.24222,115 207.0625,115 z"
++         style="fill:currentColor;fill-opacity:1;stroke:none"
++         class="ColorScheme-ButtonFocus" />
+     </g>
+     <g
+        id="16-16-busywidget">
+@@ -268,11 +257,12 @@
+          x="58.472801"
+          y="281.12497" />
+       <path
+-         class="ColorScheme-ButtonFocus"
+-         d="m 60.280903,281.38956 v 0.34003 c -0.193218,0.0399 -0.377001,0.11643 -0.541398,0.22548 l -0.241156,-0.24115 -0.436493,0.4365 0.241157,0.24115 c -0.108652,0.16448 -0.184777,0.34826 -0.224276,0.5414 H 58.7375 v 0.61735 h 0.34003 c 0.03986,0.19323 0.11641,0.37701 0.225483,0.54141 l -0.241157,0.24115 0.436493,0.43649 0.241156,-0.24115 c 0.164487,0.10862 0.348266,0.18477 0.541398,0.22427 v 0.34124 h 0.617361 v -0.34003 c 0.193218,-0.0399 0.377001,-0.11643 0.541398,-0.22548 l 0.241156,0.24115 0.436493,-0.43649 -0.241157,-0.24115 c 0.108652,-0.16449 0.184777,-0.34827 0.224276,-0.54141 h 0.341237 v -0.61735 h -0.34003 c -0.03987,-0.19322 -0.11641,-0.37701 -0.225483,-0.5414 l 0.241157,-0.24115 -0.436493,-0.4365 -0.241156,0.24115 c -0.164489,-0.10862 -0.348266,-0.18477 -0.541398,-0.22427 v -0.34124 z m 0.30868,0.61737 c 0.333678,0 0.653149,0.13505 0.885649,0.37439 0.223851,0.23044 0.349073,0.53906 0.349073,0.86033 0,0.33367 -0.135053,0.65314 -0.374395,0.88565 -0.230442,0.22385 -0.539058,0.34906 -0.860327,0.34906 -0.333677,0 -0.653149,-0.13505 -0.885648,-0.37439 -0.223852,-0.23044 -0.349073,-0.53906 -0.349073,-0.86032 0,-0.33368 0.135053,-0.65315 0.374395,-0.88566 0.230442,-0.22384 0.539058,-0.34906 0.860326,-0.34906 z"
+-         id="path5-6"
++         style="fill:currentColor;fill-opacity:1;stroke:none"
++         d="m 60.57642,281.3808 c -1.05492,0 -1.838921,0.88423 -1.838919,1.85633 0,0.9487 0.716617,1.71561 1.583674,1.83892 0.0013,1.8e-4 0.0045,-1.8e-4 0.0058,0 0.03469,0.005 0.06949,0.008 0.104418,0.0115 0.01348,9.5e-4 0.02132,-7.1e-4 0.03481,0 l 0.0058,0 c 0.0047,3.7e-4 0.0068,0 0.0116,0 0.03009,9.5e-4 0.06269,0.006 0.09281,0.006 0.0047,-10e-6 0.007,0 0.01161,0 0.04209,-5.5e-4 0.08568,-0.002 0.127622,-0.006 0.0062,-5.5e-4 0.01115,3.7e-4 0.01739,0 0.386612,-0.0397 0.757573,-0.22096 1.032578,-0.49889 0.425244,-0.53014 0.450034,-0.98249 0.264402,-1.72502 0.227992,0.97402 -0.455349,1.8325 -1.459418,1.85821 -0.788838,0 -1.461768,-0.66608 -1.461773,-1.48481 0.01267,-0.90056 0.74245,-1.48294 1.473376,-1.48626 l 0.029,0 c 0.03117,0 0.05855,-0.0288 0.05801,-0.0601 -0.0011,-0.0683 -0.0039,-0.18183 -0.0058,-0.2461 -9.11e-4,-0.0337 -0.02464,-0.0638 -0.058,-0.0638 z"
++         id="path3794"
+          inkscape:connector-curvature="0"
+-         style="fill:currentColor;fill-opacity:1;stroke:none" />
++         sodipodi:nodetypes="sccccccccccccccccsssss"
++         class="ColorScheme-ButtonFocus" />
+     </g>
+   </g>
+ </svg>
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
new file mode 100644
index 000000000000..9019b0099afa
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( media-libs/libglvnd[X?] )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/libglvnd
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}"/${P}-revert-Change-busywidget-to-a-gear.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/plasma/plasma-5.86.0.ebuild b/kde-frameworks/plasma/plasma-5.86.0.ebuild
deleted file mode 100644
index 1ccc68601353..000000000000
--- a/kde-frameworks/plasma/plasma-5.86.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index baba983efc91..c9f24f8e1aac 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 56ce67404b84..0b32bd38b24d 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,5 @@
 DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
+DIST bluedevil-5.22.90.tar.xz 168576 BLAKE2B 2546a3fd3c4d0baee81a4a4d41aa67b8ddc0dd83cb871684b5406d1cbe9a341c02d4b866d78e5bffbdb2fb6a96eef9d56fbb80db52918a416ecadd00462d0c4e SHA512 8a6ed6444fa36d596d12d1c09499bf39d85cbbd29e6b172260a567c343712a1f08d19b1d9f936949762031223447359989cec287c8018cf8f572d0e75930ee73
 EBUILD bluedevil-5.22.5.ebuild 1118 BLAKE2B af4d6e101a1f5cbc513d2d0155ce7a93a97bd509f7bf53827fed90dd98feaabdfdff2ea76ab0996caaaad958ec0a81c57c7f29d8e41c346304e2915ef46660b4 SHA512 25872950b76d750fc4f471b1efdfa70534010b538a504c5673d55910cddea9662e0f1b1ee76d6bc08086b44de5a18a11cda159913b42d1e50848c4afc3ab312b
+EBUILD bluedevil-5.22.90.ebuild 1121 BLAKE2B acbda1f0abf4912eb5b7da6bef58762d4796f1b557f67c5d936da99ce19106dbb7469ecc404aab99181089cd5edcaf38a2695f0db02f5ffb6960307ebfa5ac6c SHA512 a65f37ff96ea819771df1b869bf1855c4d258a4678ec1711fe9b7a05b31ac129eaea98154645fe3cbbb616f67265b1dfa44d18a8c34e9a681d1c1967b3ce924b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.90.ebuild b/kde-plasma/bluedevil/bluedevil-5.22.90.ebuild
new file mode 100644
index 000000000000..a5596eaace02
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.22.90.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 89d24004e83a..6496d4402065 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
+DIST breeze-grub-5.22.90.tar.xz 3168652 BLAKE2B 3c3d6d6f34afdd8bd9d786b356b848860cf205ffe7f6635eb29c97c68f7f68dc682253d468d823957d83cc2e5f6d1134b77149d8d5d1f29edae65e5385459c72 SHA512 93c2a36b6c6f921f04e4b076a4b67a50d94d695c7886f4c56ec4ce9957d5f7a7c7c23c95d7cd70b0f1c513507089b574dae50fc39ffc985f1d0056a072b02ba4
 EBUILD breeze-grub-5.22.5.ebuild 401 BLAKE2B 9cde80ae6be6a89ce4f79d242593049449421a6a463d221f723281d37435e70cc7a4f5afa98d0ac58faa9d1f0b833e84e4a195bda0ef2ad2516d6a374d10bd95 SHA512 289c25ddacb017aae7407da80b6ba50a40e69fab568e7e5dd6fc40970fe52260c80fe8f666114bce7e561b77b274722474f6d927d6e3994145a914746d651fda
+EBUILD breeze-grub-5.22.90.ebuild 404 BLAKE2B f56fac7bd9f2f4af79a51d606d0d646d81551530c3af69e13a98928afc8c6b14dc3ceb6dae3c4be4a2fe37f61e24c4ddab88fde0bb934593b10f94a7e124fb95 SHA512 70c16c418794b8531a329d6ee3c1c67ad46fa0421aada4e4f944530b777d06737bc3c7c099c5b75d178d9ca6d55418f91304b23f21772d0dddf28d6e2d661ab9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.90.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.22.90.ebuild
new file mode 100644
index 000000000000..e05a4cd33bed
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.22.90.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+inherit kde.org
+
+DESCRIPTION="Breeze theme for GRUB"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index e6423adfd054..5225862dda38 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
+DIST breeze-gtk-5.22.90.tar.xz 47560 BLAKE2B b525bfea1840bf276494d56b12f56ac6737126ce8f67952a16a9f7920d27521a7f2ed9d70929d3ea006d7c070e90558859eec17bfbe1de76acf683617384c833 SHA512 9791b30ef03e6baf9233c5e5a8f2a6ff41cdf4d442fd4eb632d924572af58dc3798169c37f9e56c0a45f268df1d249f3bdc75fc20a1dbac0b3656648c936be49
 EBUILD breeze-gtk-5.22.5.ebuild 797 BLAKE2B 993ac2356bd9337a5c9615df5a6b2f0aaa34a6dc0b3f98d62ec8f65219dc9a70b234fb470c8624bfe5b9c50ce6204712025c015d93935015cb0fc5bbdd5c4e06 SHA512 52a8b6727d4b485b6c66950912ffdb48a8455dc8cf2fed4f5d1c6cd53bad0ce7d01d355c401f5db48bc472d3298bcf2e542399a63807330aa41c112d96e82f0e
+EBUILD breeze-gtk-5.22.90.ebuild 800 BLAKE2B e68718ca68a5a8afeae3b0a4303981260120ae03a0210f4406875772922b11f8cdffbc51f55788a80a4344b21da1658b2035286992f9385f57e33e86c4b4be7a SHA512 c359e7b7e6fdf90cc9c92ea335d541a92fc4477339cdf0a70bb4e1a1b25e97a7f0cfdeecd0cf116b441404be8d9fa9a4bfabd8cde9d0f3945148ab5df950965f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.90.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.22.90.ebuild
new file mode 100644
index 000000000000..3a25f86673fe
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.22.90.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+PYTHON_COMPAT=( python3_{8..10} )
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=dev-util/cmake-3.16
+	>=kde-plasma/breeze-${PVCUT}:5
+"
+
+python_check_deps() {
+	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 464e9498ced5..e118618f71a3 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
+DIST breeze-plymouth-5.22.90.tar.xz 110536 BLAKE2B 1c79cfa4e9bf6497b772740197e8061aaec57aa116bef3f5bc59911fb12630ae6e596cb5d81746cec16151f4524f689f6d4c55f1420f20994348c657d4ad8434 SHA512 eeb3020608c62cdc5ce301e567c677631313c3c34dfb0ae9d8d2eef074dd5430785f8e548cd48fdfdfccea34dc531d51177660a0c9daa16da6aee5a2971b8623
 EBUILD breeze-plymouth-5.22.5.ebuild 515 BLAKE2B a63875fa117e71070166f67655220f021e2306ce138935b30dea7e69f4a136ad9296bfc4047cbd6b86c5260493c8a76e37fd492c01e1164eba3bd4bb49118cf7 SHA512 f4c47229926617b0f8bc9ea1a66c37160dde4a8911055712262de20d49c511408c1645938c39ca6460ad1a34516467df0f44ebda3c0a2b73bf1791eba7c3051a
+EBUILD breeze-plymouth-5.22.90.ebuild 518 BLAKE2B 691cc3516db545c478d863def31d82387fa8c718defdedab2e26c741b62ea7269326e293c0d6fe6da4668f341cf9ad5f0bafdb30cae4854dc892d5d966116c0b SHA512 64aa2c133bf1808f38d4ab385213608b821d8030185671628dafb19bf123c0d9d99d17bb5e47541a927ff8dba953da99192267b55867221e2db3476b8df91802
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.90.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.90.ebuild
new file mode 100644
index 000000000000..ec9a8ea4970a
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.90.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 86edc611780b..99eb468f0559 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
+DIST breeze-5.22.90.tar.xz 73811684 BLAKE2B fa5371e8cfe794901994b66db599cae22172e7f3be593fed683c9c66d65671eb732eed9cc89d52ad560f05480b209b763411ff6aa830885a27f55d56af0457bb SHA512 98f7fc6dd5e84df5a5ce9a47e3b357064583cfa21a3d6a971a0dc285cdde02ba272f72a16cbc8d9e457e9cd27549b35d4b68bffad2dd420d27f16aa4ea428c7f
 EBUILD breeze-5.22.5.ebuild 1272 BLAKE2B 16bc96592da6d84fbfe8b5ef73386aa7cefb10499c67282641f74a475628bea30fb3f8c1a1258e3795fcd2266b73f8a9271a82b3823c1a43a3d838e9f4bcf2ba SHA512 65d6702cc8efb303f69022de57ba4afd01937d91e4d03635443c642a88d140f540c393847fcb9d1086455e6dba89f0b334f75395c07b48b7c2538fb5b760cbed
+EBUILD breeze-5.22.90.ebuild 1275 BLAKE2B 23b8ec56440a3ce14de9d07baf95232297301e78e99b912c8298af1391e91cc81e383ba82d7432bbf1e7f389a610abad5fdf5c6b9bab3ee38868e5c23c26d8c2 SHA512 c2c1f9248c8c7a40754b9487f38334caed15ae05a48c58043b13cbab8dd2795552fe9a4851338c22fae40bc21c20a6105a7561039fafce9abacd0f02841828dd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.22.90.ebuild b/kde-plasma/breeze/breeze-5.22.90.ebuild
new file mode 100644
index 000000000000..76a474649d74
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.22.90.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	X? ( x11-libs/libxcb )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kpackage-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 49dc451464f1..73da4ba00cdf 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,7 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
 AUX discover-5.22.5-no-updates-kcm.patch 925 BLAKE2B d1f5c52c3d9b47ae108712aad1e55621ae5be9d1ad5e97e3d907d0003e6c59b5296abaf1a79a05865598e71156e1fedbc5eb843c1f8a4f9058dfe2d4fd81b29f SHA512 03d1899af2c61465f9d8da050c55b35620c1624bc1fa89970fd73a490aaaa5d1e957b38cf0678a914598ddecf76dd762c1aa614a21db5ced10c06e50c8f5dfd8
 DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
+DIST discover-5.22.90.tar.xz 8228824 BLAKE2B 7d6bca0407cfadbac1bce63354081c8ffef778d060d38c9d0d655518b309891c4b17b3843478a4d9a0403261699607e083cc87d7824153b69b08a65e1f74ec09 SHA512 12e235d52464132ecc4d0d483e5ba5d967db4659ee5785db1bbb35c8ad8ff78ad4f2697beace0d26228a552b765ef4bacfac7ba413e8b9b3340415fc6b68d41a
 EBUILD discover-5.22.5.ebuild 2344 BLAKE2B 2cec026b1669b2509e18fa1c8800662254ab1dab756b9f42f2e7a25da58dc4e326bb013dea9dd2589ed23e9c041dd41ddcacc1b3360f9823939733f639675199 SHA512 b59194b3b5b28e4c88e0b301eafa80d31a55143d1f5f7f022a05de591a6112040860fe3937345c815e25b53e7d2ed95b335137e79d676e8dd8ad1045e955e405
+EBUILD discover-5.22.90.ebuild 2297 BLAKE2B 829364d324271168b4c04e27f933e5c594676412d6efb19c67b650b71dde25783dc251dc445040398938e5264d74aebdd9f8747ada252beab49146656fbd0481 SHA512 38dd90840ea9ebf724482e4596afe0f9b73c1b7216cc8693d9d21fc0939c385a8e1737e036315a8e0ebb5a0400726c19b3051e8db2ed93925c04d9464779f384
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.22.90.ebuild b/kde-plasma/discover/discover-5.22.90.ebuild
new file mode 100644
index 000000000000..ffb613b84536
--- /dev/null
+++ b/kde-plasma/discover/discover-5.22.90.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.86.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
+	flatpak? (
+		>=dev-libs/appstream-0.14.4:=
+		sys-apps/flatpak
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DWITH_KCM=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index aa8abf241880..360ac777300b 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,4 +1,6 @@
 AUX drkonqi-5.22.3-unused-dep.patch 954 BLAKE2B 8daf7abdd007f0c4ba8adc1173dc314c17bc0144aaa494076d1a031bb1de87ef33da9d9d322fd63582cd1b917383295479fdd3547ce1b1651a9f36b56ca5d0da SHA512 8b26d70986ef5cceb7abf83c36a12d3b17158d87fa3b16ac6814c17b0afbc6258dc4aebe9a630f6724ada6f41a9d3f5029cb558966b6dc01f833a91ce36ef7b4
 DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
+DIST drkonqi-5.22.90.tar.xz 791852 BLAKE2B 771302436a51e90cc4feafbe5c995d0078fdab31e0a2ca0689904ae20c9e42251b013d3ed0c87146bc00ec56f47f4b1bbbafe179748a2912afffe373e3873a07 SHA512 19f5e2d80a533894242076612063036bb07c64e26fa6b88a0f3f8200be2d092536d3bc7f349fa19af6d57e0486b67f1d52795603358b1caaf3ddbdca828b91a1
 EBUILD drkonqi-5.22.5.ebuild 1392 BLAKE2B b44d8eeec0c026dbd6c16398c23968eed4caecea64434d4d0648118b92cea6a3c5244455a319f56c64bac14b415104db3750cd17b0d220dc6dee98dcfbbfd15a SHA512 24c37a397bf033cfa2f478a4da3d8cc3624d2a802de4478c0f351ac7c813a3a2dcd0794ef905851b8463ff71c1eb57693d3795c75dadf17dd3e5ceee4ebd3c0d
+EBUILD drkonqi-5.22.90.ebuild 1338 BLAKE2B ede2b772ac418d321edcbf50dbdb64bdf6dc40a0a811609232af158e872cc2287ceac1a7bb529efb760a07eec92d3c15b45726499ccecbad5fc81f7d92b54c5d SHA512 4e07c687ea050fe1081341e1ed96905b14245a9a8f32e853460f4e71a6331976b529ec351c65d00c04965e826c3ee82cadc96a944f25cfdaa30ba749601de26e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.90.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.90.ebuild
new file mode 100644
index 000000000000..8c03ecd357f4
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.22.90.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		sys-devel/gdb
+		dev-util/lldb
+	)
+"
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 5b49bb4f9387..d3e12bd5d741 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,5 @@
 DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
+DIST kactivitymanagerd-5.22.90.tar.xz 104312 BLAKE2B c2a498753e441b427b0c83deae7fbecd81822318b618c87c859f7bf2dc682ea27846158acc9658d3a700c6afabcef73d74bdcad3824539b1dd838e3925ac47c1 SHA512 a67a2c4e0d7f23e3a6e0864b3090c0692dbcd518763f110b7ac4f1e9724390c34581dc64f3aa77ff7d585f87f3a2d27d2b189ebba22d84f26a0717c4e2127978
 EBUILD kactivitymanagerd-5.22.5.ebuild 916 BLAKE2B 0f5d910e8cda5ef80ed9eeb966791ad686a1aed76708cec0d0bfe6a2ca97ab43ae91138288883033f026be90baeb9a9fd3b731a478a6c5bf13d3f4e864e87eff SHA512 f08ad2be616d0c649c5f34c5287d4dbc957d27bb30f5da8523687afe554ff122501c5ff7455727b4fa87e833771f68b34ada2d7ac0e2840184ab176b0ab86c8e
+EBUILD kactivitymanagerd-5.22.90.ebuild 919 BLAKE2B b151be1c39801e1a4b1aeed6d22f65a930236bce8d8830d4c2ef427a56dbfb717dc9d25cf4e44486cbfa78a5d074b32daba8927d6c6c9021d4dcd5519ad1ed87 SHA512 216843d196b9a4c932a413f1478c5261598822eead48c05c30568b8ff13ad12eb9a25bdddf67859d45279473a4693298c296e94bd0c8e9bf52d10d7c1640fef9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.90.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.90.ebuild
new file mode 100644
index 000000000000..ad18b9fd8faa
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.90.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index aee10d1ae88c..43d364c9332b 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,4 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
+DIST kde-cli-tools-5.22.90.tar.xz 631408 BLAKE2B 5294891d3d6553dd87378292a6e59b7bd90607e989648493ae01f8d205bfccb832bc7051715a4efd76b4b476c56de47240d0c4968df7c6f3f08bd70dbb3b704a SHA512 85d0f2ddcd24c8082f78b44207358fca952ec8fc60172ab0a4a2ea851ba8db9b1f72eba7956ac95136d58049ae9f5257f0677e7847efb61b607d636c18d854a3
 EBUILD kde-cli-tools-5.22.5.ebuild 1727 BLAKE2B 68c095a92071cfec56af22da4adb0e8a232bb864c005d87d0381dec6a8fc3873a822f0ab7ba767e9127585637ae32d6a10d4aea00888ea9f005408399a1c3a2c SHA512 e4abb4444b5c9fabe0111baa7a1fb6ae66dbee94dd755a8e7ba15063aa08d92a07aa45a9553df44fca75e824c2c32b88eeaf2601aa9af767af660b8062fd66fd
+EBUILD kde-cli-tools-5.22.90.ebuild 1730 BLAKE2B d2ca5a154822755348368094201d4826b903c2b95f5b366a8c0e576574e9ef2760c04c67cd502bed9e3fb5a66b686bcb89699bd10248da451c9e11ac508488ee SHA512 357c5ead191a76122d77cf37711d1a7f473796d7d4f64ef6a6f27082ec4c7f28c37096d1822b9087a0fa733ac6c469fe6a2deec97146934d1b13189426aeb4e8
 MISC metadata.xml 422 BLAKE2B 6c7e36778e4ecaafce86d11fa6e70a86c064c654de467a57f9b5d181d720bf0a90c02655131be794fc271f6664764fe79fb7e29df622cdad67cd69bf67c3d39c SHA512 41cfaa9753dba1b53c1a2fe0cba54c1bde6982180d96841c057f2a56ecbbe4000d702141ecef493ab3d1a80c53520363a28d0024ad2619b5642e740927c7e4f1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.90.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.90.ebuild
new file mode 100644
index 000000000000..656d0a4e757a
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.90.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index ebc5d9a45611..4ab25af0d434 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,4 +1,6 @@
 AUX kde-gtk-config-5.22.5-drop-gtk2-dep.patch 805 BLAKE2B 262b3d6e644b592d3323609e8958c189b217663a0e6653c82aad57ea85c266d068dd0d4166a2327c33a325fc251549a8eee2c26a45a8fd21800f14a0e2b05ef6 SHA512 8e418333f286f7eb74a6bea42d6c63794ff58520c17b51a0eb5436d753f8af727515db45e12d07bb393a2e0ea4b8562830f6e0708bd0eb2285c8f839e025591c
 DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
+DIST kde-gtk-config-5.22.90.tar.xz 71000 BLAKE2B 7472625bfe7ae1a5b13b6d17d4480d63afec98591800b164b47b9ed46ccf63dd85ed683cffa41d3239c2dace12cc09698588885059aa035fa5dd34d595f632bc SHA512 0171f8c3e31bc08099912fffc6f2d8d9cf1cc4e89044f1751587ec3e13a1199465d970aafe17318fed55f233ccaad5bc91e402ba9496191fa0cc6130e6987c8c
 EBUILD kde-gtk-config-5.22.5.ebuild 1341 BLAKE2B a9c51e830b7d0bfbcdf05d81c624c6e405f477562ddeb4d7987f1748995e635f16c664452e610219007ce3036bb3a58b8a28b0787d8aba1735227693b604a599 SHA512 f116deb44930d8db0aec3d667a86dec2d7934aff31c19baba87084531da6faa48e75dc5ac3b4ef2a71740d9c107f3fbc2cb7a801983140bce63ab16f0ccf7b63
+EBUILD kde-gtk-config-5.22.90.ebuild 1284 BLAKE2B 64c73ba8c29aee496bac4fe68de51518fbc109d79fb2e50133ebd6903e8711ec8a51a719790cfbebe49d3a12d9ed284d05e536c6d78a73464df80bf34a5154fe SHA512 6ed80095644a04078857a77e9cd9f363767ef08a8f99fb896fecb2cc6c3327f1548eea734c72841e12a2fee007c5ccc0a4cf70e8cc22a207975153af2191b4cb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.90.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.90.ebuild
new file mode 100644
index 000000000000..8ebcf8b1fc84
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.90.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/xsettingsd
+"
+BDEPEND="
+	dev-lang/sassc
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 51ce8c21b270..ff30eb0ead2d 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,5 @@
 DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
+DIST kdecoration-5.22.90.tar.xz 47344 BLAKE2B 1e306c4b264faefb12b7ef18e484d7cb9b62dfed568bc8aa1bf892045bb0acdd049b1b532f3b6b5d9996bb8f70574c4798fd9683cd75b83285f720eb44af1ccf SHA512 785f56faaf752cf0c1cfcb78796875c15a3aa0fa58e816350dbd31877cf96f87528bda3317990d82e750dd0adf999941ea18918225a0a75e4e786c4f4be18354
 EBUILD kdecoration-5.22.5.ebuild 486 BLAKE2B b609acd134352da7a52ae9a77d763e3c2fa351ab3a82af283360746598bbe3ec28c7e22982efec484a5e7b8ddec3839797b5064afe3b738ec065671fe7ee36bb SHA512 50f491d2e9ac866577b8f906a0e766ed8f91fe7c8e563bb06485c3b987dd63d7c6840d3c80138199ac1d0c28c008a310aecd37124f255db3504961cb3a562105
+EBUILD kdecoration-5.22.90.ebuild 489 BLAKE2B b8a1ca515c11f956d4a29562d2ee3964b55b9b251721b4fe657319c98f19ad42e7c517c601f182c1f1e36fcdb58829b01dffcdc4ce6c1ec07f6ab1c834452383 SHA512 d72f5df2b3ba93df37de2fb3d7b286af32c8bbee884b1d650fe42c5be546c12d412612ab48384bf55ee63a30c1e677f92553a7b9c8bf789cf5ca99163426635e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.90.ebuild b/kde-plasma/kdecoration/kdecoration-5.22.90.ebuild
new file mode 100644
index 000000000000..be4395b9d913
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.22.90.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 4b5724f14dce..711e8478a414 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,4 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
+DIST kdeplasma-addons-5.22.90.tar.xz 619668 BLAKE2B 0ac1dce2d6319c1a88885b7c5cfa74451686d64b152c7f5ee4054e5a6ada7038669730cd940d8cb042512f20ba7bfa3291ff1edaf67105dbbf7fd5520d618ef1 SHA512 71fc62f79267779c41c4b5a561ee2787812902f6718c96c841c662348f282d935eeb90ed11023224293eeb5375575513c8294b3edaf8aa2ece8b15a7fd397597
 EBUILD kdeplasma-addons-5.22.5.ebuild 2084 BLAKE2B 29a9f5295f402b6c3220aa25e3fb249aa797bd509d31ab855082b1d0434619f6b9dfde61d06ed62ffc4d7402e0a6d6b8c9b6145929d3085dbfdba0f406a4dfe2 SHA512 7aa1e811550548f3d3a550bc1325c4c5ae2b9b7aaeee4b117c78701083380168faae27bc84fc4c83623ef59ad0d2bf8a9c4a0a225642268a31e5e669401fe2c7
+EBUILD kdeplasma-addons-5.22.90.ebuild 1912 BLAKE2B d8af3d1a19e434fdcaee6f10ac04d60ba612e7863f3fbc63817439ca8efc9715aca64e47041eaf580060150a42efb669763f21e40fa4716113acee4e7eef8f41 SHA512 d7c21dd3b6e8289a4ecea9503e587e0014b4b3e81cd43843a17cebe7b0451e0a3abf96c56fcd3156e3799af8a29eae1d6d512dc23a8404d560375d497aabfd74
 MISC metadata.xml 636 BLAKE2B c58a6f828b6e74e39343a6bb50c4563dac6615236d18ff1e81d6dc4de6a204e089886bd5ca8394242bb03860832edede323071721bdec55bd447247fe2c04f86 SHA512 af527fa0329ce0f9c61bd9f01d56389a455aa8ab72bcb32f8d8f6ef91dac27d91710d4347e92d2d8b414a91755c1015cf700849286f6ccbf8416ce00dcefea09
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.90.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.90.ebuild
new file mode 100644
index 000000000000..87182ab6828a
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.90.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 58214f1c9074..d85a744b88bf 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,5 @@
 DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
+DIST kgamma5-5.22.90.tar.xz 83164 BLAKE2B 2c173689984badb2b6369fe47a3140a0a4a5274eb6b8b83d845d140339a8b99553b209512cef674c25d96ac02778be7894403767ad044455c2af1837cbb30421 SHA512 9783b6ecef16dd1d29ac4c5df3e749b48082800c8349b4d43779e3fe3edd053a3f4b7a7e57fbb929d3f9fb3c3bce9ca151bc0a4c7898ffa7dd24a2c916a4aa72
 EBUILD kgamma-5.22.5.ebuild 684 BLAKE2B 4635ec9f686d2cedafa99e29fa17150df94cd00d61b9b356b6ad00e1b2b05c8ffc363398258d470a94d0ff4832b8d823c53cd0bd7b007958d988a83cb3b5d801 SHA512 ad14db94e63fab5a379a476935bacfb54f434d95982fe65acf8b6ff549aff4ea1e865558dbef7a69ff822777b1711ed8e27453b25babd1a69f0ca9edb78b4e22
+EBUILD kgamma-5.22.90.ebuild 687 BLAKE2B 10b298c90f672da962eb04c6f34742938db0652bbbe24d1e7f496dfe0d14f2ff19132c165f954e012a6c55d2eb45bd89ae28c9f1491aeff8e3ae891723490731 SHA512 3be1930d55c231fceed958bef6abcffb09ef8e5ec88c1177996045da184b4874f314234681b81715da0cdd8ff1b456f77121bd56b9d7b4d1ab00721d18688854
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kgamma/kgamma-5.22.90.ebuild b/kde-plasma/kgamma/kgamma-5.22.90.ebuild
new file mode 100644
index 000000000000..9e840b337945
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.22.90.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index b288ecec0bb4..507b9bdc33c7 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,5 @@
 DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
+DIST khotkeys-5.22.90.tar.xz 1850896 BLAKE2B 52e37e59975538a3e4ce0e27e8dfd92b3421f86d98863b9749f68cb1d16bf3860f4912db324b20375602f581dd03d571309c39163e14e6018e4d47a5cce698e5 SHA512 cde32b2009ddf2c7bcf0506f32e8aaf1764f15b65065438bdd85c1989d892d7bfd32e85c32c0e01aa31a4d9ac599e9eb0d0fc80310698b85e8bfdcbe919f4e85
 EBUILD khotkeys-5.22.5.ebuild 1353 BLAKE2B 31ff0c5515ee7828310174c85c796ad99e568515de45a39a8669fd3b59df12d45744ea71618d6566ca6dafa6238adeabd7c2ac20413df8e5170197efbeff5d22 SHA512 b1875e9618b2dcfb3b182b4c1f0850a9f38b6d010a835dad44a91ec82ffd73e4a1df529a65d9e30b3f8b1ed09a662881aff56c38f57712241f1c3d4de9d37434
+EBUILD khotkeys-5.22.90.ebuild 1356 BLAKE2B 6cb4a8fa5f357542aa61912daab29f593d1ba0962d3423e29e08d93b1604b3a4edc60ba29a91d8db3efd36c2b7285a2eb2baed7e693f7b20e69965965fd9fa3c SHA512 3dd469944a0e56bf68619367403a7f8b936d0c3aa419a2cd6bedf00f94dde5f3cec6134a1b0856b81973a298a7859d1729d9a4c31ef1b9a38f4515483d5188fa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.90.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.90.ebuild
new file mode 100644
index 000000000000..97b3c8d71f60
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.22.90.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 5433f3e9a28a..71c34581e21f 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,5 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
+DIST kinfocenter-5.22.90.tar.xz 1156180 BLAKE2B 2cda67467328a3df1f04778f5a7aa9e1cae347e91d8318f42417ce5950e60774fb36eeae4209db933014cea39cf5edfd31b65281473b072b53f960b8978817c3 SHA512 fd7bfbdbfa363134c16d0787963291fcdaccda1b8a9530c4112c86ea4513c40d2295e9c768239efdcda51a716a74662e673f06da893eceaa34bd405ccf23704c
 EBUILD kinfocenter-5.22.5.ebuild 2640 BLAKE2B 7c9240900fab2677818ef21f7ed7f467c1b39bc8db8c1fe777f88914f199a2e8609df176c17b2348e331ea8261ba7cc937c4ebb37fcc9ffa9e11750425cdf8cf SHA512 d2bf9570ffb7f759c96d4c42de3cf46ba6061854b9606740fe7c2be3596ddfc4a47e07a9fc0c7ef6964e945738d5413c1e2e7d07812e87ff0b043a51275ecb6a
+EBUILD kinfocenter-5.22.90.ebuild 2786 BLAKE2B c3179132642e7d8b73ed908161e92e37c1870d141e03b251f93f672a03abc39af004a021f00d45e0fd099d91d8a9a3eb06b6c03d3f0ba0e38d9bb56a29c9a4d4 SHA512 805ee119251c41ccd63cac8565094e734fb457c35d3d21df9031444c93e114927a2182737e378b55ba9276d039ef8da87ede0db56bc14cfc4edc99df963b28b4
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.90.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.90.ebuild
new file mode 100644
index 000000000000..8c0e917a1080
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.90.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
+
+REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/libglvnd[X?]
+		!gles2-only? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	usb? ( virtual/libusb:1 )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl(+)]
+	)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/systemsettings-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package usb USB1)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+	)
+
+	if has_version "dev-qt/qtgui[gles2-only]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
+	fi
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
+		optfeature "advanced CPU information module" sys-apps/util-linux
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index f1121c36ccfa..6bc0a8b79dd9 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,5 @@
 DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
+DIST kmenuedit-5.22.90.tar.xz 900636 BLAKE2B f78132c2b5958f52a783889432b86a30d272b29852096bfd74e6d65f9a782a12b689668cbfdf1adc2fc929741bfb93f6b017b2ecad0a14b3c4c4f2e0ebf4c0a5 SHA512 2252d14c15c55272a630781aa2e7230d5d66f96ace1e166bc64e0250c729a475bb60c139eeb0b6283c78aaa7a0eeeebf6169bd11a9845f5bbd05ca64d3676b90
 EBUILD kmenuedit-5.22.5.ebuild 1067 BLAKE2B 2328aa3684ce5e813b90b50de576109b429823b54bfba1a2f41cdd7d34f36ffdad5723669cf50942580775d90cae596d0aa935bc36002888a3b66096c0c8bd56 SHA512 3e14178cfdb6b0e0dffb1b3d5e811fc196b4982d846273dfcbbacfcf9f300998e8c4a4b5b63c4410f430979a42b34fc5bbf18ae84ee7214d143088e6f866c52f
+EBUILD kmenuedit-5.22.90.ebuild 1070 BLAKE2B b0c664cbbbb05bf4518fbca916299848b24d12422b58a0e24a81afb7742fb0835aa1185443eb015bd4fba495530d1b3b2089a8a28dfbbdbc351afab8786dc6f3 SHA512 00aca2766299e0f01ccabc76b39f3083ac15dcc19390e872484cc085417cbee2af3e5cfb9e13d6e79691982cb363bb2b9572a2bc9d969b99213144561ce99ca2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.90.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.22.90.ebuild
new file mode 100644
index 000000000000..87a9cfbbd331
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.22.90.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 4c53e80a7eea..924cbc7d8068 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,5 @@
 DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
+DIST kscreen-5.22.90.tar.xz 131320 BLAKE2B 393c453b2f2a7c3d10c68720b159c5835b81d6373bdbb25902a1738842bd99330532443f5c09d0c2d558daee77a78fc0877587714673329f41bb4b58b13c230a SHA512 b131c8f87453cab7cf575772a690ea135fb67439bd139cfd6c15db2b82715b59eafe64e2930db9046c4d848f183c3bba63e4a7b62164712db5acb8a78701ced0
 EBUILD kscreen-5.22.5.ebuild 1230 BLAKE2B 3a48559a3b1ec7071c2af09f1b7677da852c32cd688d6e886f13fce59514686aa5a6618ab373d00adac9ae6d21f1c59d88e67ed9bbe82d444c16a938f70eeb87 SHA512 30cf35eb0bd7408c4edf2be138ebdd1ed36ecc2c7e3beefc681fad22141c4c36c255eb0c05e61abae48f1cc1118387912c69ade0c527d91ab2e0a6ec332737e4
+EBUILD kscreen-5.22.90.ebuild 1233 BLAKE2B 0ab3c034a013377588bb9ece116296b49f903d1795c27863ac0c97a34e897cf31b0326bd6227eaddaaf24d483c9aea62734df1e858155044ce7f4f6ef0bdb9f3 SHA512 a258f0f2266476375d4e910b63e4ee319114e1b265ad74ac5e305fe7aa0861d25b08f8b60136d051ec6a793d51a494d13c44b4e48c847ef1e181c3deee25c593
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/kscreen-5.22.90.ebuild b/kde-plasma/kscreen/kscreen-5.22.90.ebuild
new file mode 100644
index 000000000000..d90b37272cd1
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.22.90.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index abe14bbde5e1..489ef4dd410e 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,5 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
+DIST kscreenlocker-5.22.90.tar.xz 117276 BLAKE2B 43e7bbbd20c0c0dc00e450f808150678de324e48b0bd8a9dc7ce575c1d0e86281fec84280c2bbfa8b13e6295a8719e155267f0ac6aabe9ca7112058b71fd7eb6 SHA512 1c894f28a6585822d1b66de3e6c711f63581ea2fde2f2fb954bb5ef23c403fe12be13d3279db905d3b393728ecb96350c08b5293675c87e7eabb7014f40b59ac
 EBUILD kscreenlocker-5.22.5.ebuild 2263 BLAKE2B b61aab7b36993b2ad7fd0e02f58118a47f339f7be5fee412eff406c40b47bfc6cf2fb6b942f218962dbb3edc069f62b8deb74e964247dc34fd0d13343c855a0e SHA512 fdb4d5a984c7fb9ab3ae1730503ca3232239763d8608cd8d716440fb5d6c95b638c00d37594396ce9459f68d06ee135ff62d4cd5d1ae43366688c7bbb7345a41
+EBUILD kscreenlocker-5.22.90.ebuild 2266 BLAKE2B 8e992b572d848e3f4d3d8805b33f96e1dd579a7698752ca02ac7601161634aaa307fe83ca2e5087b9a1d211727d3a60febb2f50989aef29bf305cda0b6df619a SHA512 a0987917fc6d9ba233280eb2a1aa83b265763c660c31b29822323bf14e03843c3f2d38b7942902cad162bd5a2710a3c54256dbd3d73c942448facc2805d63983
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.90.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.90.ebuild
new file mode 100644
index 000000000000..0f53f43e33ae
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.22.90.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+pam"
+
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+BDEPEND="dev-util/wayland-scanner"
+
+src_prepare() {
+	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_install() {
+	ecm_src_install
+
+	if use pam; then
+		newpamd "${FILESDIR}/kde.pam" kde
+		newpamd "${FILESDIR}/kde-np.pam" kde-np
+	else
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 0ce1201ea5b5..30f7d752e5aa 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,4 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
+DIST ksshaskpass-5.22.90.tar.xz 24068 BLAKE2B 9d6b2d6806df0f43a274a3a18c135d5368a6ae83f77d131f73ee968a9e6e01e8da7c6b3c8652ec3cf338a8bc4d98c9999ad2a4e0f15dc001bf328c871fe2e3c1 SHA512 7c941eb2e8057a06ae9d7b99f40bebcb6b463c047d31647e305fdd5a01b1686a091650ff4804b8671cff2c7f38c5ed4137f98f314a785ce1c14adadae6da756a
 EBUILD ksshaskpass-5.22.5.ebuild 1440 BLAKE2B bd31463f01b5247c0b832fc75df87992c1ce72f9cc88b85b1cbc9add2bf8ba34489d2e0f30e03e0220a7bbdf8eb235ab79df8834f901f0514cbd7c9c2b7c8eff SHA512 8220f2d31c415d7abe82f0952ed98e0b248fbf3e5f8887b93aecd1efb2632ad6f7f5da547ff49cf681d44a63a26bb1dc7e40683c03b4113038d60b36dd2becb4
+EBUILD ksshaskpass-5.22.90.ebuild 1443 BLAKE2B 9cde742f021639b9556046bb2d871369b63ccbf688ed6c85250343aaa2687015ccb53e97d38eff2138a4d472a2a471f14333813f6f4b423df25e3a0a0d3da2f3 SHA512 744a1b76c1a7339b35c11f99a54c04ac1c1da9378384d30c2fb6a80b5c896499cddbc8fcd9433cb71cff7c38e36fcd09dd124142eb3967f9c9cfd14e524ffde7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.90.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.22.90.ebuild
new file mode 100644
index 000000000000..618cd3f1026f
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.22.90.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
+}
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 835165d987b6..bd1ce1eab281 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,3 +1,5 @@
 DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
+DIST ksystemstats-5.22.90.tar.xz 89284 BLAKE2B 8fa2b8af6b7b85c17e76fa3b277d4e29c38310f34e505e12dcbac1c0977b950f9483ee879260e58b9f9014ca06da23180fbabba9eba915d053e3b5b0555175e3 SHA512 ac40be5620a7c00a7d5c0249245c678c93af71e0bfd6270d7e8f83a5c2390ca90dbe75421cb7159c1e3da6dc26214a7f801b190462b117a70662adfa8017dc88
 EBUILD ksystemstats-5.22.5.ebuild 1119 BLAKE2B 349c0061be78373396718a4e4f4ecb480ef74f517e80bf85b9164745ba0e592fcabe9d0d310608c6722a83870efc6ab0390a6633ce173f543f7f54d0d0ec6888 SHA512 dcce49a1e3c005e61a74318750a5e21ddcf77e5a46fd7f4eecb8b465b044b19eaabfbfe431b63470fa1dd529128d04236dd7bbbf1990d6614da603328e0bd36d
+EBUILD ksystemstats-5.22.90.ebuild 1048 BLAKE2B 7c229d0d29900a4994daf081cf036f58ef8e415e9fd040e0161cfbee0d5d5cb7f441db4a24a50a66c45c611594ef28c1e9f923c8945097741b778683562669f2 SHA512 301715f2a834f874211f7309f492accaa28cff22d6ce4c5385ef3960593c6595c06abd91321f42e6bc2fc07446b603671b109f4ab1ffb5716be2440e44ba8fa7
 MISC metadata.xml 467 BLAKE2B 61ac6047a4cb3d54d26f963b75c94022a501fd1b1b9ee227cce16023fb40b101ba40c6ff99e02c5913137b191bd9c516249387b0310f6558c9800b10f52e780a SHA512 0ad261d9d2e7a45d01b06a15270346bf169a3a8d827b409616e3801e4357910fe196813dd87ff4bea34e61cce3931443d9b617ef532230448f54048d1ed84f4a
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.90.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.22.90.ebuild
new file mode 100644
index 000000000000..5c363a1d417c
--- /dev/null
+++ b/kde-plasma/ksystemstats/ksystemstats-5.22.90.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin-based system monitoring daemon"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	virtual/libudev:=
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 937585f5afda..a7fe3580337a 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,5 @@
 DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
+DIST kwallet-pam-5.22.90.tar.xz 20116 BLAKE2B 9ad8a89f9ed9adbdb93532bf555d22789c67905dd8c8b985c03a1472d0343be9cc26a73eee3dba140a609b50ce1fac85debe8c8bc6a8faed34fd85024ff0ad0d SHA512 c773af7ac2ecfe3e78c6ca185684ef0f91de85b94d808e1c683600cecfa9385275472673daa82c5e8fcd8648f72e14f60491581d0025df834d60da6b24e4a95d
 EBUILD kwallet-pam-5.22.5.ebuild 738 BLAKE2B 81da3c107bcdad60688be474718d174329f32bd92d3f61fbb63b8b385eb8a33b0a71496c1c8e7e8411b6891d45acce7b0fe0deb4537d2ac713809fd413a175d6 SHA512 97fce9429137a2cfb807397e34dc99fa23b879977285adb22ba046651acfd5cb140e1cf96f6fd0ee6caa75d350a854a23f633f255a6fa85acf9283818fe69258
+EBUILD kwallet-pam-5.22.90.ebuild 741 BLAKE2B 0194cd9dacc1fd1b848dd92cbaa2ff1a7187abbd76002d570f88c0ba4d67396416ee24957c6e530929f923126100d218b249f6cb8f7399bf857114d83c99af19 SHA512 71c3e2c6f6ed674ac7c0d6699959bdb600b6bf7f239261e31bd507ff7b14018d991c1f25498f89dbd58509103d3fddfdbb50a1eec8793a46bb44135b8b3939b3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.90.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.90.ebuild
new file mode 100644
index 000000000000..bc2a2dd88454
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.22.90.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 855604618ee8..c97ba3127410 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
+DIST kwayland-integration-5.22.90.tar.xz 24164 BLAKE2B 6be1c6558ead14b0e892e579f52b85d0379deca89da80d1e0add3669750bd59e478a65dfd71010824ce0dc2aa1e32b57ccca90eeaf07defc342768efa434e5d9 SHA512 f442125728966bfe09fda859b642af71ac0d33526391828d98854d372a4d82f69c6b2f844ac591de539f72f25fefadd5b0d7c714e5d283f57dea0bbb05ef39cf
 EBUILD kwayland-integration-5.22.5.ebuild 704 BLAKE2B e0647cfe117a55aea8eaf9725bac8ac906109b2a0041eb56bd0dea4abe17030651a66d59d8ad9ea71eb5ccd7d404854217016651b6ffcdf20b9bc74e85f9a89b SHA512 9a17512299f866f7d15f5f403a2f83707ac28a203f91f61e7dd873472d1a7d17f3fb330cc5e4f74a715b6cf970c45a291366dc9cbba7491129f8367e15844108
+EBUILD kwayland-integration-5.22.90.ebuild 1017 BLAKE2B 7466406ca996f123015d2de0d9e9ecc29cf5bf9bc5931c56fc9941265b1d89c87b78b45a686d59ffe3161483638301232cbf8f1c577dacf46957389c91d07415 SHA512 5e03fa027c46eff70c89349e27cfcccc5c9e089804a19011cc6e7a9659b8bdfefb76386d7bcf4f4c526f1d50c68a40de6d0471c9af8394c954634d7a9b4419fb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.90.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.90.ebuild
new file mode 100644
index 000000000000..09e3b1f2b59a
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.22.90.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 668872
+
+# slot op: includes Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+DEPEND="
+	>=dev-libs/wayland-1.15
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 3871fb8903ba..510539630818 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
+DIST kwayland-server-5.22.90.tar.xz 217352 BLAKE2B 075925906c3436de2fbbf19cb2549af79d139a27f77c405bf82b4da96d5238675722055475a7b542100dc4b93deb3fe13220f38198e2d2a1fb9c91f08b72cad4 SHA512 470718519c6aec29a8bc5289a76bd1bef78556f72e5df2326e0d6e7aa76278746e83e631b5a5169f51d686c4854aa6bbe9ca7d88bc8fcfac78210d87806d2023
 EBUILD kwayland-server-5.22.5.ebuild 822 BLAKE2B f68d08b7f81cc6153d2c0b86498e44393925787449ce2657ce105273bd3f4ba58f38d9585e86a9f9b859ae22d39a54fdbf142aaccbe8b39d0587a1c7168134cf SHA512 bf5e072d522be518a0360607b5ebc47f24b423ab02d498b46db98b7e21af9e24880e9456516be75ea988644316edd5c011cd7115fbf6566b138de4893709df95
+EBUILD kwayland-server-5.22.90.ebuild 825 BLAKE2B c6a2a8e061cf42e369036e7d9f91d124b1cf5319c1baca70a3e3db96eaea05a49e2f26fa6ad508aae57307ee78b634f412fa32da62885a1dc14877e9020f5a24 SHA512 4f1836a915e46afb42cef728972200d64d492459c3ce145a4dede54ca964c6b54ae7435575efd7f305909f2e66fc1d6e8ae04d18dea5e5cb037b0963fc0fddac
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.90.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.90.ebuild
new file mode 100644
index 000000000000..6badc119f3d9
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.22.90.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Wayland Server Components built on KDE Frameworks"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/wayland-1.19.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.3.0
+	>=dev-libs/wayland-protocols-1.21
+"
+BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 8c03189566ea..04458303bccd 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,5 +1,7 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 AUX kwin-5.22.5-libglvnd-1.3.4.patch 2254 BLAKE2B 3a907856afa816dee53b50e17e2c3ba923c22fae8c9cb644a0b402d350bf9f2701c774daf8dbc45d9d9dac4afdd6e96f6a06ac401be890c3981cff976c61fcb1 SHA512 a71d7480b34503813724a358d01a8e0e8c85ad14e4d1cb3b7c0afb9ff2543552b8e8e49562e8ec81ff1fdeb87ca406fdb4a33e18815e2664143c23a69838831e
 DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
+DIST kwin-5.22.90.tar.xz 6327028 BLAKE2B 273c7a92225136e7c86e8249be0c0200cab2c9e90fcc64b24e3c4450580600ba53ace32da0a7409b7c3f7efe0985f12ed90229b524377511d95aae6d4d7841ac SHA512 89dcb08f00a130ff5498f641993aec3997b9ff95ffcc8749cd4d3bfacc204ac9e83f6a9653f14fa0743276cefc02220ac96e898c653c2f18261a2a5a0e3fffea
 EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9
+EBUILD kwin-5.22.90.ebuild 4002 BLAKE2B 10cf4368c6af39fa6e506e76aed1314c2e391fc8dd30aa1e5a1baf17b43099b6a566926118fcdb289c5d6ee14cc87a803b7af46994614fb76ee064b03533e992 SHA512 035baf1bbc507ef9eea7d57467462bbe136ee1d104cb373424c56854f1ee674d6e78feba88798499c4ebe1c4abc62a57efe69823009690a5f42d8922e7ca99f1
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/kwin-5.22.90.ebuild b/kde-plasma/kwin/kwin-5.22.90.ebuild
new file mode 100644
index 000000000000..f745210aba18
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.22.90.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.86.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 ~riscv ~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/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-21.1[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/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 71384bb3a788..6de33da31c1f 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,5 @@
 DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
+DIST kwrited-5.22.90.tar.xz 20512 BLAKE2B fc5221c7af8075b4339527823fcc48a1694609cdcfa321f956ebe62279dcfa77c40e7590839cbc7c11480808f73dcc53a400f53700c2657dab5efe948aa50ac5 SHA512 214b71e8e3cc0bbb335ad0781c9741a3bc3e77ea1c1da2f468c8f2cc170315054f755fc2582e2c0bd60f391646c869efdcdb9299673bc22a1ae77299e2c070ed
 EBUILD kwrited-5.22.5.ebuild 599 BLAKE2B 466e79dfdad4de784707f7b97f2c76ea06487d68e18d7cc9dd561b6aebe518ed7052d6a873356901d092db0d0f04de44cab3dd4681e6acdcf12079c88bf899be SHA512 3c4d91b14c990354325f6e2d50b0e05564f9e0ed8cde67ca2a1a5b0efb46e10573c17a260bf17c241bc60c15e65c8a46469e87b1392ab68786d86e2b9487f474
+EBUILD kwrited-5.22.90.ebuild 602 BLAKE2B c594ac61715c4ac0837b48ebce0230a6afd69d303561fed723d66f6f4cd3b3c3be35bf499522ca816bcf27b7e69599eba7740f4725b369b187cc4ac0cde5b13c SHA512 8ed0c3a91c14250df05a61f87a39769ee806693677a032844f4ed9a85a1de7e4066e5282f2235f2a68dd3b422b7583f15dc504ff9dff1e5badce49b1ffb87aae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwrited/kwrited-5.22.90.ebuild b/kde-plasma/kwrited/kwrited-5.22.90.ebuild
new file mode 100644
index 000000000000..aa1c51796c7d
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.22.90.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 363aa6bafbc9..c9c17cfb8453 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,3 +1,5 @@
 DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
+DIST layer-shell-qt-5.22.90.tar.xz 17768 BLAKE2B d8e2af3a28ac52433611677d011a9da0cf05833c1f3aeab8f0875dc98816d74cf1800c97aa47db40da597f22c8b4dce76815be658cfac93bbfc4c343b777de6c SHA512 0ff0387aed2e3f7cf2df3d95a47493b50bf9816c2a620228465d4f01a19fad50fc78146eb500455d37e84e260e14f516dee1e4b822c2efb4c7617f1b3b60c146
 EBUILD layer-shell-qt-5.22.5.ebuild 598 BLAKE2B e50a1637b3ad76653d089619378a634ed844d88d4f32ef7815fc9aa65932dee5053348914944269aace0b44cd6d5ead91d26434244f09bf301af5d901f69b136 SHA512 fded01fc4ac2adf39126a6a4a1672ff164df5f8cf99df4a4435ae96d8761a38f24e92b6b118193d804956c8a6244682bb0e5839eef656c1d547d0f7ddb573826
+EBUILD layer-shell-qt-5.22.90.ebuild 725 BLAKE2B 36aae9ac924d5b2079013a677af44e7b41815969f156f97c64f2c4aec07910294d64514920bfb66d11101c6ac133b7d821617d6e8fe6899587930a65bdc2eb0b SHA512 f9830e2436415fe2eb6e9ddc2ab2480e383fdf0051933e3cd7adc449e006ebd2baa3c7a09dcccf3b7d157cd7010f538376ec11514b81651402a708527420fe58
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
new file mode 100644
index 000000000000..e70d7db79a1f
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.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 ~riscv ~x86"
+IUSE=""
+
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=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/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index baef97c5cbd8..69b67104fad5 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,5 @@
 DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
+DIST libkscreen-5.22.90.tar.xz 97860 BLAKE2B c37c2cf5597bf65b90bd0726d69df67f718988c3a9887c4c6de8d6b5cd74b49d7d765f5e56888cc645989dcd80a07a93647509287212acc1f7f3516b3cf09dcc SHA512 dc01540b4f7ad7e271bc02a3b3fc1cf9098ffa2639463930488aacbd644f08a3d8adc932a1dc3697815c9c7ba1c0ed4ed122768bdaf8238d16be75f32f6e1b37
 EBUILD libkscreen-5.22.5.ebuild 652 BLAKE2B adf64ade89ad9189df3cb429cefad5e86e6522898c22c75c56461393b05a10064f583d5964e159ee17abd6f5d909b9e661adfcfd59679e820f658ee1ed3401ad SHA512 6161c7319d3b0707380aa467775a294416f5075d857a028e513d2e8e01eb4dca8c9325c40ba93b2c4df846243ee2cfc60adad4ce5322973d90bc9b3439edd352
+EBUILD libkscreen-5.22.90.ebuild 655 BLAKE2B 9b085cbbcadd214d9f3dd2705973bddc0c31f862a5ebaf3c4f34ab38b179c843eaca0f7357de6662a72726a4a6fc2724cf91ff9b5d9f1f1a42a5711a07e9cb05 SHA512 460040c26869449e936dda73d629ecf6393fd8fadb94565619c7eccf19592af2533ea2357d829b0ba9d932d1d519f84f8683c7ec5a170cce7df53777092f4476
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.90.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.90.ebuild
new file mode 100644
index 000000000000..b240516c9862
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.22.90.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running session
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index c6f68d1581b4..d7994df21980 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,4 +1,7 @@
 AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
+AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
 DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
+DIST libksysguard-5.22.90.tar.xz 768516 BLAKE2B d50df60b9e2b2a09ea951d9ee2fd8dc89f9df85f23e2e1c1d8af23f2df719ad6f0224739cf7ec95745c6e05e1ae652ea5e93bbfde1cecfc15b9e02ba821a2d25 SHA512 5c586c24a64ebd05b4768ae3713e852ec8cbb9517b799b37bed56284cf4f6daafcb9ea9f9c0f53392f56645c80ccb1763bbac1c43cdc8344239a2da38fd550a9
 EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
+EBUILD libksysguard-5.22.90.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
new file mode 100644
index 000000000000..c2fcb9551d2e
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
@@ -0,0 +1,28 @@
+From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 7 Sep 2021 16:08:30 +0200
+Subject: [PATCH] Gentooify message about QtWebEngineWidgets
+
+Translations can not be provided for this.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ processui/scripting.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index 1c35f72..7065cbe 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
+ #else
+     QMessageBox::critical(this,
+                           i18n("QtWebEngineWidgets not available"),
+-                          i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
++                          i18n("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
+ #endif
+ }
+ #if WEBENGINE_SCRIPTING_ENABLED
+-- 
+2.33.0
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild
new file mode 100644
index 000000000000..1a8b55594efa
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.86.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="webengine X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	sys-libs/zlib
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+	!<kde-plasma/plasma-workspace-5.18.80:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebChannel)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 1ba63a6c89b3..c00240643377 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,4 +1,7 @@
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
+AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
 EBUILD libkworkspace-5.22.5.ebuild 1323 BLAKE2B 9c12d79979232dd53793878411e837800219b0da9a762aae21abcb4c7b6a0d7c0dca0e18f464a7607f75f4a7145c01acef15720730dd6599acd1b02ea6e10fe8 SHA512 62a495d6647173f8845e549b749f64b0b93136f1535a7943417e55bff603d9c7fc3259ec32e2901018332ad00145e7b8708864ebc1f795bb35bc63846ffebe37
+EBUILD libkworkspace-5.22.90.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
new file mode 100644
index 000000000000..971dc941d0fc
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
@@ -0,0 +1,108 @@
+From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 015c5181f..0aa635e11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.16)
++
++    set(QT_MIN_VERSION "5.15.0")
++    set(KF5_MIN_VERSION "5.82.0")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(ECMMarkNonGuiExecutable)
++    include(CMakePackageConfigHelpers)
++    include(WriteBasicConfigVersionFile)
++    include(CheckIncludeFiles)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(KDEPackageAppTemplates)
++    include(ECMMarkAsTest)
++    include(GenerateExportHeader)
++
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem)
++
++    find_package(KWinDBusInterface CONFIG REQUIRED)
++    find_package(KScreenLocker 5.13.80 REQUIRED)
++    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++    find_package(X11)
++    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++                URL "http://www.x.org"
++                TYPE OPTIONAL
++                PURPOSE "Required for X11 support")
++
++    if(X11_FOUND)
++        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++        set(HAVE_X11 1)
++    endif()
++
++    if(BUILD_TESTING)
++        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++    endif()
++
++    check_include_files(unistd.h HAVE_UNISTD_H)
++
++    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+                         kworkspace.cpp
+@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
+ 
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+ qt_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
+ 
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+ 
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -98,3 +158,8 @@ if(BUILD_TESTING)
+     add_subdirectory(autotests)
+     add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.31.1
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild
new file mode 100644
index 000000000000..aacfb311c9ba
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+
+S="${S}/${PN}"
+
+src_prepare() {
+	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
+		rm -rf po/*/docs || die
+		cp -a ../po ./ || die
+	fi
+
+	eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		ki18n_install(po)
+	_EOF_
+
+	ecm_src_prepare
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 673fd2a481e4..3bb0ab950e50 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,5 @@
 DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
+DIST milou-5.22.90.tar.xz 47896 BLAKE2B 11044ab6aa5f2ee378d517d3d25967389e5c64c3fbba5936c918bd2f62666b72d083aa69d1b8f06ff2cb1adb00bf0e31404fabfe77724f2c2d28265429f873e5 SHA512 e8e34c8f99695b864bb52b2ffa94dc49d4a2c8da81ac2e4cfb280e3d607f465feaa5a5c7fdd2bf5636595c3a5c84cd01d93a418abd55be17e08802a1727c5162
 EBUILD milou-5.22.5.ebuild 830 BLAKE2B 324e7db8cdd4d87bc1604daeacfed77107009f9838855b832792b3183256cefca6c62142047680e169fddc41f1cad617a601fa098c367d201af896925c69dcd0 SHA512 e835203dd8d8d215dca1faa0c6ba3d132a3e2db48c20347906160400e039d17390767284070ba3e9b80701595cb24c9d8b71d9e8db563c911913b475f2831762
+EBUILD milou-5.22.90.ebuild 833 BLAKE2B 4b615f068454fea67590730832bb06fb1904c578a4ce95b6dfe5bfceae9e6082ddd5543c7678ba0281f4032b37e491085f20d65a22117d74b15dd1d59ce4bb57 SHA512 7196394085e2ee49ec035cb8485736919186329ff069107a7144cbfaaac5afd9c37cc50a721f5b7252451bb925ec62020261a3edb08e8f41352f6b57848a243d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/milou/milou-5.22.90.ebuild b/kde-plasma/milou/milou-5.22.90.ebuild
new file mode 100644
index 000000000000..bfa5e8e64e63
--- /dev/null
+++ b/kde-plasma/milou/milou-5.22.90.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index ee8eeea2976f..aa3730445d8e 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,5 @@
 DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
+DIST oxygen-5.22.90.tar.xz 4610464 BLAKE2B 6e60c6aed59401f5e63b0129d7a346d51764c29b8826775fe7e3fc1ea9ad4d4c55fd014a9f6abad9828dd233b3d9bc51085eb32dbaebbcf84487085e1b445b2f SHA512 81c1e71ed820e2998d546d108e62d269d61f542e2fa5cced839721723ae222e219797ad26622a9b84493100b898078e910e5b5c6bcae03f48c41ae9be170729d
 EBUILD oxygen-5.22.5.ebuild 1370 BLAKE2B 657951f674910aec6346e3e42f09709e65adeb4e947c5a0e755a0eca3fb50148177db7812a7d6506b3eaf904fe71d00b773a2b8057ed3c81d8f0a1a50c2a41e3 SHA512 59a49e5933c8c1a3622163ca2295083efd38c89348fa4503ee78d8db005dad28ffd49c16d8a9a4aebcbd8f3f87c62832ebbe0df57362679e0a9d51b647e630f9
+EBUILD oxygen-5.22.90.ebuild 1373 BLAKE2B 943f67c8008c8ad3dd4ea9f9c274735d2a973ad265333f8fca40ac054a86de687f12cba7294828319ba836e4a64286458f3c5973c9ffebaf6aff0d2b8dfb73d0 SHA512 27b98fefdf1f655428b94c198fde0451a5d236ab01b507be9fc278fa5910262315893f8e1c8c258fbf9c4f697daaf5f69f7d73208a6c6a622a8285f7b6d0ed84
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/oxygen-5.22.90.ebuild b/kde-plasma/oxygen/oxygen-5.22.90.ebuild
new file mode 100644
index 000000000000..3123e9e382a9
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.22.90.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/libxcb
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-desktop-5.16.80
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 04f00aa7d7ac..99a74d057e84 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
+DIST plasma-browser-integration-5.22.90.tar.xz 219512 BLAKE2B 86231665eceff465dd02bb8d5b6878aefcbd72cf7b5cdd52bc4b1e695a4b64a1da33bb00a84fe7e08f62d948565f4619bef9238e488e775bad690a219b8edad7 SHA512 63407dad52741b8646aab7a666029d1c3cf6b782cd8390306ee2023577b364056ba58f81de61d93463a183167120d7cba887dbcae20da9ee0c340bebc0dd0862
 EBUILD plasma-browser-integration-5.22.5.ebuild 1123 BLAKE2B 7506e1e1864f26192f29af82b8d058c8a0c59077692d5ecaa317761b73205ab83e498d6b46436a69f76714680a42a5c73cf637538e357318005d4f8c25d58f18 SHA512 6260299785df3d8ea1cc2d5c575849586d6ebc77f92f22c6692e1daa65aa5ae63afae1cceb5062dc6b410ec02634db98762cb7daedea906ea99182bcb7636bd5
+EBUILD plasma-browser-integration-5.22.90.ebuild 1126 BLAKE2B 001c0911ba75cc6015388bc96a1fd821ea9a90efdcdc7e12d860669d13fe739ec7fb2b3cf15c3c740a4c19a58424aed5eb3735a975262d7917b0b7abfc405d33 SHA512 d64296a3dc50b22c9863bbb3bd9d1b6d74138e5c17a59164b4e1f4b5bbb07b959cb7d889a8d8c1fd11959e74fdd54f2627123fda67ec94c73fdab1600215279e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.90.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.90.ebuild
new file mode 100644
index 000000000000..83cbeb103590
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.90.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index fae0d971546c..d6d2c037f762 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,6 @@
 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
+DIST plasma-desktop-5.22.90.tar.xz 15770628 BLAKE2B 473dbd7c77a79d8c626df737a3d80760cd086d301f0f4e8485634eb17a0b30334b5b6b0c0e0aed29e10fa7f2cf0d07e8e125c0eaa0e61be27343ea668fb92309 SHA512 7942075cfb1b6d9457bbe986b1300fd2aa004dffea703f648125fb63a171f085d1537d1e12a2d33203690b47b0a61e0dee5c78ccb03fe4c706edc74ef6b0ff8b
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.22.5.ebuild 5429 BLAKE2B 979ca198a875cc14e82a5f1acc21f5c61b595febefae0ae63f107498f7267919dfb4c7d8821aeccf615c2d39ddacd2f17b0bce1bb5c1cc0fb3fdb0edbcc792b0 SHA512 cb2212107565b78a19b580178e4b9c7dfff84cc095d0ac6d291c9003de86d0adc7def98378e3a07a7d4106e5c83f62690baa5075592bbecae2b1d523f17dd98b
+EBUILD plasma-desktop-5.22.90.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild
new file mode 100644
index 000000000000..1de5918b5983
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	virtual/libcrypt:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
+	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/user-manager
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	kaccounts? ( net-libs/signon-oauth2 )
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use policykit; then
+		ecm_punt_bogus_dep KF5 Wallet
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 60fb436c4004..1aaeb1e6e351 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
+DIST plasma-disks-5.22.90.tar.xz 86324 BLAKE2B b290b2f42011c8ce6e6eb36ea2535a67b12f80fa61079123c6d03c0df6778c2e572b49b79ba1a1b18e8029469ebd5b19445866812d3fea1ce8a0ec34f06cc0e2 SHA512 129e368c1feb358f8826505b2d9c68e177837c3c475e3b6c42ca72d7bda2c635e07f848fe3f03759bc739a853a9dc5b9f773061fd228405078cd00138fd6afa5
 EBUILD plasma-disks-5.22.5.ebuild 1037 BLAKE2B 3574937dac2667f741c5c91623b88ad653674de6961abdbb4f11d0faa426d4265d10e34da860c0ebca8681d39c94fd347e60299fa77fc9586cbdb662604688d0 SHA512 41da89c2dcf85f48a9c241f607e805bdb8958489e631ee1c31e0f5becbac7540904c69066c53900e7ac87e1030c7293432541c91cdeedfba2d565a0f17693b21
+EBUILD plasma-disks-5.22.90.ebuild 1040 BLAKE2B 3ca014da0abed7652d474b518afdee1cb70f6c74102c5eaec81c622683176a6ae70f9729ee9c209eda98d4feaac8ff861caaa88e90290e1bafa7d33bdddbdc52 SHA512 f1b1798c703ec78c09b2839a6895f5ca3cbc263f07413791a81173276b6b386a0851de6dab5d801e4c0e437975f6f0edf96a970664ecf571ed38d39746c460f6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.90.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.22.90.ebuild
new file mode 100644
index 000000000000..3311c0ee7beb
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-5.22.90.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	sys-apps/smartmontools
+"
+RDEPEND="${DEPEND}
+	kde-plasma/kinfocenter:5
+"
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index fc8385a7ff5b..e960cfa033bb 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
+DIST plasma-firewall-5.22.90.tar.xz 342912 BLAKE2B 1dc1423c44b356d37de654d2e1a950a1e20ce01867273b5797f2b85914e39515f6f6a947b0d4e5cd83f041a9cd31a0487eadcf0fe06cb503a6f7ffb0843dc0a1 SHA512 9f4b3142e93472e6926cac394f7710cebba547b951ebefeb3ad33292c5910c66fc4406b0401f007e178ef02c9b0af57841b503949e29f4e93c8be640587ba2eb
 EBUILD plasma-firewall-5.22.5-r1.ebuild 1591 BLAKE2B 5a3ad21785167e8573b8d7cb9653529ee0587a7ab32cf2dd8f310fe683f93cb186fb31e006fadd06b869f3cdff571fcf54aa649386177cd0d3e2d9337ae66421 SHA512 6561cf3917cc7d98fd19a8372c02ca75812d530b10497a2f8d2f1476e4b53e1a2e670b376a4dc825aeefbce0f3a6484bb33adfc43b85c9c5505c377f7c3f6384
+EBUILD plasma-firewall-5.22.90.ebuild 1594 BLAKE2B 2268ee3f73ef09f5f127bb42b4c7c0c0c0533df5cdfb047f407f8d622b2ab5cb8b74935f59f3aa22fed2a1a64f0c08f3257c837421a461d42b67d95c519a9aef SHA512 dd20cf65aab27ae12d9081a8a7ac7df8c2c715e349071fad118f668c9e64114283c8274abbf3a99f3be43489eb30ac557981ed88b034be9f17d0b7ebdf4b93bf
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.90.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.90.ebuild
new file mode 100644
index 000000000000..dfd7cff04540
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.22.90.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 782029a06622..13791b540d3d 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
+DIST plasma-integration-5.22.90.tar.xz 83032 BLAKE2B 47b4cf4375ac38a57314cbe564f6a1c3f24e10b82166f0d34b2af6ac0b70176547ecd7c641c4342abf86caeef63a37172751f19eb893d34571d3be7b9742c947 SHA512 1e2b49560144be363f42d37d288b1c88a5fe9338a8d5259ee83fb077348890020fb30824fdb273670d0485c04408471e800526c6f209347a98ccbb1375e2c091
 EBUILD plasma-integration-5.22.5.ebuild 1240 BLAKE2B dc987d263b7f78e5d71c3ead5c19726fae2c3c8d0c1e732c0f94837b91a881552367751e0d4eae280e4a5add38b0dae9240159b32cbc2eb4dc7e7efa6e094c07 SHA512 d5db967a46b6fe5b363949c8e93388f7aff6fda0f97351c8b3c889e5a5e417f97ce50f3738e82fbb14ca0f60365873577b461a3a60475671f5a80d73224d9592
+EBUILD plasma-integration-5.22.90.ebuild 1243 BLAKE2B 47a16bbeb4dcc249f6e251d55ed1c908aa58a2b130d65df44886bbc689fb11468497d888d0a5f3aa680435a2fa2675d3537d7530add3fd5b2f28de98f05f4da8 SHA512 d335f3692749183f9245c9d64cc1ae840881da11cb0047bdcf66594a91a7c29ffde0858d7dbe2d0cc8434afa82de6c1f051ab04588e10257446c70330ace1b80
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.90.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.90.ebuild
new file mode 100644
index 000000000000..2873e4f7febe
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.22.90.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 8d3fb8ad9646..14838c04fb84 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD plasma-meta-5.22.5.ebuild 4093 BLAKE2B c709c6cce5fa4daa52a7f9d765e697ddb68d787f96e06e205405b3254622f89e2a1d2cb8c227d5ea2a87fcdf3f3748e7e665acba3de851e6897a276aa6c93152 SHA512 16e8a96e4afd3978cb262d020c451b30fd2e299a316a313b28f294b3045dfe6f60d925fd472cf80b2986eca6359229aa8a0b9f49d25ecf1f5f423fa5673a4b87
+EBUILD plasma-meta-5.22.90.ebuild 4096 BLAKE2B 3157908a91e43d54808f0e5ae397aaf405c5b3e49cb2e2aa1fa0a5a1254d8c29362b0e05203aba46333d949ea0814d52f7f2ad79cd8aae52a473c05d01185271 SHA512 de937c877713f92e5000b45554eaf09685daa82bc87e88686bc4dd88b87f49fe4c553c6db7959e48877d3f2e19dbc8be59aa42db9f8bc9af9daef914653c22bf
 MISC metadata.xml 2380 BLAKE2B a0326237bd12897117b80c6e173b8e5772d349bf370a383fca531bcfba0e25d29ea4444dca0ddb53b2348834209e4d5838e0f2a5a8f583beba8c7e2cb90226c2 SHA512 0a89ba5be15bf07ab83c6b59d4c277c00e0641227b60e490a0854598b1d2451b2a8f7733e9eff97709193d281995fe130adcdf6e75714eaee7195695a76834af
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.90.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.90.ebuild
new file mode 100644
index 000000000000..eef3ed03861c
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.22.90.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://kde.org/plasma-desktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
++desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
++kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
++smart systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwayland-server-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[elogind?,systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	elogind? ( sys-auth/elogind[pam] )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 167168ebd227..b87ceecbacf2 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
+DIST plasma-nm-5.22.90.tar.xz 918272 BLAKE2B 081c4478e5e91fc21a5607a67fa0f94a6b8fe22ff9f02ff06a324e6aab9ce556fce82f1232eb9fec8fea6680519281ae10b4758b13ee74dfb5bef443168d5898 SHA512 51dad2ecc4af9fda99cc85fc1169a1f2d9476b8a54dc6a22b7a38a51d3bfa1997d110ab957b7b18f6863373b770df7951fc90f81695961b5ff378e60006e3157
 EBUILD plasma-nm-5.22.5.ebuild 2286 BLAKE2B 17c6f20d72197b717aa6f7e05141d0557ece68320e239a4d38cd9a3ddf19c7b534b6a568d56c63735b201e0cb38071b33276542c867c368e2efe604028266c55 SHA512 bd8e74df71a77a42abf1b1860ead8327d70e487c6fe6ed2ee115ad51fbeb44ca7ae31c5974b7d50cab97098cfb14e8c43b33023e9dc3cdd81c34c72fea330286
+EBUILD plasma-nm-5.22.90.ebuild 2454 BLAKE2B 130564d171fda526200c9feb8be026e03bc2e71f51118ed358c3bf563b07a008c078951d52c2207c1c8dceed4b95ee7fcae0b6da684aac5b77f8d6d89cfb27aa SHA512 3df3ff0223619d7b3c5e6d8299375c986106fc3f28646b2dc106111560ea318bb6fa5205d7362d9442407b5ac2a7110c48a83a483c48f844d633572612bad4a3
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.90.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.90.ebuild
new file mode 100644
index 000000000000..0ac6235da156
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.90.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use openconnect; then
+		sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 84be8ee1c199..2b7aaae74160 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
+DIST plasma-pa-5.22.90.tar.xz 129200 BLAKE2B 65005b34534367e1e377ef7ba0a64d1856254822a413039347f56834c97bafcd42fbb9610dcd89c0bdba3b3e2dfa77fe43da41d9b663b07457ce196905a82b6a SHA512 67abbaafcd3b990630b2cb773fe86764b2a6f7343ebc9c93041cc417c78e72d79fdc3c98d486260ee8cd65344cb33c3a20acae09b9b7d5ad9e9efd5e6012fb9c
 EBUILD plasma-pa-5.22.5.ebuild 845 BLAKE2B 3f5007ab05c0249afc87d2a751d73e223c796001eb8357e00215623e700e6fb1077aaebcfa22abd2c773f8ed7e2d4bcffba74fbccd2a0b15091ca0d5adc92a34 SHA512 7ddf853541bde1b4cf247b9d566f9a1ab3b3d8a3c5d21cd139242bb4b458d1dcdc5fa8d527e2b077d00ce73d26f44cd0e843f89fa099ad14b5a8e65d41eb7fe6
+EBUILD plasma-pa-5.22.90.ebuild 848 BLAKE2B dc6d96931e52b4113f33002e4d560f4fedf6f5797f5edcf34be9e43c0dd266000902b836ef29c601082e4b751c129a8718b21368465fe2546d5d94b5452a1a39 SHA512 3f301c6aaf9558aec85ad1c2c855a0d76d65a4ce2d71769c79a783e9724c9f0fb0937b53a623730b81c64f8574ce4dd7b495b9af88e88284d63a0dbee49afd90
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.90.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.22.90.ebuild
new file mode 100644
index 000000000000..1e84d165efbd
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.22.90.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 53c49918e6fc..25277ac3d80f 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
+DIST plasma-sdk-5.22.90.tar.xz 274640 BLAKE2B e7e06fc6da0dc4a96f49ff5294bf18b32481c3560be82726ae11f03b9cd55e5d3648facbe576f272c25c451d26b4c38ed9f8a2b3181afaa2e379962635f41afe SHA512 03a987a94aba13bc20ab52059fc9797f65c9e1ab1edffd5296d1bd027f9fbb73bea74cedcc82c239c2a48d1ff54dc15eb7961eb7b726565cb0bfb17c7f09770e
 EBUILD plasma-sdk-5.22.5.ebuild 1261 BLAKE2B 65c25097e4c6816cd77150dec90275da0bce6ff6e2d11e5e398e94a1ba0610ccb4807afd3bc53d1f457687efe1bb33c8e3ff8296c5d08e1f776be93a9a5aea89 SHA512 cd899ea77ff7d6b680688c6776a2dfe4eeea9e860c777bf0da662440236145fadc20b8edf0c476a0bd00ce187462570377d900fb2a5fe9c43838244734f878b5
+EBUILD plasma-sdk-5.22.90.ebuild 1264 BLAKE2B 214a84bb7a97a4b0796d8220a31a793bea5ce4e91de89111f3cabbc88c50477847f1e980db802be81fbbf32c3a7424e4a259fa0e10b73c7d5c0280032a3880b1 SHA512 c7249176e23f734103bc0b5cfb9ea0225815d2cba422d3c104cd9ede64bab61659ca9c2311b99a2970bdce9fdb30180648f8cb93dde0a8b63ee958a6a52bff1e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.90.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.22.90.ebuild
new file mode 100644
index 000000000000..9c5a5e9fa9b6
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.22.90.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="optional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 98da798ee960..003450f94ea7 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
+DIST plasma-systemmonitor-5.22.90.tar.xz 142664 BLAKE2B 4c6231a8b7003beeb47ff8c6c1e61c634ff306c21090b8234818d5fc3bcbbb113e0fe9d073bf03ee48049294f06459e9bc8990fb8d86dfe672391a48f8ff6c69 SHA512 d02b6e010e474b67cba7608d4c7d39702c8b8878045582af78c210043c4e97c2c8817936cf2cfe51e626a37c023df9d31efc8d217723556fef2772523d6e21bd
 EBUILD plasma-systemmonitor-5.22.5.ebuild 1196 BLAKE2B d94938f545224d0910db9102518e0b6b673ef370bcd58f188d97f63d5571e39b8cd6eaa0fc765f29c5e13a5c9d19466d1ce1aef2289e9011e6f611b922c55ca8 SHA512 96bcdcbfabe2618cce4069c36accc7caf18497ba5394d69f2bb263840ac55734ee96eebd6a78b07041954900b6172ac085e60b5f835cbcfc515da5831393cce6
+EBUILD plasma-systemmonitor-5.22.90.ebuild 1199 BLAKE2B a75ac2c72ef185a0fa20ca8c20304cc1094f5ca39d80eaf3dc00b3fd2e29be241b08601389f88333579de7244ef8362c15eaa719ffa2d575bb78b0f769286cfb SHA512 5e5cf5db489112912708da8a8eba570b88579c2b4f77fe2bb4a5af928f8a04e84fcdffdf1169c2d01e43742ecf151b0e5cf02461ecd384b5f068a69d30f4b252
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.90.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.90.ebuild
new file mode 100644
index 000000000000..6960f0e9446b
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.90.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.86.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Monitor system sensors, process information and other system resources"
+HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/ksystemstats-${PVCUT}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 260e76b671cb..2d61f06d4f11 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
+DIST plasma-thunderbolt-5.22.90.tar.xz 64824 BLAKE2B 5bad98cbf2c0e6af1847220f866edb6cbd0d59d4bdeb16e01e7aedbadf9d75fd2932cac81f1f4edd71daf890c7509b56cdb76f164487648e77214fe76af0b96e SHA512 c87de8fd08e24c77c449113ce4e5af8f7433f098bd11a5c555de8b5c80d89314c9a3c083b3c11d45e803f787863df43e6392c56ce749491b9cae03d70e3052a4
 EBUILD plasma-thunderbolt-5.22.5.ebuild 895 BLAKE2B b8d96af1c94dc9c480bd12eb4f81c2731cce5561ed8b8a42d8597d1815286761c665508f9ce1e255c71a44b32744d62df6549f5b0d054f9f14ea57eb428537e4 SHA512 7a3d0b02672d8e5f077e79ae7d4aef83d9e8a26645c9dbd6f8aa9abc318721393bb0c025daf6b83d69c1a75d47fabe706f56865be4951f39a5381288505cb9e1
+EBUILD plasma-thunderbolt-5.22.90.ebuild 897 BLAKE2B 7d09fd7c77cdde1055cbae14efdf0280d16908cf06e1a8993c246c051cd0161130c7d81d30a54e370724aa4d539d764e90b1960f27636ac34ea25d8acf006281 SHA512 169f1e02d4fd2990fe2609eb39c2a13e8229b37816c803bb44a9efa88b38ec4d6b16b2a861e8764ac1f8c2cb9eb7b099187ba8c0d09c75f0f989124356cfcfde
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.90.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.90.ebuild
new file mode 100644
index 000000000000..98520e14669d
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.90.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+# tests require DBus
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	sys-apps/bolt
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 5c67ce737910..71f1834caa2e 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
+DIST plasma-vault-5.22.90.tar.xz 176068 BLAKE2B 87c12caa528f59ebb2f3923776e67fb3606f8d849f8ee9b2e1c19aa23baba466eb68c2e6455510b503e9b522598f3450a75ecc56681a3a655340546547371185 SHA512 9a98030760e418d5bcba5c85ed20f5da1496a6e8640f3dc5ca50291ddf4d8a1169af04e6b4e5990941dff4137dc328be918b39595bdcc95b58b4dfe97e32ade0
 EBUILD plasma-vault-5.22.5.ebuild 1281 BLAKE2B f56640ca397d6a7e217cfdc7f223ca632004abd0dabca97814e83df55c4300da4a2798abebfbf917e14ac22d4eda702c2e10630e623985083b8a8d995b122352 SHA512 cefc525aa144647d9d72eadf80eec441fe3951e172b75a645bb2ef0a3db85d38647ef896979a224d62c8f722b72e2a207e8d1f5927f082e13b2b480412725a10
+EBUILD plasma-vault-5.22.90.ebuild 1284 BLAKE2B 6f76ce395d96b828630e262e68fc8550df07fa0bd9ddfdec149f6d6a1f9b19474b1cbeac1fee8e73609b715de4c6304e1d836ad50d093fab521ae32d134dec6b SHA512 cdb29c97431eda4171d47b4dc05b98c877156a10481f51554b8e1045657f8dfdff579d2f84f185bf74aa53e210b6b44cf583d7b28b3315147e3d3127afc2146f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.90.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.22.90.ebuild
new file mode 100644
index 000000000000..820c8cb2ccae
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.22.90.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 2e5b27b96b77..a621ca226e72 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
+DIST plasma-workspace-wallpapers-5.22.90.tar.xz 57048936 BLAKE2B 14a705ed73bc0f6eb3bd97c756cebb7ecd6c2d50667d270bd07963def5480168dc69d739546a71963449bf68d4f049cf98cfaceaefff6b3873371ae9a7b70077 SHA512 39889b9ffd91bfbe0afec344da41a60ec87ec7fa201f02335926be824c00d85f840e73fcf228784bdfdcc06d4eaa60b8bd822bb9bb1c7f8c52503691855c7147
 EBUILD plasma-workspace-wallpapers-5.22.5.ebuild 355 BLAKE2B a9708760a7fdb6fa85da644f877c5cc3b8507500f55cce8f1b1e49fd53ecd2db6d4ca659b40bae823082f6c5471274793ff36f737b834c1ee597973f2ef34f94 SHA512 011e0d3ae30a65165287925bd4c21bc6313be51731810bc39acbd022bea4ab7a7a04319d6a7e34862bbe15b585b9458a2d9d2c56a9c684172f9e2057fb7b5eb6
+EBUILD plasma-workspace-wallpapers-5.22.90.ebuild 358 BLAKE2B 29af02f5b757245b3351633816c786120a7cbd7468c306c1f38de7de5e5f73befc67d3c85ac89e9e022bebea97064356f9f32e335fe535f9cbe2e054582b84fa SHA512 d26b6b8000b08c95c964e286ffd1f78aa3cb9885c10dbab0884296d4c05a6fcb4e691f05a9bc3f5a54c88b06aaa0a74e740b47b9e85275f3407d5f2f4b707510
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.90.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.90.ebuild
new file mode 100644
index 000000000000..505df2c2d303
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.90.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index be37e1c1f07c..bddc8196b009 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -3,8 +3,11 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e
 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50
 AUX plasma-workspace-5.22.5-fix-hotplug-notifications.patch 1186 BLAKE2B f660ac465e9dc6f63ef7446aa18801823399d885ebd5219128936bd0fc2e959c10cae655695df4451459c8d6c8e6eea08c054a5342564d520a6ed3a2bd542f32 SHA512 94b150ad3a6f5e91bc55ec7f6b3293128c8cd90a740d66f3f513a9eab09457f13371a54f3c9ec2c9b1e94d77e02b3b6298b80e5326784c26ddcfaf045c008c0d
 AUX plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch 1882 BLAKE2B 89c19b86f31c2d61f092242d6b31806b05b85e2d4a22b546c49933ced337872a3d61f4c33a3ed644ff169238534286f137a3810885e05db70e584b47691e05b4 SHA512 dcb2041cd5a3272b253ac5239d130453fdf13dd0820e413d38149e008c7d2ea0114e0fa4e0a6f33fd3f3d44250e27f7f2ec0fbe14cb6d3cc854526d27bfd0207
+AUX plasma-workspace-5.22.5-gpsd-3.23.1.patch 1107 BLAKE2B 5646510f32ed997ee0e91fc742569f6de6ea7793f9f2eb152e2ca8e058c94031271d33cc8df69255f6ad446bed40a8303b0dcfd212c62b66cac40076f86bf690 SHA512 1540ec69470d66adbcdc2ec108947f2ecd3ab8dfc12d57899765d15ed0288634e3d69ea19e7e9cd957b1246178492b38952657861352606e7e9452615c727fce
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
 EBUILD plasma-workspace-5.22.5-r1.ebuild 6263 BLAKE2B 35117c863cced911809ac43850aa0687299a21e75657f6bf98b63e973b023dda904e9587b5759f2f1fb6aadeb5240e7bd4b23b00614211363afcadce5e2ce424 SHA512 6e60c093910da37806d88f7408c3a902c380f1726c905f3f3d5e666aa4ca272ebfd52ea8b71cb6df820c728c2065b5ac2d55f289a5f39d84f460ede015fc865f
-EBUILD plasma-workspace-5.22.5-r2.ebuild 6437 BLAKE2B 3ab27464d25d38e33a94db71c463fdbd82ce606bc6010205aa8e80bced49b8dcff9019852ec4a02d8f7c331d306700e57f3124e8044c1b7f694c2e6b2456da8e SHA512 e0a00eee65d94662ce123a92c6781cd208bb6c91a5e4478dec785e75fb2b631b47159ab96375d4a6385632b8a8507926af6c70a49bf91373b3d8f2b8614462b8
+EBUILD plasma-workspace-5.22.5-r2.ebuild 6475 BLAKE2B 82093bfd360048e63adf30c45711b3ee16de795374d5b5c3449d1faa7ff44dd97224c4db2620a0faafa5ff8d900c41ba9100d8501e78486dee07c2b7ca76a2cd SHA512 4460d4bcc56cc5f8687b466d17fa160bebe991405a341052244e55483c920e8e83f49e63547b8bd0fe830ce3e09ee4d4e114e10a124904d77075f6690b03d713
+EBUILD plasma-workspace-5.22.90.ebuild 6222 BLAKE2B da137743b3d0e48b49ecf7d6b03312ea0640671460633c21144a573ed55c542357ad3f4eb659f6e6bf5876bc268037bb651fc0fe931966f9a24613a8ab90f485 SHA512 a308713406f5286be2105a07d9907f5e310524687430f9bd0328d18bcc5984fb3a7c7b1bf66b914a33a03a4b42e3321ff16d17d945651cdbf2b7c07ba3e90edd
 MISC metadata.xml 794 BLAKE2B 9347a321add3734ec04c45476253f76cb4bb0de8a91227733743c5a971a69e3bd9e6ecc8e0052a46c7a6955cc1da749332a5c009b3bfd424d66b130c076c0d9d SHA512 53a4f25ba06997c1dd082837b400e37fed6350ef60938cfddc4c89f4b9001f28c23e18ce68887c124149c998268867e23d35c0435118e429c1e77eaebb792829
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
new file mode 100644
index 000000000000..cb35751d446f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
@@ -0,0 +1,30 @@
+From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Thu, 23 Sep 2021 19:29:05 +0300
+Subject: [PATCH] Fix build with gpsd 3.23.1
+
+STATUS_NO_FIX was renamed to STATUS_UNK.
+
+https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
+---
+ dataengines/geolocation/location_gps.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index 858059ada..ec9ec14ae 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -52,7 +52,9 @@ void Gpsd::run()
+ #else
+             if (m_gpsdata->online) {
+ #endif
+-#if GPSD_API_MAJOR_VERSION >= 10
++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
++                if (m_gpsdata->fix.status != STATUS_UNK) {
++#elif GPSD_API_MAJOR_VERSION >= 10
+                 if (m_gpsdata->fix.status != STATUS_NO_FIX) {
+ #else
+                 if (m_gpsdata->status != STATUS_NO_FIX) {
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
index 2a5454791b8e..21b2c64d565a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
 	"${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
 	"${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
+	"${FILESDIR}/${P}-gpsd-3.23.1.patch"
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.90.ebuild
new file mode 100644
index 000000000000..8ec178423e30
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.90.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
++semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calculator? ( sci-libs/libqalculate:= )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	fontconfig? (
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	screencast? (
+		>=dev-qt/qtgui-${QTMIN}:5=[egl]
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	kde-apps/kio-extras:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.21.90:5
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# KDE-bug: 433730
+	use calculator ||
+		cmake_run_in runners cmake_comment_add_subdirectory calculator
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 0ed5e371ff87..ce4e52fb8d4d 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
+DIST plymouth-kcm-5.22.90.tar.xz 38960 BLAKE2B d5a3cce173a7c8a391b0eb6e20e3dc2832acf59cf0edefb3b980dd9eb3360cda7d036ba4d21d2ae9a0cd46c8545bac323ff36a33abe4be8dc708536dd86b2ecc SHA512 98e165883fe2e5eb3111faee64b98adc930809ea760caa4cf0bd5350a674edd011132de161ec70d3cec0446f3b9fbbdbbaf1c5af876c5d075cac6675da6bce96
 EBUILD plymouth-kcm-5.22.5.ebuild 927 BLAKE2B e58a4eb6fb3c62455f6de9024bc6c8498015721d36b3b825f374f618605f1f852558e639f2fa5aa60e5250934fb9352edf326a0189ddd0613421dfd0fe2c728b SHA512 4a7f600993c3712c27bf92a2bb942dfb33792e57ee72c1e442d6576ecc4d0bc3b4c13a68f20667513183604d25f2fad24ac49ad67b524e78b1659c37a5f8b926
+EBUILD plymouth-kcm-5.22.90.ebuild 930 BLAKE2B a66f10e95507e794d708199eedc02a1829d5e46cff805bd6090863b02d15b7eaf567f55ee355f25a30be67d738c18d64bec04abc5e171bbc80dacb88b5ecc1d5 SHA512 6fd787a0669ae526108285dfe74063f3ce6995a759bf846475aa6c0a29c2e9c261915704a0d329536418edd464e7319695b0779bc6a6485d75952233361b770b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.90.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.90.ebuild
new file mode 100644
index 000000000000..57d4b2f388e2
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.90.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 773f84d0902d..e63d12cbd079 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,5 @@
 DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
+DIST polkit-kde-agent-1-5.22.90.tar.xz 47560 BLAKE2B 6e06bd8fb3ba25c7b97ed0f3a42d337491db010548777332b58917791f7dedb887b272912ab99bd0b851a022d54b8459924fd0f1ca879681a4f388363631d78f SHA512 2cf44abadba223eb41d497841cddc93d2146bb6fcce6a0b24bf1ab8738b34fc1b3faac19e11cb38533d8f00c49b5482c6eb89b5a6deabdc7f67d42abed566224
 EBUILD polkit-kde-agent-5.22.5.ebuild 804 BLAKE2B 5c917914b8359b49f6b8982324150d3f7bcda785641c8991a74089805ad5f847c686acbfac71ee93f953bc250a8e7fa5a08bc14b749c25e32a7f609945bf5dda SHA512 8d1a4a442ed559a28f5c0d2bdbb708dd9e1035e1569121a5885b08d3d548877e9e334209877b72c48ff114e17fc65d5f522970238f084f93bb7638c8e2acafce
+EBUILD polkit-kde-agent-5.22.90.ebuild 807 BLAKE2B 35492e852f2f7ce760d81e96496b1c033b7c3ba8de285d67b733651cbab16a7cf85be8f760684dfbb715bd4276e0e19dc239812feb66903aa436fdd5d02427e2 SHA512 313f141403221007cd4fb5162197aa48a25a05acdb726f381f1adabe609152584567edb575d4da631860cdde2249964289012a04249a5533c885c0bfec0906f5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.90.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.90.ebuild
new file mode 100644
index 000000000000..5dc5f3c9aa38
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.90.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=sys-auth/polkit-qt-0.113.0
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 08a1a57940e1..2b6963164fc9 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,5 @@
 DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
+DIST powerdevil-5.22.90.tar.xz 626356 BLAKE2B e2323537670daecb2726a3ab629d0a1507e3d1e311aec75d168ed11686026704fd99b69bd0c0466fdb074c732c7ada5d5fced02225bb41f5e7b48e54d39c8310 SHA512 9a70a76e3ca5454c27c6926fe8e387445d0f09ae8a8ba7a5ffc029f614e6edd0fe8ec53fc3ef33df63311f8ad8c55bba4aff5ad621c30e5bf7cc01207961d599
 EBUILD powerdevil-5.22.5.ebuild 1951 BLAKE2B f7312ff7465b721137222fd0c02480c67f9eb5bded7cfc8a30c48cdead8e03383d559ff0928694febb18a012bfec2138088e7e8a52bedffcbc8105ec1f564aec SHA512 9d6e8d08ea83c88251bc9a078de4625a11912fb82143ab73d7c69c766e35575fc1a4815cb1a11e93334ac77fcff34e52550fdcaf35a9b82007cce7806a26bb94
+EBUILD powerdevil-5.22.90.ebuild 1954 BLAKE2B c2045e6029b9fe6fd376eddf923dd0c31440a2255bfc35f9078f98342b2584a5dada60279558cfa6bc357a6768c017e0f044d3310e349addd8cc6822d371ba93 SHA512 34e67ac88bf2b62bdce4e6fe757283b63e19979dc5e9b95a3b0e84387ee7d8710bdbfb552a20aa772758160e02a5035f9b6911a7e9d129c98e43fa24b7ea0e84
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.90.ebuild b/kde-plasma/powerdevil/powerdevil-5.22.90.ebuild
new file mode 100644
index 000000000000..7b2e96d8b63a
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.22.90.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="brightness-control caps +wireless"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	caps? ( sys-libs/libcap )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 843e6bffd920..11d479221025 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
+DIST sddm-kcm-5.22.90.tar.xz 76940 BLAKE2B 3b730f05ee608cd89db1b38f1c53bf6a9717004ebaed9cff301a41523706351693560db6d3a526d48be981891e85fe4a89a2fd63fb638ba1f63f0fc261fe4e6f SHA512 1079c5ea9fb0676999d17ffa9b4df1ca14a4cf0e397a9f91ccb71dc2d449e86cd0afde288546312e7a9145fe6940eb48d8ce0e29ca124a53df8c750bd15289d7
 EBUILD sddm-kcm-5.22.5.ebuild 1079 BLAKE2B 7ff7ede17179d5e0695899acd5469e0759d21307c7029803cf5d257119b5df2c5fa0a846326a3cfed280ef2120fb3367127fa4cc1a3a1ed24928689c91937a06 SHA512 44995950d8bcdab94ba5bb3e578b2fcadf96bd1ecc2a81363d3913fa916485ead8d7fd9640fe4436b7d5832dc64561da007927dcf8e6820db335335fa2d1ec83
+EBUILD sddm-kcm-5.22.90.ebuild 1124 BLAKE2B c402a309342f7976461963e12d1a40a69e283ea84278cffbbdb5fbe95729e88d46da5c79febfcd4b5df1461332977a78f5450e63d744b1ca23178683974863b7 SHA512 3f0b121e0375f73f020cd4f80cb6696c9f7dea1605b6df53f0d4fe64c5292a1a0454ad9aa96ca27969254c8ba008ae0eca1548de8c88d3eeb5f78bc3d16ccd2f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.90.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.22.90.ebuild
new file mode 100644
index 000000000000..c0a6d49efe85
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.22.90.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/sddm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 40f78e5726bb..ec8413d9f10e 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,5 @@
 DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
+DIST systemsettings-5.22.90.tar.xz 202780 BLAKE2B 7af8bef9535ea2f2f9df91ad6f0528d5b9eec2b157e935d102249a1cfe0eef7e7dfe4232f0054837243e5bb705b074b9b546066a30d171c7e690315ea73a41d4 SHA512 0c2de8f9ae5245f8f79c7464e19358d3b1f86fdd51c98ff10add99d9bc85aac79d1a09b41417fd893505e174a97f9700502e235cfa0e60eb7c81f0c8063845e7
 EBUILD systemsettings-5.22.5.ebuild 1678 BLAKE2B 31cb254fd0f29931bb0afbc0d7f021659a66d4440b5954aea05c6f341128c58e13097790d5c884f0965094d61752ac8261db2a3b3b6b2a5d27d615854a6e65df SHA512 a243ea3cf73fcbaa5be79618c27045e805e131f2eea9ce0e442b86d538ee596a5f0d3cb9ba63b4c8f6bff330c32bcff069b200b23a3418ad655ee782075baf96
+EBUILD systemsettings-5.22.90.ebuild 1757 BLAKE2B 7377e818b32feb088be59875829d62b506798434955a1ee0d5b13c9c185b58429096b0f99dad2d293c5a1fd5c1fd0d5d5c51c61d145732f2783f2142bc86fa09 SHA512 674097b35741a516f906dc14b84776acf88e33d6b1d43ddb6cd037b52092176a669ae3e515bbc8ef3e374e98fb0d427ba74cc538f233c03314e4652f35c5aa1a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.90.ebuild b/kde-plasma/systemsettings/systemsettings-5.22.90.ebuild
new file mode 100644
index 000000000000..452b6efd42ca
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.22.90.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 422ce37ccf3f..1edb00cde044 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
+DIST xdg-desktop-portal-kde-5.22.90.tar.xz 89260 BLAKE2B c4f29ed0df7a47c8581d27fba68ac7e592c5ca464b18b77116dc9e2d6ebebabe5b561c5f6f2aacea2022b93762566d026124da56014d3af093af499090a7297e SHA512 255c500b1fdb8f45f4adeddff6960ed142d88a30235f9512f269a229397f7067c3d3b88d8a2adcf7c7108e57496caa98edb8d673b94a7ac260c89fd54764bdc9
 EBUILD xdg-desktop-portal-kde-5.22.5.ebuild 1105 BLAKE2B 20df70250cd44f379c019c7a5f814da493fdc04e99c419233e53aa1e1ca9a6d802c47649fb172ddeee329e7ab798ad1293c7731aa3fc6ab16ed7df2c20561ae7 SHA512 c98508f0b6acd65c204607c5c91f713a4dcd96ffa578c41ba6e31a6c5de57e788f115a2f9325c45a93b5424281ed3cbf2c303009710f55b0dbd8467b93e83720
+EBUILD xdg-desktop-portal-kde-5.22.90.ebuild 1108 BLAKE2B a80d31fcfd2913f5607bafd5ee5672938573780289c44d2e43c1291ffe338adf5fe042b19b2e0426b0e649489661786ec7a758bec9b4e9c2a9a94fb72795e929 SHA512 d4332a8b4bd04f18782a736b0921ba58db9ab0e311c837fd1f84f871debbcc82ac06ae05bbab8299019d0ce974de280a37e3d8283768d50cae854b38be0691e4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.90.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.90.ebuild
new file mode 100644
index 000000000000..741a7d0cb11f
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.90.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal
+"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 4dad32f9d148..7a4f47f226a6 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,4 +1,6 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
 EBUILD xembed-sni-proxy-5.22.5.ebuild 1015 BLAKE2B 11b057039b67982acca95b5c38035b99c7fb01cd580b0e9865911fcd3bbca6dc7b053cd5571e3edf1e8ec7247744d2466c8d78352e5e5b53cd76d05f725b63f3 SHA512 c0afe7eda4d58c6341535c6d7dd7a0c7f89b2095762ede6684822b4dfb55895bd63b287d363ab39e65971139c656fe0ef52095032acd61d72818fdc1a70a92ba
+EBUILD xembed-sni-proxy-5.22.90.ebuild 1018 BLAKE2B 07f711eeba0b50239446c898eb01556542166b08ffb9e685c1c53560b7a9c5647ddca2c73a2f126bcb76f0ab5950d4ae73c7507836656d842a3242f6423aab1c SHA512 28594e58bfa8c8101f201de9762004d2dd45b6e17a08f9b8d1f68852a070424485a783b49464a9281a7314ee69deb02cddcd13bcc76984635ad65d16659fd786
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.90.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.90.ebuild
new file mode 100644
index 000000000000..7ebe3cfa45e1
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.90.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit cmake kde.org
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index cc5e41d8e23e..37c43bbe84a3 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
index 6111d2dfbb33..b60dc3c28535 100644
--- a/lxqt-base/libsysstat/Manifest
+++ b/lxqt-base/libsysstat/Manifest
@@ -1,5 +1,3 @@
-DIST libsysstat-0.4.4.tar.xz 17532 BLAKE2B d2f58ef95ef1bd139d174f2edcdebb3847df45c712c27f2bec5e0afdf4cf4c9b49a3996d8d28e27212b4d6866f505b87a58b0c72e8c4f31ad1c5a3632e8b130c SHA512 2d3545f6b3872dd48f9d4537352e6f8884cf10adca71625f75da7898a71c3100df996b6a3f8cd851d352347db5b82c67402172831179c574639c75dd35ed1d88
 DIST libsysstat-0.4.5.tar.xz 17744 BLAKE2B 5739b57960b1169be3a16fe77aeaf5c43542d545a3a3195f4f3c4d9514d575744c95231052abe7d8afd0adffd0a0465bc7f4e338022664018e179b03480d4158 SHA512 1b9091b783e32aeb258bef0e7ea070456f577a42fc5052ebf215dccb195f51c34ae7c2e6178e4eaf12200c5155c53699c2dbfe2a1f7c0c35d06c04275455ed09
-EBUILD libsysstat-0.4.4.ebuild 550 BLAKE2B cd069da3427bfdd40be5905c83eb1e95cba60ed55e0c81aa82daf57cc6f856b1a56d4e3f84518494de96722fce58f950521796e6f0a14372534211c94efc4d05 SHA512 7ccdaff786432b3049984b67d8af48fb93c0a3eb952fd199c350942dd148da5ffe45fa31940474ef288a47a544001552973faa12edad60136678989a5b7a88fe
 EBUILD libsysstat-0.4.5.ebuild 557 BLAKE2B 23fc0dee74963af52f10d7f62561ef656d0854107419923da380520ec067adf7db68d78fd0b1cc046bf02bf4b21547eee9178b6e04a92b55c5d929a09d129f43 SHA512 7d4e331f83b7e41f3de78ed3b535774b2d156f4c20c8a6c937f48d1e53b4438816b589565f4bd8a816108a733aab3b1af168d01f542859f6f874e54017a90f83
 MISC metadata.xml 317 BLAKE2B 05897f16c54590450e221689e72baafe5ace23c456ddaf6783e40b756c51327eb5239e87efebaf9410e59eeeaa99bd6f93706b046e0feb7930800e121fcc1c0f SHA512 a04e19990ee3993f6a932d834b4c1ada9a5526f3df5227a159c604d4645f0ad6966c6e716f63ec5ed5dee8878aa0fb95bfcd979f1aa27d45549a1dacfc4315fd
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.4.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.4.ebuild
deleted file mode 100644
index b4556720fa63..000000000000
--- a/lxqt-base/libsysstat/libsysstat-0.4.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt GUI for System Statistics"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
-DEPEND="dev-qt/qtcore:5"
-RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
index 3c0d1678d740..3d6415e39645 100644
--- a/lxqt-base/lxqt-about/Manifest
+++ b/lxqt-base/lxqt-about/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-about-0.16.0.tar.xz 38660 BLAKE2B 4d16ed711986df41dd60a9a0371f91dc3cea6f7643c6bb50a3ff5bb91d8ab059c98b22e945fcfea93a02ebaf7d57d5c44f5f86d58d2d0c7171e543cd4b569af6 SHA512 fc7f7aa747f45fa2c3fc26e0c5de6595e3e011a3af8740a5c07a6d18b34a201c245b13dfe17167b578e84536334078a8925b4bb750461fa49923bcb88b4bf6a4
 DIST lxqt-about-0.17.0.tar.xz 40976 BLAKE2B b1b3b1422b9c7f001d22b76ce1bce6c858406f49f9c995496802caf7594d91f00a3665cad00bf58b0b22fde8340e12b3683a79609e93ec00255608bb5f4ae122 SHA512 d347db528a267b857279a96fba31ebfcb1468603cb16c6f002d1675ddf351524f6a93d811f2f980dafd2c46db4a2a86b4521ce82157050dd3166f74c771c4367
-EBUILD lxqt-about-0.16.0.ebuild 664 BLAKE2B 1d73380fdb784f41fc1ff977955c0cfb4ff6bdc79a0fd0e540372c17b6dd9cb551efbf7c76920db1965826758ae636cf9cf30836eb9e77892b66e898c9b02b37 SHA512 5d26ffe07c943f179a4d0b5ea5844e3d2ed75085b9739ffc36fe5cf2ba6452a6236edb475983039bc4ab98138c52e323eabb5fd4632c3a0928af4432f4c1e8be
 EBUILD lxqt-about-0.17.0.ebuild 648 BLAKE2B 4cc655bb6aedad8205be420f287e5a45ae9fcf6d91d76b75d8ce54dc172c11c91c8ae1c54cf0f758b1cf5e70f5de3f3cd892cce612a6e66eaa22be59af012e3c SHA512 c60598509e66382db28bca339824193357c3f3867f6b6719b9bbc9f3e24d04e37d97c20caba68c45fa073ef4937b0ffbb851b345fb502a9af3c148c1f0b8caae
 MISC metadata.xml 317 BLAKE2B 1e3007d0e2cfe127d8a7b090538eb511bc26c8a235196be9afd629dc9fdebdaba197359369c9a2796c9bdc7f0c8c5d0ebb846133029a4f3c29512fb0ea1e56ff SHA512 66cef0f062a334d19457d9d4d1ce5f4e5fbe7155c229d06a97680660ffa542764c5147613c48b5a9a06c9f6d9eaa4f59d39f612085773735b5d1ab8a90d68e8e
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.16.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.16.0.ebuild
deleted file mode 100644
index 33e9adada0c5..000000000000
--- a/lxqt-base/lxqt-about/lxqt-about-0.16.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
-
-inherit cmake
-
-DESCRIPTION="LXQt about dialog"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest
index c804636f1432..f449c4d4bcf0 100644
--- a/lxqt-base/lxqt-admin/Manifest
+++ b/lxqt-base/lxqt-admin/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-admin-0.16.0.tar.xz 143724 BLAKE2B 8a9c13ea52fefe813d6fecc45e2b9263da34fa7ec5b3c28054ab8b728d813782ff351d328fed36e7c2a8bd55cde05633d4b937edbbadebd1daf25472d47da289 SHA512 ed61e886a52985f67c38d39d949fabbd5532ebf61f232d4d2accf144b8fc650f85457e0e8b6066fad3f914ad61f8b1779360c886d3622c09765e421dfcea2484
 DIST lxqt-admin-0.17.0.tar.xz 145620 BLAKE2B 3f1bc0870ef33a85a14dca559951826c56a2ebe81f6cad53917db87ce38b909aed4daed7964d202715dd4d9c7947b23f2aba0fdcb020b6b418c91d9f12c90573 SHA512 5d807b1bbde586130ab03cecf43dc190cbbed5c16842d14779f67f7b514689e7ea330f6c75916c733e4e840242d7feaceb4b6e0932ece1ca70bff208eb5e8072
-EBUILD lxqt-admin-0.16.0.ebuild 693 BLAKE2B e991e6cdb756cb5905bbc983eb3d4a124104eeacf6097bd3aeff20a88fc79c3d1b5b1e014186b40c141060f56716ce90402ce99802f9747784db61bd046d5012 SHA512 15066b81f4e33208917c6f2ca1abdfb471297a22d6ee834d8226a21ecb3b27524f2e842e2f60169fe87cc84525087a6615d57fc38c065a90080328415f7bac3f
 EBUILD lxqt-admin-0.17.0.ebuild 707 BLAKE2B dfd20849555525459b60c4970733792e4cbb282b01e760df7bf75971c0326b08b075127d6b60d82c29ef4e25053886945ea9ac676566366813108d7a93626e43 SHA512 fe7b3bb937c7f3b77af12f027d479a2eabeaa272c2b08768da2613238be99f83b718cb99a9afcd5d591f0a62ac246b03dd1d7c47f9f1d7d0735e64902ab14a94
 MISC metadata.xml 317 BLAKE2B c32f550919926072fb231380675673979f2fee61297981c2ac55300c395dc9052c3f45328641c63d0c42c8ca5053958b7a984942053c5cd4c56cf6a6a4b67743 SHA512 8b3d716d96e51ebfbc7e153c1e92e76eb01dc9df52ce48673117b8ddc2b5670812d380fc6eac47c73d80f72bf67a9a3e09c91d1f6393c390b1271608c7bfeb2f
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.16.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.16.0.ebuild
deleted file mode 100644
index 7ff28c1ae06e..000000000000
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.16.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt system administration tool"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	kde-frameworks/kwindowsystem:5
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index c060a6657bb1..b7e390dafbfb 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-config-0.16.1.tar.xz 327652 BLAKE2B b242aeea758b8dc2804c9ebd4abd9a0ab98d92e7e6620646c90a78ca60238ef0e62e823eac3e226fdd05ddc431e271551ecf34281467a9db03fe5195a2f3e293 SHA512 3322611b74a945b2c4aa60a179fc1edabd09e474502f44e7a0319478a09762ff7a11fbb7603aa26ec8ea593514bbcdfc98fb475009d0dfa4d387963fcdef7e03
 DIST lxqt-config-0.17.1.tar.xz 339184 BLAKE2B cdb2852801b4af141213dbe680f5d9ccf4bf3738ee6c39e4df7e7915ee74209d4516d4ca2675176f31b4fa7afc4c3907ac71afe1d2a88ce39d8831dfc62946ad SHA512 2173acd18ffa5aeee9d11bd73955d0475b53a335df7d95523a2297b5ef3f9a8e4e135a290e7a720a227a92c84532a64d9fbc7a811de242dd32f9e70d036d3ca6
-EBUILD lxqt-config-0.16.1.ebuild 1469 BLAKE2B 6311864c7526ffaee49963abfc723178f96bf7621f155712a5505a6315061d6f4d941f81e15011906f97ad4049cc4d9ee7b9cf92f2ad17cd89d00da081cd7b08 SHA512 4377185b8fd44354f088f3d337208812647ab7b3045f27e6ddf685b748b2fdaf5222784c1450ede7b1d2af490c8c205d109b9a6c8003b74eeff6b26fd0e7ba45
 EBUILD lxqt-config-0.17.1.ebuild 1453 BLAKE2B e89b3b56cca0313b004d8c9bc64362a87d11fe10c9f8639463af129fa732cc4adcbb3818baae0f310975edefbe7b262da4cb7295dc3f6a2cdf527aac19a6cf55 SHA512 d8123b1727b7312386f6987c97964404fa2f902bff27d260a50d6b2488fae541237ea0ec708d8e27d51ce6b50fcb1c2293b0ecbbba50a8780473f68cfd07d14d
 MISC metadata.xml 451 BLAKE2B 6a32cdd63a8414bf7416ff5cd40c490b703ab115790119e3b2c77ba7fcba9d5b164117a2183f51622a3a2716afaf2440fa66ddef3b5d778a46a5a5e185ef5cb1 SHA512 e181838ee5cefbad064504db84b53db0591eb1bbb476c966f076eeae313f5f94b172c952a7f2d340e4e7ac539bee69884ce583569bad13b4147f8de67adda985
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.16.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.16.1.ebuild
deleted file mode 100644
index c0de3031ecde..000000000000
--- a/lxqt-base/lxqt-config/lxqt-config-0.16.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="LXQt system configuration control center"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
-SLOT="0"
-IUSE="+monitor +touchpad"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	sys-libs/zlib:=
-	x11-apps/setxkbmap
-	x11-libs/libxcb:=
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	monitor? ( kde-plasma/libkscreen:5= )
-	touchpad? (
-		virtual/libudev
-		x11-drivers/xf86-input-libinput
-		x11-libs/libXext
-		x11-libs/libXi
-	)
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MONITOR=$(usex monitor)
-		-DWITH_TOUCHPAD=$(usex touchpad)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index b1939ccf1bf0..5f9cfacdf47b 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-globalkeys-0.16.0.tar.xz 69812 BLAKE2B 920bcb760440002f330a5f90217dbb139c3ad1196950fbdb252ad105226eaab3ef82fc8d7df874176076dc21cdc9dfedeaaca93895d2d81b1ddc9d4930870459 SHA512 a6b2de35e3deb4852e9a8462871ba0fd40c9168653b210e361ff16b7dc5c74f9c98c6427cc595578eb9bb2a34c9be702c0af65fdfb92053b1f3813070629e55b
 DIST lxqt-globalkeys-0.17.0.tar.xz 70584 BLAKE2B af64fca5edb426e073397380115bb06086e354218a14abfad0452f24ac7684d955ed22c977307f45c49d950b148269b92776d5e0b3fb2488836f696bf7505a96 SHA512 1362eec17d96a5352b647db6f55c13cbe1d375b444d1d3d75e3171257ec9b476abfc023e7014c0923b525b5c3b539fde83ac829f2b2256e217e8dc98e6862cb3
-EBUILD lxqt-globalkeys-0.16.0.ebuild 849 BLAKE2B d3b9cbf06ac25e477af0c66d15d3be00a9462316ab9f58ef9b1219320733e922690d4921b6213dfb5a282e41b443db9ed081bb9d6028b9d6c1ceda46fdbc9d9e SHA512 374384ebadc07d6e0d5f7d8cae07bb38809aab8e8cd6bf6852bb871adda28d7696a0b85669dc6f9eff92b97042bc33a8447bc3be1738c7d02e5e401e112a014d
 EBUILD lxqt-globalkeys-0.17.0.ebuild 833 BLAKE2B 205bab534808d8bfbd7de6099e58d7c72e6bbc181604e6fe51d5a1832b0c9a8fd64d30185937ffac9195528e7edd1e1a4a52bb89db1e65cddb3d67d0cbb6c1ee SHA512 4fde63800f58ebd0a15bd54026ed125b0dae05650790d9a6bd507d53349e91ef333e920cae9f8a0f291b484885de05704ba11672426e25aae868de2da017f848
 MISC metadata.xml 322 BLAKE2B 744c3616bee3483129c6169f790e4eb440d5c0b5cbab966ce49bb9de1e2c8685c26036a05a0015aa75fc9cdc840f98a6ceeedb666af416da03adc7b004cc3c37 SHA512 5e42e824230bc18607d3f16c49b2d25dcad4b5e33ec66dc1611c8ce8cf932e1697c040f7331da6975195ba3254299e01975df6c5a925890a92d5b6d43879e8cf
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.16.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.16.0.ebuild
deleted file mode 100644
index 078344151f92..000000000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.16.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 cmake
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 7508400f576a..47dae6a4cc68 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxqt-meta-0.16.0.ebuild 1866 BLAKE2B 5d889cd0aa1e9a7439b4c36f7b02c51deb3c6f8729b515917a3f75f764104fef69ef997369e60bfca87efde8c6479ac46ddc814cfabbd82c1ea58ffc104b9848 SHA512 fac0747fac961065f086d5fc8e1eea38b1c27b67682d43c4fe9ccbfb5e4c2df946e2ca65e82bb0c0b6633e1b952cbc543adaa0f031e3706d76a66059eb118219
 EBUILD lxqt-meta-0.17.0.ebuild 1890 BLAKE2B a4a495e48b2fc853b642c8d32db83611305c2e08399e7078130a2be192fcf52a08402f6711846132cca99368267ff108993fa80d0087f9dbd2d9012f6bc8ba7d SHA512 0ebaf31b9e2a30c188141ca32adcf23410c66f941ccce5b205cb01f7dd9042fb0b07e41b25f8178316f42b4b16cb8b9b01307fd113e52916c97a2e7f05be33f0
 MISC metadata.xml 1593 BLAKE2B 8252bbbce0206624bd8af75173e3b1fd193a932c0f6b6c406103424dd54872c7ddeaae8b8f9f218da41a706df6fec84e179741e7ab36dd041269cecc8494ca81 SHA512 173cb14526d5817fd7845314430dbeda9e15eb0f56bebf3dd5bb9382238cf79c4af2835691e328896cff3dde11959a7d54eda39be644f56ebe9c35e39e8ac01e
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.16.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.16.0.ebuild
deleted file mode 100644
index 8dbe9c0e7583..000000000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.16.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)*"
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="metapackage"
-SLOT="0"
-
-IUSE="+about admin archiver +display-manager +filemanager lximage
-minimal nls +policykit powermanagement processviewer screenshot +sddm
-ssh-askpass sudo terminal +trash"
-
-REQUIRED_USE="trash? ( filemanager )"
-
-# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
-# install expects oxygen icons, until the user specifies otherwise (bug 543380)
-RDEPEND="
-	kde-frameworks/oxygen-icons
-	>=lxde-base/lxmenu-data-0.1.5
-	=lxqt-base/lxqt-config-${MY_PV}
-	=lxqt-base/lxqt-globalkeys-${MY_PV}
-	=lxqt-base/lxqt-notificationd-${MY_PV}
-	=lxqt-base/lxqt-panel-${MY_PV}
-	=lxqt-base/lxqt-qtplugin-${MY_PV}
-	=lxqt-base/lxqt-runner-${MY_PV}
-	=lxqt-base/lxqt-session-${MY_PV}
-	virtual/ttf-fonts
-	=x11-themes/lxqt-themes-${MY_PV}
-	about? ( =lxqt-base/lxqt-about-${MY_PV} )
-	admin? ( =lxqt-base/lxqt-admin-${MY_PV} )
-	archiver? ( app-arch/lxqt-archiver )
-	display-manager? (
-		sddm? ( >=x11-misc/sddm-0.11.0 )
-		!sddm? ( x11-misc/lightdm )
-	)
-	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV} )
-	lximage? ( media-gfx/lximage-qt )
-	!minimal? (
-		x11-wm/openbox
-		x11-misc/obconf-qt
-	)
-	nls? ( dev-qt/qttranslations:5 )
-	policykit? ( =lxqt-base/lxqt-policykit-${MY_PV} )
-	powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV} )
-	processviewer? ( x11-misc/qps:0 )
-	screenshot? ( x11-misc/screengrab:0 )
-	sddm? ( >=x11-misc/sddm-0.11.0 )
-	ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV} )
-	sudo? ( =lxqt-base/lxqt-sudo-${MY_PV} )
-	terminal? ( x11-terms/qterminal:0 )
-	trash? ( gnome-base/gvfs )
-"
diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
index 89bb754b2ab0..fc1c2e532246 100644
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-notificationd-0.16.0.tar.xz 50696 BLAKE2B e41528091c9c8abfbcd4de53daf753d5f031f9941a83c1e8c0a4f492dba85d1edd08185726dc3f68d0553c5f23a6f97a9835061bdad47abe98c4f0a54ec942f4 SHA512 127f1c044babb0c7a640d862fc9f30947b06ef37b702a75bc72a87f82f9aff15b32e29272993eb9d888e1c8db93e81cec8d07be515c769c560ecce4b439bb2f3
 DIST lxqt-notificationd-0.17.0.tar.xz 53712 BLAKE2B d15f00179eb24c43add51f246b46738d4da6f9ce89f041a65ce4acc252ebd0a832519c0e9e7ac2ee86d23806a2ac6a9a740b57fc5e88d73a09d1170e405386ef SHA512 042d69e01c3015d254ae3472867de0b41587af2285cd26445cd9d6d455de8ef713413431dea9997f2d2e19f70c2c8c73af39ce880d54ecb9fd6c50cd05a7dba4
-EBUILD lxqt-notificationd-0.16.0.ebuild 769 BLAKE2B 07a4ed1cd2053733a9ee618e6d1a139df819fdc03c0bb94c0783d07b8dff0c4e4f8ee56cd10bd4d592d4d028146f851b90f2400907bdcde11e913436ce4f7bd9 SHA512 a9c58f7fe7622d807023a90d494b89bf29ff01ada24cc13ee98821747a20dc6ee26dba9b8aca2ad5415b6120610baab33c9079d97a0578bc2a3e221de1519f54
 EBUILD lxqt-notificationd-0.17.0.ebuild 753 BLAKE2B 44982070938597db7cb374a26adbdca496b63e0277b36be7593459b8ed3b1ffd9cc25d131e40340d61448b4548fa49f2332d7087c5c388ee6de9561601c31eb3 SHA512 5e5fd61a5d75a76129196f98a270a392675826555a4ecc3713feddcc277bd7c50150e3db145407322e66f6e0cbd31519c846406dea41faa8ca8fe10ffee82968
 MISC metadata.xml 324 BLAKE2B 9a9ade6923097018d9e6caa51617b06c04df45227a4afbf512e04a54e2e5387f162c9b48483ff0f2fa9451a118f8b372bd1d3a487a0be2f3c896524611fe97c6 SHA512 252b5a4a24e16a6cc461670adafccb7041a8229414bd68e564ceadab8bd1ee7141fc43d8db9b6a04c161c947749c28e21815d40f49f44ea049a23167d408368f
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.16.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.16.0.ebuild
deleted file mode 100644
index eada64a1a996..000000000000
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt notification daemon and library"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kwindowsystem:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
index b17b491b1ef1..6070b11151c9 100644
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-openssh-askpass-0.16.0.tar.xz 17160 BLAKE2B cc16e4cb884530eb76ffa27f4cb207edc774c0f859cefa995a8ff395e9c166ab5ffa24e898b23c61e49fd3a9d5d8be83480cee0dacd2791609e16ce5a92debd2 SHA512 4251ecb10255e4ef2b988b162111c2889c432bf039d05ae00c3f16992424e7a27868b0e040899592cc703a7b009a197c8bdda3698e3c6ea41cf9d22c3ddddb80
 DIST lxqt-openssh-askpass-0.17.0.tar.xz 17192 BLAKE2B 94dbcdd2e05acc1371b4b0af74bc3f10036709ff629b5ba01486ce17471aa21129851d5ca0264a8c341f1321fafbc5476dc2588edf0068717d47461306dfe4c6 SHA512 29923b6503b25e9971d2d5d96c9ef21af62ca046967e1d0902c28bafbed9891490148c19f5fd32fd68b4525c624e67f96ab658919933ed1b3c5e2e320bab4225
-EBUILD lxqt-openssh-askpass-0.16.0.ebuild 825 BLAKE2B bb8cbfd43a7ac6f793db8af262e4e85603e472ad3f40c747382e425571adf7b317340761d9da1cf59cdf52d4486a8be34c8f6ded82c7a970e2dc6baed38bf0f6 SHA512 ed35ba0c3dbb9e33197308504984ade742131fd66b582fefc0d784b5f6f3903d9513a7c28fe10e1aee67026f32544491c029a2198d3b22d324f4fb4e3adb1a35
 EBUILD lxqt-openssh-askpass-0.17.0.ebuild 809 BLAKE2B 1a8ef16cfce1874e7dae34cdb792c1c855226c567b1eb88556ab98ae5ab8a6272b889fb72db871cf54196d61285d9fdad1f7285b2eb7c2d769423439c411f37c SHA512 d4181518475d141b6d146125913a5fdd8841aa2a44875909dfc0d88f1bb79ca0e97cd54325df7945f48d78f96317ec47eaad0d28a49ea61f841b25e42e723b36
 MISC metadata.xml 327 BLAKE2B 076a883abb7f3b1bf6a3954d2b6a0cde5106b9122f825a1321ae9451aaf1f236b6dcd29bbc47808d0bee82545c4db94720da5ac51e0af3b505bbc7b3c9a1988d SHA512 c491d9034c8e05b0dd9fc827cd8340355b587c7d4637abf9ee111366c54a438967bbe648549447d0cefb6fbb2925312525ceed81f94d0d1ff1305e63a3753343
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.16.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.16.0.ebuild
deleted file mode 100644
index 610ccff059ed..000000000000
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.16.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt OpenSSH user password prompt tool"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_install() {
-	cmake_src_install
-	doman man/*.1
-
-	newenvd - 99${PN} <<- _EOF_
-		SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'
-	_EOF_
-}
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 42807e97caf3..7d76eddd2b1f 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-panel-0.16.1.tar.xz 473632 BLAKE2B aee19df3cef9dd25b20ae44cdbeb0c017fefc1e7e7f1d350e07820aa2d873a03dfd69a990e99abed95a9c633a6c496bff356fbbcfcc3cebacc50dde52dc79780 SHA512 2db8c4b5d8ddf42b72ffd5863242774277b4bf2fd1ec4393908851ce3224c970de5f12ae61be3dd7008407ea5df7b0b59990b03982e2725ee9a0ce2e3cce48f5
 DIST lxqt-panel-0.17.1.tar.xz 510212 BLAKE2B fec84d1758ba1824c5c77ba730040e2d662f97c08b48378acc2efff53237cb993d1543918429224be1e5ba539a8de96b91f3a9ba4e1095fa69fe3c72e26d5156 SHA512 439905144029518e46efdd72eb3db17203678e243ca5f7090bf5db902805deaded41f6c59d02bf538fbf24b7951d6da6a924331c685b69d162812249fb9a4e72
-EBUILD lxqt-panel-0.16.1-r1.ebuild 2930 BLAKE2B 95da4f6710275adab140c6e1638840d19be84b46aad25b657baeb3ce6c6ecc6183f010135cb05f0b1894d94215bd9c43953cd0914eb3fd37cc849952a180f559 SHA512 25b647211baa81acc609c39e114cd0cc67ca52bd51b9b75feb51def82834e494e433b98bdc33ac4ebc7ff8c77778879647970f5939d8bf7e7634d4ce090a28b5
 EBUILD lxqt-panel-0.17.1-r1.ebuild 2914 BLAKE2B 12cd45ab2e86b9ee2ad7cd7457f69ecc92de6d17f6a3d28806de4cf16c3a7450786744bc1e7556348c7d7ba2a385a032adfbecc29368ca4add098984cc483085 SHA512 fd23b6650eb8eee3599b81dacde5fa07429a43c9cd01c27d903b7f12cba6c5a98ff2ab8a11a5966b62b7ddf8537e0ede1cc8f2c12c6e3d9f50b4dd38e89e6b13
 MISC metadata.xml 1320 BLAKE2B 3e932f653506f6ad90453214383eaa94eb32da594c76af60270426544a3bac1ef87dd34204a6c786510e3a00f9e143c92e956b46d7613da343f2030f01b8d9aa SHA512 b68531439f0600dbc28389ee25548dbaa8f85109ea45ba4f6e588c1d49b374d5b27745a517ac508d15d0c48c3b003fa97243cb50eb81177bea6ebcd2713d5809
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.16.1-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.16.1-r1.ebuild
deleted file mode 100644
index 0b1741688297..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt.github.io/"
-
-MY_PV="$(ver_cut 1-2)*"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator
-+mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop
-+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
-
-# Work around a missing header issue: https://bugs.gentoo.org/666278
-REQUIRED_USE="
-	|| ( desktopswitch mainmenu showdesktop taskbar )
-	volume? ( || ( alsa pulseaudio ) )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	>=lxde-base/lxmenu-data-0.1.5
-	>=lxde-base/menu-cache-1.1.0
-	=lxqt-base/liblxqt-${MY_PV}
-	=lxqt-base/lxqt-globalkeys-${MY_PV}
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	kbindicator? ( x11-libs/libxkbcommon )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mount? ( kde-frameworks/solid:5 )
-	networkmonitor? ( sys-libs/libstatgrab )
-	statusnotifier? (
-		dev-libs/libdbusmenu-qt[qt5(+)]
-		dev-qt/qtconcurrent:5
-	)
-	sysstat? ( >=lxqt-base/libsysstat-0.4.1 )
-	tray? (
-		x11-libs/libxcb:=
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/xcb-util
-	)
-	volume? (
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? (
-			media-sound/pavucontrol-qt
-			media-sound/pulseaudio
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		# Plugins
-		-DCOLORPICKER_PLUGIN=$(usex colorpicker)
-		-DCPULOAD_PLUGIN=$(usex cpuload)
-		-DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch)
-		-DDIRECTORYMENU_PLUGIN=$(usex directorymenu)
-		-DDOM_PLUGIN=$(usex dom)
-		-DKBINDICATOR_PLUGIN=$(usex kbindicator)
-		-DMAINMENU_PLUGIN=$(usex mainmenu)
-		-DMOUNT_PLUGIN=$(usex mount)
-		-DNETWORKMONITOR_PLUGIN=$(usex networkmonitor)
-		-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
-		-DSENSORS_PLUGIN=$(usex lm-sensors)
-		-DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
-		-DSPACER_PLUGIN=$(usex spacer)
-		-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
-		-DSYSSTAT_PLUGIN=$(usex sysstat)
-		-DTASKBAR_PLUGIN=$(usex taskbar)
-		-DTRAY_PLUGIN=$(usex tray)
-		-DVOLUME_PLUGIN=$(usex volume)
-		-DWORLDCLOCK_PLUGIN=$(usex worldclock)
-	)
-
-	if use volume; then
-		mycmakeargs+=(
-			-DVOLUME_USE_ALSA=$(usex alsa)
-			-DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
index 54f0fde0b571..7194955836b7 100644
--- a/lxqt-base/lxqt-policykit/Manifest
+++ b/lxqt-base/lxqt-policykit/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-policykit-0.16.0.tar.xz 38016 BLAKE2B dd077f1a25b9bb5ee56f7ad08f24254936f3b5f1b6ab4c9148ebce160867b8535341353339470d4363fbb52eead522133ed702f7d98b78cc08df58eeb5d6467b SHA512 f6eae925cbf25064addf5d89999d16a7397ddb0d8c616f75a3b81df57a42a70e52da599fdad6b8589a1e951cf46cd541e9a23e352a0d2ee309116b6e0238cfa9
 DIST lxqt-policykit-0.17.0.tar.xz 38272 BLAKE2B e141d0ff7a583b22ddddcde3875cf82a5215cef0c6270774b3b31e21608f16bc78dd45b3b36b8ba1fde3bbeda30b2f638a47ecf7dee1797da151cb701fecc866 SHA512 1cfd4b2d21840704e4b15ae71098e9c6f3d51031293f1fdf6e134ffee867fe4e845caaf24fbd2c107317372b90b6d415a76854977fa8f6b703e708bd09120328
-EBUILD lxqt-policykit-0.16.0.ebuild 833 BLAKE2B 15b02ea4c81746f29a7d4d630b4f8e71ad0589d2b443f9a6bf3ea77110f6dfa906a8e447231e14b6223950c1c0e56552fc89717331a5151dbf8b6977678db6ce SHA512 bd483e74ec24f9c040f4acdae137e8456f0c9199e211023c31e63d03e89cd575c3d38cc80e79e958e5b1b171653bf56b073568fdea9a82041316c90ca8c15e08
 EBUILD lxqt-policykit-0.17.0.ebuild 819 BLAKE2B 15f1ebc555976c2ee2b60d15abc9e69ad7d6cce3b88af980e29b184cbed88ddd10e729d2dacbeb3c35235de5feaf049d99cc8cc145e35c73250799d9d762c350 SHA512 21eacb96d87bdbc6f72abf3d56b62592ef9869fa56214c873b89e8e1a8618732681603a0a9e22a3289960862f97ff1ca85e067d4a307f72402ec9704f3248b66
 MISC metadata.xml 321 BLAKE2B 749c440c7f991f5082d78a5b7caf74b61aa40653611cef2fd1a10991dcae8c170ae1535eb0e298865f70fc06dc2ae5c6d6d8243644a421dd3f36c73ddc6fde37 SHA512 ded23c529e8f5ff9f7fb1ac11b0c0f128ad7294ea890d35d3b30c8ed0c7866c8f65bac504f8d790cabd986f40a4450e46370b5b72881272e55c51207f1e703d6
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.16.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.16.0.ebuild
deleted file mode 100644
index c8c1a342486c..000000000000
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.16.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt PolKit authentication agent"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	sys-auth/polkit-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_install() {
-	cmake_src_install
-	doman man/*.1
-}
diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest
index 2e4cdf332434..27cdb23a68f1 100644
--- a/lxqt-base/lxqt-powermanagement/Manifest
+++ b/lxqt-base/lxqt-powermanagement/Manifest
@@ -1,7 +1,5 @@
-DIST lxqt-powermanagement-0.16.0.tar.xz 69784 BLAKE2B 44ecfc540c60ceba4cbf3408d246b70a1cfef84c2bdff7b0e5e386cc020345aa2e3d1a1b5f916f71e421501208ec67faa76b327875e3bc9f7c69fd338ad5a5e5 SHA512 d262dc5b182678389d7ac38da5fd3c9bef75ceb9c9733aae3fae9f59d8b2c5e87524fdcdafcf9ec98ad107c23db946e30431f743c6ef8011f70ec4d9fc63a72e
 DIST lxqt-powermanagement-0.17.0.tar.xz 76080 BLAKE2B afd12f55d5274263707044c77f3c556dfbb4e2adebda600650e32130ea88a08b0b009c14c31217f85010182edae17cb0d58cd9bb83ba47a1d437e661ee7af6ea SHA512 24bd9a136dddd35b0fdedd5051764109965f3cd32c74acd78cbca1e5fcfc91cddf9a756665c6e700bf882ca0307bfcbc855bde5fbdb2509390e16366e7ee9548
 DIST lxqt-powermanagement-0.17.1.tar.xz 76356 BLAKE2B bf1f6b599ed9a98faad550bdfcd1635114c42767a50578974d6b902d514ca0d2213b5f99e937a52d6c7ed4e1812db2e2c523b0ed8b0fcbb79cc52e7e6114ad33 SHA512 a08784fedc360610011b97ba1466480172fc1b4eb81ae3e6d65052affcd0ba3c122d476f37d55692d91ac4def30663fb09242fdbca8c0bb9fed0f60bed7dc579
-EBUILD lxqt-powermanagement-0.16.0-r1.ebuild 928 BLAKE2B 2fb5efd66e9389ce7dec76bb053173648426d7e83e4b4511e230a2a4ddee73772aa800a48eab7fdc05cd4bdeaba69cd1892fcd09718c86f0dfa4bf323a3c120b SHA512 ffd973c67ff05b0dab308c75c33a3aeb63d0cd0374f0fce5a0da61799032abb998323100d29cdb42449629899e42c210ee8bafff85bbbc8876ba3fb1cea6d0c4
 EBUILD lxqt-powermanagement-0.17.0.ebuild 912 BLAKE2B 7a843288ed62c591c1cf46aa5a00e657c34039ec8566303f8f975f53937cfcbad742b444aed71766e3322cd7b402f5277b6d41e63579cd5e39a47c5b008bf5a8 SHA512 59ed4bb7000deea5fa2a8db13098532d9ba9c3c8787ad6e7fab1a4e336ee29ccbccf105b4ab2ef1c36f9abfadced70f54eb5713d0a74846f5325d109de5def8a
-EBUILD lxqt-powermanagement-0.17.1.ebuild 886 BLAKE2B 05f4106c8038dd72888ebfcbd6f6fb351fc15e6c5543cd61dd4c747ebc1d81504b37c4f28d57c677b48ad69eea67bb1fe0481a322c59cdb515eaa1b51180b278 SHA512 0d7b754d713c39ae3fd059f59d3a4a516f3b2ecd8c323fa24ccaf09e02ff9530bd493de7e9d214e66c2be261983c99848a8421b861f1508a1332f52e11c5f771
+EBUILD lxqt-powermanagement-0.17.1.ebuild 893 BLAKE2B 4895d7c590577245421c0d05f3d708664dc6e2a46a556514954b05631c1174b031dfeecd71dda2c11f66c33b148de059726ae342eb156b6c58f24c5bbf0b93d0 SHA512 bcf88de7e1238f8a2b1f4cfed4de195f4011e0c09a6dc940e1efd5e91572447b5b9a46314763c93813b87824a35073a550c90cb1a5952ca5917a38a1d41d46be
 MISC metadata.xml 327 BLAKE2B 700e42c425c66407a1fbfd5f44a91970524358328844a034d43d40cbb80da6b5b9c4c7d23835a09f528b30eaba26d48348c7120ab0348277717b89191ce7b180 SHA512 ada3887fe8b81ecd541f669107a50ed5ea5888f6e34b384cf0ce274a0951928549d7d0ec7c57e5d3ae1e93c541bb57b77d188691ff0b80e8e4cf00b98d1ada75
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.16.0-r1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.16.0-r1.ebuild
deleted file mode 100644
index 95b2805f8158..000000000000
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt daemon for power management and auto-suspend"
-HOMEPAGE="https://lxqt.github.io/"
-
-LXQTPV="$(ver_cut 1-2)*"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kidletime:5
-	kde-frameworks/solid:5
-	=lxqt-base/liblxqt-${LXQTPV}
-	=lxqt-base/lxqt-globalkeys-${LXQTPV}
-	sys-power/upower
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.17.1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.17.1.ebuild
index 17f75773a7f6..272ad968fb3e 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.17.1.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.17.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index 6306f9351060..6839f8f8cf28 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-qtplugin-0.16.0.tar.xz 23640 BLAKE2B 53bb3e2f9dd9a72a148858af2b7b5729aeb4337494695ccf936c1c2ce13fd6e46fce95b738c000def6b8871b1f045de651fdc1d5aa3acf900dedc1d02ce59d7c SHA512 8dc6174a5b2a43332b40509b466095912d31407e70d5d3487243de3a25fd07e925fae8f46359f6b69f2e4d7e920a7ba0ae5982a8d7ad9129ffacb4d62e108203
 DIST lxqt-qtplugin-0.17.0.tar.xz 23744 BLAKE2B 226adea0061d38b93b621fb4cb745623eafc57ea4184bb154e50f31da8b7b7c2e51158800b5dfb4dee78e986280b42f3822a47d426f970bfe6d62d11338b6e15 SHA512 5fda2858223de1973dede43c4a278c0ff07006b087a19fe9088113d93e968716a6b0ed59624de3d69924961a2dba184955b73b380ea007cf9942e20ec1614fb7
-EBUILD lxqt-qtplugin-0.16.0.ebuild 764 BLAKE2B 0e1c59e7fcbf13434c37b1b054be3f77b28b092c26ea82e97a631e5030c30413292be369cd1ece1d533163387150ba7379d90719bc4c336127a4ecd362d8aac9 SHA512 f3ab4988d67905dca667c782b0708181eee6c9c6b4d98dd27b84c45630f4e56f52490b3c573be850ae17581dc502a28dd6c2dc70e483f4797fdc6fad78dcbdc6
 EBUILD lxqt-qtplugin-0.17.0.ebuild 771 BLAKE2B dd894b4b80e2ba00f83a12869f840527b1f917dd93a39fa842907134499652de3dcaba87d849ae76fef9f906243084ed92fb4363b71081edcf6f3aaec9b31170 SHA512 af60d776a2ee276cf8e670b62ab80def0d633a8bf8d5bcb656829f0ac85cac5f0588b039bf9e819dacc5eaaac2d5eab69013c35a7ed9e9be3353d4e245e38c69
 MISC metadata.xml 320 BLAKE2B 99d2f16c659f275df9b5a28f97af1452695c45ce5545bc5731f33bfe1cef75163d25697927e0ff2c1a380edcd24dc4709a5b4a0473ea772ab98ce3e89e2b2376 SHA512 43e64d21696bf09b6d20533e3699c8918fe2a49194a7828967a3229621d223815b5c5508a00f64498fc6655b5f0bed9f59a9ee2307f68d653ad4864174730c15
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.16.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.16.0.ebuild
deleted file mode 100644
index 7cf57e4c265e..000000000000
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt system integration plugin for Qt"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-libs/libdbusmenu-qt:=[qt5(+)]
-	>=dev-libs/libqtxdg-3.6.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index 9305a7568b04..00e60155d510 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-runner-0.16.0.tar.xz 224496 BLAKE2B e5e2802eb9d90a28720137cba205b662000f8ce0ec9f1e7c9b2c3053b12a966c7a16e2d89526f82fe60ca80df38418fe6b5a5ff75a946eae833af7219b908dd4 SHA512 ae7aa1a8e6dbc3dbb464ce2812820eab98f073dacfc4195fb54adae10d69bdaaf25f852d1955c785075c31a8c75bfe42fa2456bc366c8293f0b94eff53c59c88
 DIST lxqt-runner-0.17.0.tar.xz 225672 BLAKE2B 114ef09d79edab21fe5320eb8c94e63ed491e7ee5063d69d6ae726ff482a52805e792060cf308811567aa92c24802f7524a736e05caceafc6886df3d27c8add8 SHA512 cafb6c722c803f9f3e1902e7fb3945c7028ec0bdc22b46d7fc0cc0cc305dea8da8c9098baf97e2db30fa82d88d9d59805e403eacadc6d2b311d1b289cde2ad74
-EBUILD lxqt-runner-0.16.0.ebuild 906 BLAKE2B 3c31bf04e01e814a6b428b719a97edbd3a320bbbb1fcb5d875e9887989230822dc0d90eb590b68c0168aa032dbb51be91fad298c11dd93c7e5c534d2f83f0a15 SHA512 b05b0b252185cdb209239d1e86efc0e82a4cafcaa4e05b0e045de93c0d05d89114bf595304a823ebe0b45e9d5e7ada2be582cf22aeb7dc7e40028d1095b8b3bd
 EBUILD lxqt-runner-0.17.0.ebuild 890 BLAKE2B 050fffba599b53dc825817dd92a0998b45069cfda27cd7e184165b1232dc6dc769c8ca3b89ed141d1100345e49c620fd9f02738f86cde999de9054152487df65 SHA512 670b788265a4981b8cd9950c99e279a375ebc8cab292cad3457885da0fefb29e9c5ba51f425f369cc8958302a7fa870964eb8cee3b8a1c6a089727cd11745369
 MISC metadata.xml 318 BLAKE2B 71a6dd14bc178376682505f23c51b445c52665d98b7acc8d69fb65fc7c34b1142d4df7b88d704d2bceb3c6f65f92305cc040957b86a19102cbd42b327f0ca108 SHA512 f602edf93e4a0cbd8b27dc9bc893cbbf0e40aa226df6becfd3aa8dff8b63e4f215888a91c961de5bf6cc89f29f0fad9c17a177f77c8f68fee18362c7c391221b
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.16.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.16.0.ebuild
deleted file mode 100644
index ba2e8080d688..000000000000
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.16.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 cmake
-
-DESCRIPTION="LXQt quick launcher"
-HOMEPAGE="https://lxqt.github.io/"
-
-MY_PV="$(ver_cut 1-2)*"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-cpp/muParser-2.2.3:=
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5
-	=lxqt-base/liblxqt-${MY_PV}
-	=lxqt-base/lxqt-globalkeys-${MY_PV}
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_install() {
-	cmake_src_install
-	doman man/*.1
-}
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
index aeb43e0806e8..a192c858fb18 100644
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-session-0.16.0.tar.xz 180084 BLAKE2B 28329a4d28e6f9fd310953053d2169fa50c340557137dfcc627b8d650f32f4d09b80abde9601777d5a455f5387621f93de63908e6ea3c0d4340aab6a4757b9d4 SHA512 ce15b985ac5b11c16f58ba893ee7045aeb4f47fc77c7215a4d4ac0b782ebccf8e8f726d0c463638a5ec0101915ee367cb7d714035c1ea3057c5f3d9b7f0fd3c3
 DIST lxqt-session-0.17.0.tar.xz 179028 BLAKE2B 5f5a152f294482cc22e6285b22041eab6769d65f1f8ecccad560187e61827e4aad50a3069ea14044cd77610a4a4d3e23b575a427a4098af946d79d5b24df00a5 SHA512 e3573ee76e5fcf285b0ddd177ae7324f6fee038ea110c950d7054da622bf6615d9ac8715cc0cde6db9034d710933a80c80f14470197d2cc275d48695f74ba7b6
-EBUILD lxqt-session-0.16.0.ebuild 1156 BLAKE2B 5e5fdda2be3c582ec7df6eb941cc76fa1309076b2101f74bc0cd544dea6e5f4e1d8b318c7b5ff1bf74250c506ec6e336887bbe304e91852413ab19f825d9682c SHA512 465be05afcb0b0cfeb0b14c59219a6ac1fb3bb7e85d0b5162630a77d4c6082bf57e22754282f118f1fd5889590f286f29890317e7a17d05d14e7e33caeebc21c
 EBUILD lxqt-session-0.17.0.ebuild 1140 BLAKE2B 4ab06a96c7badbf9a9f56abf12c539096c8aac3ee7144acb76ce0f60824d0d4e6e477ee63caf512c6a8d2686b04d5b00bbde4351422e33b99132c0c888d5e678 SHA512 f6179de776f24a25150b3d0d999789ebe4e8e5d5c51949c3118f496cebaf5e88f79a744ae9c82a876fd28e910a491a49e99a94c235453d1c12035b82889c97d6
 MISC metadata.xml 319 BLAKE2B f01907a5771d737ed098eac22c2ea675fac55220f769eb39840ce2d191b43435cba772bf4be02bb6d6e0f42846de63f4e05d6eb619319e0ca0c5a79011faa079 SHA512 94cd5c19cf9b8d66010b86b91f689f80e385f77f4fe3ffbefc8224be07f1a9121a5a37b6af44160645b4b5ba7fc4c238c08f0dba237381dc5d4158cbdc12bd30
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.16.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.16.0.ebuild
deleted file mode 100644
index 0a19ed557b94..000000000000
--- a/lxqt-base/lxqt-session/lxqt-session-0.16.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt Session Manager"
-HOMEPAGE="https://lxqt.github.io/"
-
-MY_PV="$(ver_cut 1-2)*"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-IUSE="+udev"
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kwindowsystem:5[X]
-	=lxqt-base/liblxqt-${MY_PV}
-	x11-libs/libX11
-	x11-misc/xdg-user-dirs
-	udev? ( virtual/libudev )
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LIBUDEV=$(usex udev)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
-
-	newenvd - 91lxqt-config-dir <<- _EOF_
-		XDG_CONFIG_DIRS='${EPREFIX}/usr/share'
-	_EOF_
-}
diff --git a/lxqt-base/lxqt-sudo/Manifest b/lxqt-base/lxqt-sudo/Manifest
index 82505d13a47d..d27345391632 100644
--- a/lxqt-base/lxqt-sudo/Manifest
+++ b/lxqt-base/lxqt-sudo/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-sudo-0.16.0.tar.xz 35088 BLAKE2B d19dccfd7f6219473184ba93cbe8179da848216ba8080aa3754600083e8d2a20a55b403a9bddd99fef636a24e36c3ae098e110ff05f0debcbce2953bed2e167e SHA512 425c1bf1a4c2a6fe3933419c77e0d1c5f576902cf5cfd2550890e037c32c3021eb8294831f26690ff2488ed096fcd271d664d9f67e73374559c53e7669089694
 DIST lxqt-sudo-0.17.0.tar.xz 35884 BLAKE2B 3fbe32f21eea9bf923e2117fb02a4f49416d82821f4d13b12aabfed8d565987fead118ad108293b6487f3e43a99013c8c06abcf5fcf63f90ed2a081fdbed8051 SHA512 bbd33b4e49392ee0ab611558c72842d857d2d8af95ec2b3a0db6bdd0b7062dfac24cfd468e5b1a2197ad684a65fe629993c98a5f2bb24227ce0df7dcd04127f5
-EBUILD lxqt-sudo-0.16.0.ebuild 675 BLAKE2B 9a37bcc4a8ff495e1f5f62776f85ccc9c71eb5b68a0ff130c5098cf1504f0389c285cb84e82c7729fe2794f80f8e8745d081c860bc7ba7ba4cd95dd208654250 SHA512 e6b5a009a208ad80215f4d75139ba6f9e72a7b8048d784c01bbc7e85cfec4a36552993e588d966f91f5037d4ef385709d02159a0a62ba765440b44ea8bb85f26
 EBUILD lxqt-sudo-0.17.0.ebuild 659 BLAKE2B 5dc22dec736e22501f05f221d692361dd135400b309624542562802cdb46f27504c57d77325d0b4bbfb8908c7653523220b0dcbbbe56b2f208a254ac8aa366a6 SHA512 1f3af5d41e6a050632e4867277a750165bbf9abb64fe200f6a42ac5d90c8051e69db1469fe9cc72042ece54521e43624855557473703cf27a3e667fee588de1f
 MISC metadata.xml 316 BLAKE2B cfefe2b527977ec1df7d8bd18583f6da43f171da17c7b8b48a495fe257b4235732db9ec918e1dfbba40d46a786ed93f1bf26cce1b44cac61f6e2439319598712 SHA512 b07601666f4f8a844d0bcb6dd46e6a2b5bc899ed32778cd09eeee6cc1901f22ed60ec82e1323e196befdb62f330194d6775ff13085dc68e5106faf31c09ee2e9
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.16.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.16.0.ebuild
deleted file mode 100644
index cc369488f0b9..000000000000
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.16.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
-
-inherit cmake
-
-DESCRIPTION="LXQt GUI frontend for sudo"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
-DEPEND="
-	app-admin/sudo
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a2c1f7bf418d..f38eaa4936fe 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 6a45ee22e2c0..501e388ce440 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -3,7 +3,7 @@ DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e1
 DIST claws-mail-3.18.0.tar.xz 6517632 BLAKE2B 534a37a081ceeb4d3066717d738d04e2027d38c621c15091506ec117a3b592eedb6f3c67afddd972424976398019fda3d618db4083f0a05f39e7b8f07a1c2138 SHA512 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
 DIST claws-mail-4.0.0.tar.xz 6390300 BLAKE2B 291c62e7dc0329ce12dd571a15f19942ac6ae6f3bbbcba3708afbe30682392883ceba165356d4be68e3b655aade85ecdad4ed8a296517b37fd0f7918e8418d51 SHA512 26d207fb8b5ce8b814a8a712843a209f58c8c9df3e9623387322b2e70ac351c71ac8b1ff77c52c5df9a14a46be7f65413efc0a4dbcda1e70ecb453f042da153e
 EBUILD claws-mail-3.17.8.ebuild 5819 BLAKE2B 0b72ef52caa8f8ea581cf115df92d676264fb9fec881bfc45ef7c4a97aa577e28b51bc855196c708f8b5706b49c6f64594be9f364f97f98b75ac360d51264f4f SHA512 a4289b4097e83d65454a7b985ea992bdd3c9582f67f611f70357bebdb810495d24b0b2a858bd53835342e988cfe1c36379edebde870d40930fca921b55473e2e
-EBUILD claws-mail-3.18.0.ebuild 5612 BLAKE2B 3fbc8b378df524af90ea4f892b2665c26bdd794fb48af40c913c0bc886f297cbcf0c2836dcb624af18097b3f9d80c89d1d19e27c52bcb5bca9658d83dbcae852 SHA512 63a15e773e79ec27533b6437733d40116378f6461f277928de506930bea1991e0d406c4cabad77b3a5105ec8a38787aeab659fd4c7550b324e7cff9ce4095917
-EBUILD claws-mail-4.0.0.ebuild 5617 BLAKE2B 097e014cf0813657a36845f3c70b02222d3cbae33f95797bc708f18e3fb27aa253725d2e48a37528d1609451c793d5e3235ab749a4eef1c6f7fdba90d192abb8 SHA512 8c80e2beb4f3ae07848b0c40918abac1d7ad68975116b7ec9a615b7c8ebc1ce818662a5a6fb884b4ea51c8cca6ccd8e04696084cab1c655921344fd342a2611c
+EBUILD claws-mail-3.18.0.ebuild 5619 BLAKE2B 127ec3a27ff10ba888c8eb38dbe1554a53e91e48e5c566bc3cc6a91ab78fa641a5a71ea806742678e6a0dc6331860224cd862ef5ee25d7238aa9893dba64d6bd SHA512 e1d3a53f2b0ecd925b7114c6c63a5cbd828dcda11522428581b5b3f56c7a094edab68f873194d9d7ee163fb5bde4efdfcc36a62757c30d69db6a5643fccd0c89
+EBUILD claws-mail-4.0.0.ebuild 5624 BLAKE2B 7f81fa67ffa10ccd4bcf08532669f2bc54c2d53ef22a9cf49004faea06d7a8d43eef50cb871c81a18bbacc14184c00110b8a2bec55022d952380b1091a0f5404 SHA512 6f635b8a8a62dc647eb86c57a2177153aa6f9853c6c8d155de9e4067dcbb502c6fb75e93a97dc10a339694d58f945db3bcb8e4a2fa5c6434b73b5abb4a8762ae
 EBUILD claws-mail-9999.ebuild 6011 BLAKE2B 6ae0cd5309e1f715bdd9abee4675bba545a4bfeed04ae98d14dfae3c1232069d8738269593095c1d2c415ff5a632aed4f928579daad601942a38db7f4360a8cd SHA512 57aab86cd5b19892c4f2cdd0bdbc99bde5b756845f92a4f1737e75c6194ae9b4fa14b6316990e550e56b5f8208c64f60626c660eca00c4907468e9c5d6577a82
 MISC metadata.xml 1468 BLAKE2B 51e786691dbf1427b1532311620e6c844eb1c88fdb1df3a4935fdfa07e952fd5b9cddcf4ab2610561cdf381a14aaf42e15c544bd6cff76a62277e15571c9b45e SHA512 da6469f631ee92619caaddc6d924e41488eeaa956d5150414e6552d560f9e188a64b2df1e67738f40b6ad34b60ab9f1ba50fafafdfdfc521c3bddbc6df0b45d0
diff --git a/mail-client/claws-mail/claws-mail-3.18.0.ebuild b/mail-client/claws-mail/claws-mail-3.18.0.ebuild
index 353b92186afd..5545aefe2aad 100644
--- a/mail-client/claws-mail/claws-mail-3.18.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools desktop python-any-r1 xdg
 
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/claws-mail/claws-mail-4.0.0.ebuild b/mail-client/claws-mail/claws-mail-4.0.0.ebuild
index 5d1d705aea0e..2881f9a1b138 100644
--- a/mail-client/claws-mail/claws-mail-4.0.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools desktop python-any-r1 xdg
 
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index a5f887f5e739..74166daeda4a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch 1175 BLAKE2B a01218e92fb230f7adeacec1803acf80d8e2c44494109deae9b261012c84e1b8eda160f2e663504d30f0d67a52ab39be206b18b04d35a5da3d0b8f29f0ed7f34 SHA512 6bfeb433b5d9ff16e70b7765efd537cb6cb27c5fab9396fed88f1ba3d683a90308afd1a6c7b25af44c5b3d53f54138d6bd671d8330999b402dc887a5af7ca424
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20210205-r1.ebuild 4224 BLAKE2B e852dda39801c465d68dde4c9abff7b3c0bd768f1aff943c923bc710df9edb3a5552cf61cb6ad8cc4c272fa6636eb72a0c648541e7289d9fac5793beb3c79ee9 SHA512 fbbea677349717ee6052e836b9995ae6db4c384fe8369c7f9a20a1e6d8b1fc08f4965837e6473c8bded740d7bf40aca30de731410a9a5fadbecd5ba320053937
-EBUILD neomutt-99999999.ebuild 4142 BLAKE2B 935dc2ee61084dee8afb2113843f129210d395218a4e043d6090359994e68cea3fd3b6451e3a9320c4e7b530826dd9a575291722c506479002bb0cd38b21b2fb SHA512 5ad4d4936199a4e8c349b774c371d7cf80483c6fd2acb535fe24b2e74a5c9688a3640bf5aa355435ff614cb70f6472c97d3f5dd09a6c5c74ee091d8a3121c74f
-MISC metadata.xml 1349 BLAKE2B cf83e3559d3289bb6eeb1f451ce7ef854ed511eb080d0b03a2ee384fb73fc3f4114ac662288e62089ec2dcea9db76f1425bc62b72bc65f03963a52ebde326589 SHA512 8e41332f1ebc2cc627a8960baa599925b9ae481726cb1c559569e85b63389545d2f9db9fbb994f3a7af9536f0a2ab35fcc1ac527d5df2a2a7cf30d5b578220a8
+EBUILD neomutt-20210205-r1.ebuild 4404 BLAKE2B e9ac5596196d2d9ac8c462bc099adf7f775bb782c821f978ab5d9811f8cd7df3ebc1d4a0de9cfe39d4712265def68c6b22d94948859d33e55bc56dfd72d4ed30 SHA512 e374e339d62b4807da033d5b1907f43064773763e38e157b3f9de6d48b41209efbe84bbbcc61fe5325b09ba1f8b6e2f632e5c4e3c7dd2b28a62d2861ec1c1261
+EBUILD neomutt-99999999.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
+MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index ba1eb61f14b3..f0351b470d80 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -27,6 +27,9 @@
 			traditional/inline PGP</flag>
 		<flag name="smime-classic">Build classic-smime backend to support
 			S/MIME</flag>
+		<flag name="lz4">Add lz4 support for header cache compression</flag>
+		<flag name="zlib">Add zlib support for header cache compression</flag>
+		<flag name="zstd">Add zstd support for header cache compression</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">neomutt/neomutt</remote-id>
diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index ca913af6f3c4..cf9c213f4c7e 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -22,8 +22,8 @@ HOMEPAGE="https://neomutt.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -53,6 +53,9 @@ CDEPEND="
 	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=
@@ -96,6 +99,11 @@ src_configure() {
 		"$(use_enable qdbm)"
 		"$(use_enable tokyocabinet)"
 
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
 		"$(use_enable idn)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 2731fc6fe9ff..dd0fe7e9a572 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -22,8 +22,8 @@ HOMEPAGE="https://neomutt.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -53,6 +53,9 @@ CDEPEND="
 	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=
@@ -92,6 +95,11 @@ src_configure() {
 		"$(use_enable qdbm)"
 		"$(use_enable tokyocabinet)"
 
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
 		"$(use_enable idn)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 8e867a0d68ef..b7d1dc7095c7 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 9a1ae8f6472b..c4b63ba742dd 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 DIST bogofilter-1.2.5.tar.xz 801240 BLAKE2B 90fc5f0ab258ada722ca2fb79d17279b621eb089f646eade2ab41b78c44deea7f3fd8f219053e09ce5b4c64f5fc81f43a17c20b84261b22d5529c06106e80b3c SHA512 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe
 EBUILD bogofilter-1.2.4-r4.ebuild 3776 BLAKE2B ca33d99ba26303b43236143b6039f640e2fd2a85ef37c3e5efd8a06d92d941e201cb25d9e7b30e3c9dd876aeba69cafe9ac9bab20f14a17984a331f173d7c628 SHA512 57925f55342e5c6adcbd62d59523f5b9082f80843e66eef83e1f5e720dee7c20b5ed7bbff9d26185a27aa991a803ae2e25589dc35a5801f68c6fc375982cbab1
-EBUILD bogofilter-1.2.5-r1.ebuild 3735 BLAKE2B 4ec21b0d88008c9c1e4103b7d2e8601f30eec94196139be2430435051b2260f657fcc5efcf95e778d9e8749b37d6bd394c00402fadb285e148cb0f508bbfd167 SHA512 6cca07e3972056a32f47feb5334d5368209068d85d1c7094f7ca102668e50e291bfe0bbabba709bc078b2fce0fbb4fdfc261d2b7b56c6e320ee7f15eb933836f
+EBUILD bogofilter-1.2.5-r1.ebuild 3742 BLAKE2B f180e7bba5d1359d35f14d91fe482f313ca769a2d1ac58b12bf5c20b9b7bd3f8cad20b8e0fa223546b3697968a4e96780b8882d0f8e3f1509a6db572d6d51ac0 SHA512 559b34acc549915019c20d8de142ffb87735cfb3c602afe502aafb93893e9c47655df7428cf3943295ff1d137b83238eca0550c5c8542ec35f0ad86dd1aab5d5
 MISC metadata.xml 604 BLAKE2B d67129c25f986ca450dd263215cf6f88b5ee0b16ebb3e11aff7d3a8fccf9152ecf78d29b2c02d893e042534b81e603c7aed866f802808be8b9a5aa96ed6b10c9 SHA512 5042ce7da18ccf0327e38b092e0602fa477d646413fd07bd9e58b66883179039c3d4e85d3644f1e9e696b1241447a460eab44aa3ef87470f41a2f32757be5258
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
index 91ec80334468..70cd191c4154 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 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="berkdb +sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 212cd3f511c0..aca855f015ce 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 41520afc9689..aa0bd1b8a6d4 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -9,6 +9,7 @@ AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a3
 AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-4.94-opendmarc-1.4.patch 506 BLAKE2B d8ba66e1165dffb9ba367b997d69090fa8b31aa6ce3cb17d6ade4bd3b3dabf2a2d93223106eeb7f39754397eb17979e66d52de8dc2d524de9019c9598cd89af6 SHA512 6145f07c0b5b4234160fd3480329759a06500b658643523f32bcfa9158258a9b708095725f2e56d5538567f888c5e0e954c4ac51c8f2d16921dc4950241cd2fc
 AUX exim-4.94.2-fix-crash-resolve.patch 809 BLAKE2B cd9d3d923510315f75a3bad8c56b89b59782f9af8523a794845b1163c0bac5682f311a86eda1b8e78396d77c159629ef5186416626ebe627d723e17e3b388afc SHA512 a00960409e835dd067c88b4cb34953bc9343417ddfd448f5042b1597bc127f95937a5d8786d6f3ae347654842344d61ec268c7ed37e0f05c79ef7c530f741a7b
+AUX exim-4.95-localscan_dlopen.patch 7621 BLAKE2B 6df3c1acb585dc87759e056f7bb44e50219812c3ca41364fff77942cc2d6f7452d8f4c158f17295bc586eeacc8048e24f767bab0464d300a7cb7d357c63bedd9 SHA512 1cf52ac9637a753ff7257c274bc09591a8c761fc6599cbb2cceb213272573c371dbc5db6b028c2f745989013c21af54c45facf5f2bf5c87742e299c12a9b8a1b
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
 AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
 AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
@@ -18,9 +19,11 @@ AUX exim.service 229 BLAKE2B 6d6396ef98b8e7c4fcfa28e24223bd58393387abedfb960284d
 AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa857d0d32285abf6db23c3d717992c43443ab4bcd97a19ec3811f182200a2d99a48ced6cfb6bc SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046 SHA512 5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
+DIST exim-4.95.tar.xz 1865172 BLAKE2B 0dc8dbc394c1bf4c6075e6ae1c1609b3f41841b2bb4c210d7353e4ad28ab38f905b6c245539bfa772512e2a9baf2dcc855e31d6ccb14ab49077f8da4fe6f1d0b SHA512 93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d SHA512 3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
+DIST exim-pdf-4.95.tar.xz 2117384 BLAKE2B ac310ec7741110a067f2df135b6397a8219e48a1e8989c66118f6c62820467e6f7b1c391799ff9b7ddef7896e1340208c4bed21f126014fa94c24d338f681f94 SHA512 47f30f3c82fe2cb5b0836594b325da1d255c53d2514af90e720d4bf6c74cff43d4a6b1ab5fb7b148253e5330da74e8ebb80e29b3a08fbe1faed2f004476c9d6a
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.94.2-r4.ebuild 14997 BLAKE2B 3310c70b714502a63fdd9661bfd41964502ad797d24a772923aee706bedce01914506671de09dc892b49efeaa1273125932215ab474fef09ba7eaba5fdbc1117 SHA512 8de6e22d61f302056032a9b9069429086e157898d26fceea59a3384f0f2d204a5719fd8e6ffa36e2e9b60231683d42d40fb2497164d990b5e2adac68d8e4b038
-EBUILD exim-4.94.2-r5.ebuild 16187 BLAKE2B 7c94a9819769508a34d432020c781a127ff5967abf58d9ee6308461148583066b11a6beba4835d0297f6d96a896639e6fbe0edb0ff98ff6b4da1f326b589a824 SHA512 d6f39e1f2725f315bbe2885e6cb16c0058adb82beeb941439e6f63e2b13a3c5ebeedcdc7071bb058cb084c88caf69579a2a68ce725bd6b1a21a9ecb0a373e641
 EBUILD exim-4.94.2-r6.ebuild 16264 BLAKE2B 8741216d5b88321cfce21823f40bed7d5dc4018548ab6f65a0df24ed19333d6647094c8bd61b55863860e3a9d570cfbe2c6fd6cc279723dc4325cc18541e5e9d SHA512 df1ca34e2a2eab3e6b139037463d1303da0d4890e4f684901b3763718d66ad71b68278f5d5ae55a8644a6e8b01b7b947d2b729d32c662edcebf1df08cef9fba9
+EBUILD exim-4.95.ebuild 16124 BLAKE2B 5e5eb994c376da2f504ccecb2a6d5790a011fe085da640dfdf84a0efc44c2c85818955b159d80e669012cbeb2ba305b04e628f11e4bd25fd03719da2ddc4bd09 SHA512 7d298526d4019b5c8e6b0cb7f6d2a074deb81e8b4a1c65661ab0adb07a01898b8face1ef9d0a0521a58c52ce165150ce581686de6053a7e35552f795eb9d77b2
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/exim-4.94.2-r5.ebuild b/mail-mta/exim/exim-4.94.2-r5.ebuild
deleted file mode 100644
index d664f4b1c8d1..000000000000
--- a/mail-mta/exim/exim-4.94.2-r5.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs multilib pam systemd
-
-IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
-mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
-socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
-REQUIRED_USE="
-	arc? ( dkim spf )
-	dane? ( ssl !gnutls )
-	dmarc? ( dkim spf )
-	dkim? ( ssl !gnutls )
-	gnutls? ( ssl )
-	pkcs11? ( ssl )
-	spf? ( exiscan-acl )
-	srs? (
-		exiscan-acl
-		^^ ( srs-alt srs-native )
-	)
-	|| ( berkdb gdbm tdb )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
-# incorrect, but b) is the only "correct" view from repoman.
-# We cannot express a required use for berkdb/gdbm/tdb correctly because
-# berkdb and gdbm are both enabled in base profile
-
-SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
-	 [[ ${PV} == *.*.*.* ]] && echo /fixes)
-COMM_URI="https://downloads.exim.org/exim4${SDIR}"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
-	mirror://gentoo/system_filter.exim.gz
-	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
-HOMEPAGE="https://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	dev-libs/libpcre:=
-	tdb? ( sys-libs/tdb:= )
-	!tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) )
-	!tdb? ( !berkdb? ( sys-libs/gdbm:= ) )
-	idn? ( net-dns/libidn:= net-dns/libidn2:= )
-	perl? ( dev-lang/perl:= )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[pkcs11?]
-			dev-libs/libtasn1
-		)
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	elibc_glibc? (
-		net-libs/libnsl
-		nis? (
-			net-libs/libtirpc
-			>=net-libs/libnsl-1:=
-		)
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-	redis? ( dev-libs/hiredis )
-	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-	dmarc? ( mail-filter/opendmarc:= )
-	srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXaw
-	)
-	sqlite? ( dev-db/sqlite )
-	radius? ( net-dialup/freeradius-client )
-	virtual/libcrypt:=
-	virtual/libiconv
-	"
-	# added X check for #57206
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	selinux? ( sec-policy/selinux-exim )
-	"
-
-S=${WORKDIR}/${P//_rc/-RC}
-
-src_prepare() {
-	# Legacy patches which need a respin for -p1
-	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
-	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	eapply     "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
-	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
-	eapply     "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
-
-	# for this reason we have a := dep on opendmarc, they changed their
-	# API in a minor release
-	if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
-		eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
-	fi
-
-	if use maildir ; then
-		eapply "${FILESDIR}"/exim-4.94-maildir.patch
-	else
-		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-	fi
-
-	eapply_user
-
-	# user Exim believes it should be
-	MAILUSER=mail
-	MAILGROUP=mail
-	if use prefix && [[ ${EUID} != 0 ]] ; then
-		MAILUSER=$(id -un)
-		MAILGROUP=$(id -gn)
-	fi
-}
-
-src_configure() {
-	# general config and paths
-
-	local aliases="${EPREFIX}/etc/mail/aliases"
-	sed -i \
-		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
-		src/configure.default || die
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
-
-	if use elibc_musl; then
-		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
-	fi
-
-	local conffile="${EPREFIX}/etc/exim/exim.conf"
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
-		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile || die
-
-	# work on Local/Makefile from now on
-	cd Local
-
-	cat >> Makefile <<- EOC
-		INFO_DIRECTORY=${EPREFIX}/usr/share/info
-		PID_FILE_PATH=${EPREFIX}/run/exim.pid
-		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-		HAVE_ICONV=yes
-	EOC
-
-	# configure db implementation, Exim always needs one for its hints
-	# database, we prefer tdb and gdbm, since bdb is kind of getting
-	# less and less support
-	if use tdb ; then
-		cat >> Makefile <<- EOC
-			USE_TDB=yes
-			DBMLIB = -ltdb
-		EOC
-		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
-		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
-	elif use berkdb ; then
-		# use the "native" interfaces to the DBM and CDB libraries, support
-		# passwd and directory lookups by default
-		local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
-		cat >> Makefile <<- EOC
-			USE_DB=yes
-			# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
-			CFLAGS += -I$(db_includedir ${DB_VERS})
-			DBMLIB = -l$(db_libname ${DB_VERS})
-		EOC
-		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
-		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
-	else # must be gdbm via required_use
-		cat >> Makefile <<- EOC
-			USE_GDBM=yes
-			DBMLIB = -lgdbm
-		EOC
-		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
-		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
-	fi
-
-	# if we use libiconv, now is the time to tell so
-	if use !elibc_glibc && use !elibc_musl ; then
-		cat >> Makefile <<- EOC
-			EXTRALIBS_EXIM=-liconv
-		EOC
-	fi
-
-	# support for IPv6
-	if use ipv6; then
-		cat >> Makefile <<- EOC
-			HAVE_IPV6=YES
-		EOC
-	fi
-
-	# support i18n/IDNA
-	if use idn; then
-		cat >> Makefile <<- EOC
-			SUPPORT_I18N=yes
-			SUPPORT_I18N_2008=yes
-			EXTRALIBS_EXIM += -lidn -lidn2
-		EOC
-	fi
-
-	#
-	# mail storage formats
-	#
-
-	# mailstore is Exim's traditional storage format
-	cat >> Makefile <<- EOC
-		SUPPORT_MAILSTORE=yes
-	EOC
-
-	# mbox
-	if use mbx; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MBX=yes
-		EOC
-	fi
-
-	# maildir
-	if use maildir; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MAILDIR=yes
-		EOC
-	fi
-
-	#
-	# lookup methods
-	#
-
-	# support passwd and directory lookups by default
-	cat >> Makefile <<- EOC
-		LOOKUP_CDB=yes
-		LOOKUP_PASSWD=yes
-		LOOKUP_DSEARCH=yes
-	EOC
-
-	if ! use dnsdb; then
-		# DNSDB lookup is enabled by default
-		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
-	fi
-
-	if use ldap; then
-		cat >> Makefile <<- EOC
-			LOOKUP_LDAP=yes
-			LDAP_LIB_TYPE=OPENLDAP2
-			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
-			LOOKUP_LIBS += -lldap -llber
-		EOC
-	fi
-
-	if use mysql; then
-		cat >> Makefile <<- EOC
-			LOOKUP_MYSQL=yes
-			LOOKUP_INCLUDE += $(mysql_config --include)
-			LOOKUP_LIBS += $(mysql_config --libs)
-		EOC
-	fi
-
-	if use nis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_NIS=yes
-			LOOKUP_NISPLUS=yes
-		EOC
-		if use elibc_glibc ; then
-			cat >> Makefile <<- EOC
-				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
-				LOOKUP_LIBS += -lnsl
-			EOC
-		fi
-	fi
-
-	if use postgres; then
-		cat >> Makefile <<- EOC
-			LOOKUP_PGSQL=yes
-			LOOKUP_INCLUDE += -I$(pg_config --includedir)
-			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-		EOC
-	fi
-
-	if use sqlite; then
-		cat >> Makefile <<- EOC
-			LOOKUP_SQLITE=yes
-			LOOKUP_SQLITE_PC=sqlite3
-		EOC
-	fi
-
-	if use redis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_REDIS=yes
-			LOOKUP_LIBS += -lhiredis
-		EOC
-	fi
-
-	# Exim monitor, enabled by default, controlled via X USE-flag,
-	# disable if not requested, bug #46778
-	if use X; then
-		cp ../exim_monitor/EDITME eximon.conf || die
-		cat >> Makefile <<- EOC
-			EXIM_MONITOR=eximon.bin
-		EOC
-	fi
-
-	#
-	# features
-	#
-
-	# content scanning support
-	if use exiscan-acl; then
-		cat >> Makefile <<- EOC
-			WITH_CONTENT_SCAN=yes
-		EOC
-	fi
-
-	# DomainKeys Identified Mail, RFC4871
-	if ! use dkim; then
-		# DKIM is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_DKIM=yes
-		EOC
-	fi
-
-	# Per-Recipient-Data-Response
-	if ! use prdr; then
-		# PRDR is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_PRDR=yes
-		EOC
-	fi
-
-	# Transport post-delivery actions
-	if use !tpda && use !dane; then
-		# EVENT is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_EVENT=yes
-		EOC
-	fi
-
-	# log to syslog
-	if use syslog; then
-		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
-		sed -i \
-			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
-			Makefile || die
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=syslog
-		EOC
-	else
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-		EOC
-	fi
-
-	# starttls support (ssl)
-	if use ssl; then
-		if use gnutls; then
-			echo "USE_GNUTLS=yes" >> Makefile
-			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
-				>> Makefile
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-		else
-			echo "USE_OPENSSL=yes" >> Makefile
-			echo "USE_OPENSSL_PC=openssl" >> Makefile
-		fi
-	else
-		echo "DISABLE_TLS=yes" >> Makefile
-	fi
-
-	# TCP wrappers
-	if use tcpd; then
-		cat >> Makefile <<- EOC
-			USE_TCP_WRAPPERS=yes
-			EXTRALIBS_EXIM += -lwrap
-		EOC
-	fi
-
-	# Light Mail Transport Protocol
-	if use lmtp; then
-		cat >> Makefile <<- EOC
-			TRANSPORT_LMTP=yes
-		EOC
-	fi
-
-	# embedded Perl
-	if use perl; then
-		cat >> Makefile <<- EOC
-			EXIM_PERL=perl.o
-		EOC
-	fi
-
-	# dlfunc
-	if use dlfunc; then
-		cat >> Makefile <<- EOC
-			EXPAND_DLFUNC=yes
-			HAVE_LOCAL_SCAN=yes
-			DLOPEN_LOCAL_SCAN=yes
-		EOC
-	fi
-
-	# Proxy Protocol
-	if use proxy; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PROXY=yes
-		EOC
-	fi
-
-	# SOCKS5 (outbound) proxy support
-	if use socks5; then
-		cat >> Makefile <<- EOC
-			SUPPORT_SOCKS=yes
-		EOC
-	fi
-
-	# DANE
-	if use !dane; then
-		# DANE is enabled by default
-		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
-	fi
-
-	# DMARC
-	if use dmarc; then
-		cat >> Makefile <<- EOC
-			SUPPORT_DMARC=yes
-			EXTRALIBS_EXIM += -lopendmarc
-		EOC
-	fi
-
-	# Sender Policy Framework
-	if use spf; then
-		cat >> Makefile <<- EOC
-			SUPPORT_SPF=yes
-			EXTRALIBS_EXIM += -lspf2
-		EOC
-	fi
-
-	#
-	# experimental features
-	#
-
-	# Authenticated Receive Chain
-	if use arc; then
-		echo "EXPERIMENTAL_ARC=yes">> Makefile
-	fi
-
-	# Distributed Checksum Clearinghouse
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-
-	# Sender Rewriting Scheme
-	if use srs; then
-		# NOTE: we currently USE-default to srs-alt, because this is
-		# what USE=srs used to be.  Eventually we want to rid ourselves
-		# of this external implementation.
-		if use srs-alt; then
-			# historical default, from 4.95 this becomes
-			# EXPERIMENTAL_SRS_ALT
-			cat >> Makefile <<- EOC
-				EXPERIMENTAL_SRS=yes
-				EXTRALIBS_EXIM += -lsrs_alt
-			EOC
-		fi
-		if use srs-native; then
-			# this one becomes SUPPORT_SRS in 4.95
-			cat >> Makefile <<- EOC
-				EXPERIMENTAL_SRS_NATIVE=yes
-			EOC
-		fi
-	fi
-
-	# Delivery Sender Notifications extra information in fail message
-	if use dsn; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN_INFO=yes
-		EOC
-	fi
-
-	#
-	# authentication (SMTP AUTH)
-	#
-
-	# standard bits
-	cat >> Makefile <<- EOC
-		AUTH_SPA=yes
-		AUTH_CRAM_MD5=yes
-		AUTH_PLAINTEXT=yes
-	EOC
-
-	# Cyrus SASL
-	if use sasl; then
-		cat >> Makefile <<- EOC
-			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-			AUTH_CYRUS_SASL=yes
-			AUTH_LIBS += -lsasl2
-		EOC
-	fi
-
-	# Dovecot
-	if use dovecot-sasl; then
-		cat >> Makefile <<- EOC
-			AUTH_DOVECOT=yes
-		EOC
-	fi
-
-	# Pluggable Authentication Modules
-	if use pam; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PAM=yes
-			AUTH_LIBS += -lpam
-		EOC
-	fi
-
-	# Radius
-	if use radius; then
-		cat >> Makefile <<- EOC
-			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-			AUTH_LIBS += -lfreeradius-client
-		EOC
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
-}
-
-src_install() {
-	cd "${S}"/build-exim-gentoo || die
-	dosbin exim
-	if use X; then
-		dosbin eximon.bin
-		dosbin eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dosym exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/lib/sendmail
-
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
-		convert4r3 convert4r4 exipick
-	do
-		dosbin $i
-	done
-
-	dodoc -r "${S}"/doc/.
-	doman "${S}"/doc/exim.8
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
-
-	# conf files
-	insinto /etc/exim
-	newins "${S}"/src/configure.default exim.conf.dist
-	if use exiscan-acl; then
-		newins "${S}"/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	if use pam; then
-		pamd_mimic system-auth exim auth account
-	fi
-
-	# headers, #436406
-	if use dlfunc ; then
-		# fixup includes so they actually can be found when including
-		sed -i \
-			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-			local_scan.h || die
-		insinto /usr/include/exim
-		doins {config,local_scan}.h ../src/{mytypes,store}.h
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc10 exim
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	systemd_dounit \
-		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-	systemd_newunit \
-		"${FILESDIR}"/exim_at.service 'exim@.service'
-	systemd_newunit \
-		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
-		einfo "for using smtp auth."
-		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
-		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
-	fi
-	if use dmarc ; then
-		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
-		einfo "you can populate this file with the contents downloaded from"
-		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	if use srs ; then
-		einfo "SRS support is experimental in this release of Exim"
-		if use srs-alt; then
-			elog "You are using libsrs_alt to implement SRS support."
-			elog "In future release of Exim, the native SRS implementation"
-			elog "(USE=srs-native) will become the default.  Please prepare"
-			elog "your package.use or switch to USE=srs-native now."
-		fi
-	fi
-	use dsn && einfo "extra information in fail DSN message is experimental"
-	einfo
-	elog "Note that this release contains a tainted variable check that"
-	elog "is likely to break your configuration used with Exim 4.93 and before."
-	elog "Please check your transports for occurences of \$local_part, and"
-	elog "use a replacement like \$local_part_data where possible."
-}
diff --git a/mail-mta/exim/exim-4.95.ebuild b/mail-mta/exim/exim-4.95.ebuild
new file mode 100644
index 000000000000..43c4cb4797fe
--- /dev/null
+++ b/mail-mta/exim/exim-4.95.ebuild
@@ -0,0 +1,662 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	dkim? ( ssl !gnutls )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? (
+		exiscan-acl
+		^^ ( srs-alt srs-native )
+	)
+	|| ( berkdb gdbm tdb )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+	 [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	dev-libs/libpcre:=
+	tdb? ( sys-libs/tdb:= )
+	!tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) )
+	!tdb? ( !berkdb? ( sys-libs/gdbm:= ) )
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[pkcs11?]
+			dev-libs/libtasn1
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	elibc_glibc? (
+		net-libs/libnsl
+		nis? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc:= )
+	srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libcrypt:=
+	virtual/libiconv
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply     "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
+	eapply     "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
+
+	# for this reason we have a := dep on opendmarc, they changed their
+	# API in a minor release
+	if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
+		eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
+	fi
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.94-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# configure db implementation, Exim always needs one for its hints
+	# database, we prefer tdb and gdbm, since bdb is kind of getting
+	# less and less support
+	if use tdb ; then
+		cat >> Makefile <<- EOC
+			USE_TDB=yes
+			DBMLIB = -ltdb
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+	elif use berkdb ; then
+		# use the "native" interfaces to the DBM and CDB libraries, support
+		# passwd and directory lookups by default
+		local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+		cat >> Makefile <<- EOC
+			USE_DB=yes
+			# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+			CFLAGS += -I$(db_includedir ${DB_VERS})
+			DBMLIB = -l$(db_libname ${DB_VERS})
+		EOC
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	else # must be gdbm via required_use
+		cat >> Makefile <<- EOC
+			USE_GDBM=yes
+			DBMLIB = -lgdbm
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	fi
+
+	# if we use libiconv, now is the time to tell so
+	if use !elibc_glibc && use !elibc_musl ; then
+		cat >> Makefile <<- EOC
+			EXTRALIBS_EXIM=-liconv
+		EOC
+	fi
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+	#
+
+	# support passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+				LOOKUP_LIBS += -lnsl
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+				>> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL=yes" >> Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	else
+		echo "DISABLE_TLS=yes" >> Makefile
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# SOCKS5 (outbound) proxy support
+	if use socks5; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SOCKS=yes
+		EOC
+	fi
+
+	# DANE
+	if use !dane; then
+		# DANE is enabled by default
+		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		# NOTE: we currently USE-default to srs-alt, because this is
+		# what USE=srs used to be.  Eventually we want to rid ourselves
+		# of this external implementation.
+		if use srs-alt; then
+			# historical default, until 4.95
+			cat >> Makefile <<- EOC
+				EXPERIMENTAL_SRS_ALT=yes
+				EXTRALIBS_EXIM += -lsrs_alt
+			EOC
+		fi
+		if use srs-native; then
+			# this one is the default/supported variant since 4.95
+			cat >> Makefile <<- EOC
+				SUPPORT_SRS=yes
+			EOC
+		fi
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use dmarc ; then
+		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+		einfo "you can populate this file with the contents downloaded from"
+		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	if use srs-alt; then
+		einfo "SRS support using libsrs_alt is experimental in this"
+		einfo "release of Exim"
+		elog "You are using libsrs_alt to implement SRS support."
+		elog "The native SRS implementation (USE=srs-native) is the"
+		elog "default implementation, which means libsrs_alt may go"
+		elog "away in a future release."
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	einfo
+	elog "Note that this release contains a tainted variable check that"
+	elog "is likely to break your configuration used with Exim 4.93 and before."
+	elog "Please check your transports for occurences of \$local_part, and"
+	elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch
new file mode 100644
index 000000000000..320cc9936da9
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch
@@ -0,0 +1,221 @@
+Only in exim-4.95: dlopen.patch
+diff -aur exim-4.95.orig/src/config.h.defaults exim-4.95/src/config.h.defaults
+--- exim-4.95.orig/src/config.h.defaults	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/config.h.defaults	2021-09-29 08:20:03.677883649 +0200
+@@ -35,6 +35,8 @@
+ 
+ #define AUTH_VARS                     4
+ 
++#define DLOPEN_LOCAL_SCAN
++
+ #define BIN_DIRECTORY
+ 
+ #define CONFIGURE_FILE
+Only in exim-4.95/src: config.h.defaults.orig
+diff -aur exim-4.95.orig/src/EDITME exim-4.95/src/EDITME
+--- exim-4.95.orig/src/EDITME	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/EDITME	2021-09-29 08:20:03.678883649 +0200
+@@ -883,6 +883,24 @@
+ 
+ 
+ #------------------------------------------------------------------------------
++# On systems which support dynamic loading of shared libraries, Exim can
++# load a local_scan function specified in its config file instead of having
++# to be recompiled with the desired local_scan function. For a full
++# description of the API to this function, see the Exim specification.
++
++#DLOPEN_LOCAL_SCAN=yes
++
++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
++# linker flags.  Without it, the loaded .so won't be able to access any
++# functions from exim.
++
++LFLAGS = -rdynamic
++ifeq ($(OSTYPE),Linux)
++LFLAGS += -ldl
++endif
++
++
++#------------------------------------------------------------------------------
+ # The default distribution of Exim contains only the plain text form of the
+ # documentation. Other forms are available separately. If you want to install
+ # the documentation in "info" format, first fetch the Texinfo documentation
+Only in exim-4.95/src: EDITME.orig
+diff -aur exim-4.95.orig/src/globals.c exim-4.95/src/globals.c
+--- exim-4.95.orig/src/globals.c	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/globals.c	2021-09-29 08:20:03.679883649 +0200
+@@ -42,6 +42,10 @@
+ 
+ uschar *no_aliases             = NULL;
+ 
++#ifdef DLOPEN_LOCAL_SCAN
++uschar *local_scan_path        = NULL;
++#endif
++
+ 
+ /* For comments on these variables, see globals.h. I'm too idle to
+ duplicate them here... */
+Only in exim-4.95/src: globals.c.orig
+diff -aur exim-4.95.orig/src/globals.h exim-4.95/src/globals.h
+--- exim-4.95.orig/src/globals.h	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/globals.h	2021-09-29 08:20:03.680883648 +0200
+@@ -170,6 +170,9 @@
+ extern int (*receive_ferror)(void);
+ extern BOOL (*receive_smtp_buffered)(void);
+ 
++#ifdef DLOPEN_LOCAL_SCAN
++extern uschar *local_scan_path;        /* Path to local_scan() library */
++#endif
+ 
+ /* For clearing, saving, restoring address expansion variables. We have to have
+ the size of this vector set explicitly, because it is referenced from more than
+Only in exim-4.95/src: globals.h.orig
+diff -aur exim-4.95.orig/src/local_scan.c exim-4.95/src/local_scan.c
+--- exim-4.95.orig/src/local_scan.c	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/local_scan.c	2021-09-29 08:23:33.756785663 +0200
+@@ -54,10 +54,130 @@
+                    is used in the rejection message.
+ */
+ 
++#ifdef DLOPEN_LOCAL_SCAN
++# include <stdlib.h>
++# include <dlfcn.h>
++static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
++static int load_local_scan_library(void);
++extern uschar *local_scan_path;        /* Path to local_scan() library */
++#endif
++
+ int
+ local_scan(int fd, uschar **return_text)
+ {
+-return LOCAL_SCAN_ACCEPT;
++#ifdef DLOPEN_LOCAL_SCAN
++/* local_scan_path is defined AND not the empty string */
++if (local_scan_path && *local_scan_path)
++  {
++  if (!local_scan_fn)
++    {
++    if (!load_local_scan_library())
++      {
++        char *base_msg , *error_msg , *final_msg ;
++        int final_length = -1 ;
++
++        base_msg=US"Local configuration error - local_scan() library failure\n";
++        error_msg = dlerror() ;
++
++        final_length = strlen(base_msg) + strlen(error_msg) + 1 ;
++        final_msg = (char*)malloc( final_length*sizeof(char) ) ;
++        *final_msg = '\0' ;
++
++        strcat( final_msg , base_msg ) ;
++        strcat( final_msg , error_msg ) ;
++
++        *return_text = final_msg ;
++      return LOCAL_SCAN_TEMPREJECT;
++      }
++    }
++    return local_scan_fn(fd, return_text);
++  }
++else
++#endif
++  return LOCAL_SCAN_ACCEPT;
++}
++
++#ifdef DLOPEN_LOCAL_SCAN
++
++static int load_local_scan_library(void)
++{
++/* No point in keeping local_scan_lib since we'll never dlclose() anyway */
++void *local_scan_lib = NULL;
++int (*local_scan_version_fn)(void);
++int vers_maj;
++int vers_min;
++
++local_scan_lib = dlopen(local_scan_path, RTLD_NOW);
++if (!local_scan_lib)
++  {
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - "
++    "message temporarily rejected");
++  return FALSE;
++  }
++
++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major");
++if (!local_scan_version_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan_version_major() function - message temporarily rejected");
++  return FALSE;
++  }
++
++/* The major number is increased when the ABI is changed in a non
++   backward compatible way. */
++vers_maj = local_scan_version_fn();
++
++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor");
++if (!local_scan_version_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan_version_minor() function - message temporarily rejected");
++  return FALSE;
++  }
++
++/* The minor number is increased each time a new feature is added (in a
++   way that doesn't break backward compatibility) -- Marc */
++vers_min = local_scan_version_fn();
++
++
++if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR)
++  {
++  dlclose(local_scan_lib);
++  local_scan_lib = NULL;
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major"
++    "version number, you need to recompile your module for this version"
++    "of exim (The module was compiled for version %d.%d and this exim provides"
++    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
++    LOCAL_SCAN_ABI_VERSION_MINOR);
++  return FALSE;
++  }
++else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR)
++  {
++  dlclose(local_scan_lib);
++  local_scan_lib = NULL;
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor"
++    "version number, you need to recompile your module for this version"
++    "of exim (The module was compiled for version %d.%d and this exim provides"
++    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
++    LOCAL_SCAN_ABI_VERSION_MINOR);
++  return FALSE;
++  }
++
++local_scan_fn = dlsym(local_scan_lib, "local_scan");
++if (!local_scan_fn)
++  {
++  dlclose(local_scan_lib);
++  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
++    "local_scan() function - message temporarily rejected");
++  return FALSE;
++  }
++
++return TRUE;
+ }
+ 
++#endif /* DLOPEN_LOCAL_SCAN */
++
++
+ /* End of local_scan.c */
+diff -aur exim-4.95.orig/src/readconf.c exim-4.95/src/readconf.c
+--- exim-4.95.orig/src/readconf.c	2021-09-28 10:24:46.000000000 +0200
++++ exim-4.95/src/readconf.c	2021-09-29 08:20:03.682883647 +0200
+@@ -215,6 +215,9 @@
+   { "local_from_prefix",        opt_stringptr,   {&local_from_prefix} },
+   { "local_from_suffix",        opt_stringptr,   {&local_from_suffix} },
+   { "local_interfaces",         opt_stringptr,   {&local_interfaces} },
++#ifdef DLOPEN_LOCAL_SCAN
++  { "local_scan_path",          opt_stringptr,   {&local_scan_path} },
++#endif
+ #ifdef HAVE_LOCAL_SCAN
+   { "local_scan_timeout",       opt_time,        {&local_scan_timeout} },
+ #endif
+Only in exim-4.95/src: readconf.c.orig
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index e838481b2918..2cb227975c1c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -5,5 +5,5 @@ DIST msmtp-1.8.15.tar.xz 370736 BLAKE2B 08673535603a7e768b11dea9d1b6a6e00ef9e694
 DIST msmtp-1.8.16.tar.xz 375372 BLAKE2B 4567c323bf2f53fa878ed315dc4a2c524918de22305d2034be476373409bc61a9c841f0b9c6075e06e47eceb816ea24e9d6cb71c2bd94d9ba6738ae36ccb09b7 SHA512 5e7e39927007fe8e1763b13a83f44f6456e8e9efade8e1c3148f34d5c2b5aff51b1e4519337628776e6bce91066de9f145c7c2957927cadb0962a25452a47247
 EBUILD msmtp-1.8.12.ebuild 3297 BLAKE2B bf4ab8187207ab3b758b3cab1042c69d8f75cd64425f1300e7944f35278bfb2b3e37e52a474b6efd9711f736b49839be859fed8eba929d381c658615592eedaf SHA512 9a2668b03d3085c43ca58cae3483846064f15d065e2c00b36563272c4910491b31265ed735950a7809f2823b0e02d28589bf524e8b8d8a8466cbbad6fb0739bb
 EBUILD msmtp-1.8.15.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
-EBUILD msmtp-1.8.16.ebuild 3302 BLAKE2B b6b3b0095e5f15b3c19dc82b899fd91a8dc58f9072f9be88a3fed687ab9002814310b838db3a8876042ac066f6b8d87c7a72a57490cdc66d490d7bcb6fff3d11 SHA512 981a8d74198896fedbe72d9e473c5084463ec253e3956fc4e020da885cd5ea8905c0cbc8da454eb8dd3a0fbea3adc93c628735b3e38b6d49342b04582523b455
+EBUILD msmtp-1.8.16.ebuild 3309 BLAKE2B a5b6ab13101eb0e0e4ee1bff137da7e70eee647d67657f639a8ec5994bd0d239724e18a94c865cd99ed3c7fe5809338716df80ea4720c321197e9472267b6e33 SHA512 16f478ac894428e2497a7b55cf7a6e3e7c48c7890582e570b5ccd443614649a25a11e47ff6414f3795023b75532cd36f52bdf965b2ef9039acb2b28ecee034cc
 MISC metadata.xml 471 BLAKE2B 2f73e5ba3eb891844f14bcd4792a4a1df6f2bc90839819a4489fca29128d4268962e6f4cc781b99942e0f54b85a99554293e50f8be4680c58df38fb90f199916 SHA512 22bf1461c446daf3c854cccce644cf6647881878c346f2bd6390f69eb397dfa608d15cfca75bdc3a58fa4c86b2f69e1224bab181c336e883726d9564a358db7a
diff --git a/mail-mta/msmtp/msmtp-1.8.16.ebuild b/mail-mta/msmtp/msmtp-1.8.16.ebuild
index 779561821781..aca3fa1b1709 100644
--- a/mail-mta/msmtp/msmtp-1.8.16.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a3ad051e4cec..979df91d50f8 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,9 +5,9 @@ AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 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-20210815.tar.gz 4756174 BLAKE2B a699ba9b58927e0cbab0f47331f295a41f2aeb27ea62d8ba10ba18ebcefc6f8868dbcca6a3c1893400547e4b40b6af2013f7eeda38fce11fe4e7c9a69f1c922e SHA512 e5dc03dad32bba501c819e1ed53e501119c138b21fcf2ed895014dd4c99d7830c8c3363ae6dddb30c5e232dd1ad1ea57e0dac756585868b0c956ac52fb06818e
+DIST postfix-3.7-20210926.tar.gz 4759972 BLAKE2B 93f6cbc73c36491d9458ea05f39192bf7abe12f0c3fb3f08edd0c93f8db0cf7b91c1bd5c4477b048a655e8295e5c9a53ede6500026d9e2f7312c5ba08d1da13a SHA512 37a5c40d77654d6b918ce5b0f3ed20422e12f6291787a1e32957368c46fb24d11256887ea7f051fae82037258ef61b642f72284c77e5f46f5999c5f9eb84a4ce
 EBUILD postfix-3.6.1-r1.ebuild 7982 BLAKE2B a2e700693bdabe624f503be1b09010518b6fcf02e364dde1c88b4c81927b13d99244f049f11228ea74f653cc90ed48c9c2b1ee6012b1a379afaf8f7bad7fd6b8 SHA512 97e2a0f1c4a92118ad08afdcb03ec3caaa7d1611d424c45379522ea7136899846f66f4990971012bc2dd8233d7c741889c4e787556bfae2b0c1c75a8568e891b
 EBUILD postfix-3.6.2-r3.ebuild 7921 BLAKE2B c4a41f841ffb79b1d9e6c4fc858d70a34bb6b261e6150366bd152691785a8df1da11c599ef31f27f7a07f1d581ea72538664309739b55177d4531214052510d0 SHA512 3eb3d37002ea634adf28d54c67912af98631e6ef7443a59be0fd990050f35fc941637a9fb2ca4202c1ee62e359b2a992ac1d7c99b6a8551e07e286f31b14cc0e
 EBUILD postfix-3.6.2-r4.ebuild 7972 BLAKE2B eb18cab2c20f1684395abae6afa06e4cea8db7543a1dedce106c6bc1b1b17996c842c76a68a4913a2d256e9e3c1e151dd1a3ddc535541d7b39a425f63413610b SHA512 1df2d5dfbd7c065a82386ce2a7d2b63891436951ef02ec250241bf17c2e2d95867c14d15cc5a211235da0dc40ab89737f4db6c8505da8395c8cb993ae81e4e8c
-EBUILD postfix-3.7_pre20210815-r1.ebuild 7929 BLAKE2B 164ff69129c6d4a246dc15a4c27340c6500df5d701da2a0f0d451f9fbc013afb848103c640f873cca58f5cc8aa8696d2b31cc5a0bba69581557349136c067731 SHA512 4c6fe1b2625c343f838313ae08128e81629c6ec76714481a165838d6a9aab56287318391fa7f93e5891120c11f4b0a3dcdd0d49a0d75f604f39625c2f06ce72f
+EBUILD postfix-3.7_pre20210926.ebuild 7929 BLAKE2B 164ff69129c6d4a246dc15a4c27340c6500df5d701da2a0f0d451f9fbc013afb848103c640f873cca58f5cc8aa8696d2b31cc5a0bba69581557349136c067731 SHA512 4c6fe1b2625c343f838313ae08128e81629c6ec76714481a165838d6a9aab56287318391fa7f93e5891120c11f4b0a3dcdd0d49a0d75f604f39625c2f06ce72f
 MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
diff --git a/mail-mta/postfix/postfix-3.7_pre20210815-r1.ebuild b/mail-mta/postfix/postfix-3.7_pre20210926.ebuild
index f5274f856140..f5274f856140 100644
--- a/mail-mta/postfix/postfix-3.7_pre20210815-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210926.ebuild
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 946e3567ea30..363bc7100255 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 8f6797bd8f64..4e9c5aa9aa3d 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -4,5 +4,5 @@ AUX 59-google-droid-serif.conf 329 BLAKE2B 4d7042c7eaefcbaa8ba29650b541d613a899e
 DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 BLAKE2B 07124449926ae09babf6d298b8d180f4309580608614228257230348b2207ae565e6c1cc40b9b85d233a396a72c8db4ad8f9694a4807b95902a20e5fc055d6b1 SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf
 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 BLAKE2B e699ae9170d91a980fe295fcc22a8efdd499381447fcde3e2403c6c63f50e3579f71507d8df744077ea8131446c1668d344838bb38d049c8c15e2d9926907bdc SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c
 DIST droid-113-r1.tar.bz2 4227725 BLAKE2B 9b9c25b93c5b4b9335589af02e6844d52a5a01d37b168b117f0191793b5274e8d4c944dd15a949c4ad868d8c2e51412ec875e72fc642b388d4018e6bfadb9248 SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64
-EBUILD droid-113-r5.ebuild 1129 BLAKE2B 92bd5ea310e2d191b802d01f58a85600aa704667e7392d9a20847eeb448cd17b8b33b167ff29d9908ac744dc8b268f5e87f72996a5adc13d4fbe71766a445f4d SHA512 6062693e59a9d52213b56400aee40de40a87306537d996601559f6ccaebac31dca0364d0ba27436c0d5f2f9648754efc0097217c8d02ed5ac481e32479218167
+EBUILD droid-113-r5.ebuild 1135 BLAKE2B a99b5f0f365170606c87b9cfdafcfc1c1627abb7a212f1b7a8c472de29566f63c082a2df9267a80be4db4ae79229c8aaea5170888a6fd073a4c00ccc2713e2e8 SHA512 75722adb91e21ae9c8e22edc443d9b24503287943eb9642ff7cf7181e0f68718c293462820964a23a20e096b76c5bb1477802ac44730c0bf1e7b35c4aae0b2ae
 MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
index 4883bcdd608e..c6f3a2002eb9 100644
--- a/media-fonts/droid/droid-113-r5.ebuild
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~m68k ppc ppc64 x86"
 IUSE=""
 
 FONT_CONF=(
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 8b459f886e91..46d319db64d0 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
 DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1267 BLAKE2B f60735a91a98b46366b8b741e18e0602994c9630feee641309e8c8d4bd7100de07109d3b7b5ec0f84cbf18a767ef3e18c77d640c5931b2153c482275027fc1db SHA512 fe42c6bebcc1c3aa988cbb42c97802cbd5c8ca0ab8beb0fd9dd14a26e3598b907416434e54c1b3fa1d1090827096a341b63457bcb83123cf14b5c4968baf8f36
-EBUILD liberation-fonts-2.1.3.ebuild 1267 BLAKE2B 4095338208d33e0f2a343bc557418fc351e7bd3dd0329522c76dfaef8575fec7bb50688351ec048db87ab59161be7cf5b2170880f77916385bef8b2519d02843 SHA512 19021537102bffa4b25786c6d3ab4dced8b2e597d8025ed570e5e6f46f8b18d52584bed122a409c946c8e4f215f7537124f8b77ea63694bf2200e6d4b450e044
+EBUILD liberation-fonts-2.1.3.ebuild 1273 BLAKE2B 12798414a7d44d44997664cd60ce71e3a56de37e9d452cc4043812621288c5cde0dea6266feb4af41a7e0a3512fd085c2911b121f29af03a0bae8898cbcd0c38 SHA512 926f895b460d5eb72336782699c57f8e2c76fd343208d0317d473acac5396279b90cba47a8694535fe191defbf42cd260a335c36a5769f60005ce7f6b32aa119
 MISC metadata.xml 348 BLAKE2B 48542ff2974580db41cdc0be2cca36b72db1ce5fbc3fa9e32799d8c8f27d1821ea56c3b1292d015bd2ba255ba691173a7b89dab6f644bb50e3508fea6d9df802 SHA512 c4d46c9102a2b128fe23dc52e2e23ef838d99a28854f3ca78e4e0ce2aeaa0135a7ac23e503cc49c77b836118c703c494cb59db4da53aea78c3785b36a3a62ec6
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index ef04f9e9ef1d..52c8ae9efc21 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
 	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index 63ecc83362a5..d07ef13c3a6b 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -1,3 +1,5 @@
 DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1ff594cb48d488cf800114a4fc4884c02e7e9400bcaa4d6b6d344283e7a2de885f9c95dd33beba690ae7d9 SHA512 f6d3283a06204491119ce3a3796dace7db640469192b9d44fd44471a185dc580a2ba8160f2983371b6160cb782adaabcd02872cfc2b1d05b10f3d6e73c60cded
-EBUILD vollkorn-2.1.ebuild 597 BLAKE2B 25727d6981214f06eb718ec54f28fd872cdbdfaad34c3d17eeddf3f9c1536b3d327f1ffc96c84b063bf40f8d5989c8da7e8caae978f7782f5abb4f1965e2d4c8 SHA512 56368666be3f69736ad5cae4c04018a0bc0a2b1bfbc3d9c1029e38f1b3c535860da489e873578d742bf336053a9f90173e853ed6b4a15a30c2075c7dbbd9379c
-MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
+DIST vollkorn-4-105.zip 11046213 BLAKE2B bfa8515335ab6f7eaa57ad03642b7694b41047b228e9c1c51285ac70f8d799a9d61ba0414bc91ec1fdb5e579597a8a3d5c901c1d77d1de1c425ba1822a29ced9 SHA512 847196951f842481d11d76304435f88190608cabd7ccb47ca19a10b7215b69e19c19dc85e628e6b2730dd9b8cf1850c6b30470103724dd40fcf9b5eadb88a3f8
+EBUILD vollkorn-2.1.ebuild 585 BLAKE2B 89c5949980a023119609c1e8e0bc88f17513ac9127421e28543102657f791e2aae913e63f2cacd51cca7908ec2d791bfa8ce3199676ce0d7b0729e7028a81b12 SHA512 fdf0a207513aa5f143b28081b16a2ce1eb89784c3fa115ae1fbf44ba76a760aa0136088a6b951f9a02ca2668a25b90c3df783655bed3e0d9f99ab49aa073a9fe
+EBUILD vollkorn-4.105.ebuild 777 BLAKE2B 6f0395650b562a97e718fa394f06b9a239d34fde720ac728a254dcaad836cbc5f56ad798015f0e49315c52633c535b5845e4ad00756f2852bfacedd7ae9fcb0d SHA512 c30d90e4605e937bba7934a0474ca9554715290a5cd5d7294dd8ce4825b21af0018293749bd09e39194bcdafa951060d714a0d83a891b15f605d4c477df4bf21
+MISC metadata.xml 470 BLAKE2B 83e993f3ad3b5c07184373535640408bf5c9cf85ceed425adefc7f4c887d9e5ca473a5f2749815f66dbbc78e8a88b04ade3c1be0e0aa8409842b0bec37fdf7b0 SHA512 29f8aeb86eed59dae79ca6f124ee197d0dd0ea7ec60a0b35e71b8a832aeea71d13529803900c0286cdf5f426ddd55a01777f161fa8d3995333272997ced53fc6
diff --git a/media-fonts/vollkorn/metadata.xml b/media-fonts/vollkorn/metadata.xml
index 9a448dfc2e7c..9c5f2fa2bea6 100644
--- a/media-fonts/vollkorn/metadata.xml
+++ b/media-fonts/vollkorn/metadata.xml
@@ -5,4 +5,11 @@
 	<email>fonts@gentoo.org</email>
 	<name>Fonts</name>
 </maintainer>
+<use>
+	<flag name="otf">Install the OpenType version of the font</flag>
+	<flag name="ttf">Install the TrueType version of the font</flag>
+</use>
+<upstream>
+	<remote-id type="github">FAlthausen/Vollkorn-Typeface</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index f6e6b19691a7..2232c8303960 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit font
 
 DESCRIPTION="Vollkorn, the free and healthy typeface for bread and butter use"
-HOMEPAGE="http://friedrichalthausen.de/?page_id=411"
+HOMEPAGE="http://vollkorn-typeface.com/"
 SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
 
 LICENSE="OFL-1.1"
diff --git a/media-fonts/vollkorn/vollkorn-4.105.ebuild b/media-fonts/vollkorn/vollkorn-4.105.ebuild
new file mode 100644
index 000000000000..cb865153c23e
--- /dev/null
+++ b/media-fonts/vollkorn/vollkorn-4.105.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Vollkorn, the free and healthy typeface for bread and butter use"
+HOMEPAGE="http://vollkorn-typeface.com/"
+SRC_URI="http://vollkorn-typeface.com/download/${PN}-${PV/./-}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+otf +ttf"
+REQUIRED_USE="|| ( otf ttf )"
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+DOCS="Fontlog.txt"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/PS-OTF" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/TTF" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3130193b3edf..972000c76bfa 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 8e61b42f04d9..92e59d0cfa4a 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,6 +1,8 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
 DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
+DIST Argyll_V2.2.1_src.zip 14030108 BLAKE2B 22785536a3a5113998947294c34512e3b6dd5d080a11dbcfe3c4b0c22e34277656ba8dc6fa8f59a9dd20cf69692bd24b4e53044086d21bcf7c6d93820c6dbc4e SHA512 58339dfc550950703a5ab6708765a4f01e5fcdeeac54c750e8db82b7ea0dd9b42e9f1163524811a93beabb86cbf557b37302fc4a6a5c1a339cba8af9dcd3e239
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
 EBUILD argyllcms-2.2.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
+EBUILD argyllcms-2.2.1.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-2.2.1.ebuild b/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
new file mode 100644
index 000000000000..d4e795b9baee
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc"
+
+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=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e27f4f325898..017383a13d0b 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -4,11 +4,13 @@ DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49
 DIST feh-3.6.3.tar.bz2 2116771 BLAKE2B 062381cc744617f0c8e0a4a7aac7e0841ef78993d3f65e9853dce6b81d6ce36caf4c72ce35785b96c8e0644da41a6ad12706e6a740740fb27cddf281d780e749 SHA512 53e9e1903f256fee9d49af2f8ce4bf153317e7d5de6b396448f16fd54ae1a13217edb44566cd0433e25675a25175cc412a726f058856136f19629661e2f62ce2
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
 DIST feh-3.7.1.tar.bz2 2119324 BLAKE2B 203c557ec40590a19cacf4de1e192907608a6d3a7b09890f6196a99560d02220fbe619e02ffb74e8e7a4c12f725e2baf866f2882e32c3aa1a8c3274a66b71791 SHA512 7e6d4c4ccee5a0aadc0b535350da4d515ba7f75bbd5e95eb6a6e5e553a352f764bd91e39d3a59168d749bcf1528a7db75f40016885273c0bedd814eef0a0acd7
+DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3
 DIST feh-3.7.tar.bz2 2118355 BLAKE2B 40cd0e53249d474cb8ff8e236bdaf8be322253600f2233a5748379fefe8592a22a43ccc47d44380b2c84038272c1c194e50fb8ad4892a61e48d54ac18c6ba143 SHA512 687d0863bb6bf99bc88ca22760ab670525e6d8ee4c984fa00d686adabd39b7bee2449d93beeb8863a161d2b1dfabed3cff035911711eb445b358ff5a4b77da3f
 EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+EBUILD feh-3.7.2.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
new file mode 100644
index 000000000000..9ccef7a27f03
--- /dev/null
+++ b/media-gfx/feh/feh-3.7.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 581f8b5de639..dae69a77f22c 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,4 @@
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
-EBUILD fontforge-20201107.ebuild 2857 BLAKE2B 67a11f7c1544d54ac4e7afaf17eefa768fd9f4f281980330fa67dfeb60d66881cc8c5d2ade1482df452c8b46bf062e81207ff613a8394c5fc2d3124b8065d42a SHA512 c7c60fee29aa677ef934ce39c37fefee838ac31bc08b32a55338cb74df45ec341ebdf08c20f63a1917aa7254705a619f00be28aa9a0e7294910a652ae8a3e505
+EBUILD fontforge-20201107.ebuild 2863 BLAKE2B dfb1c94fa6923acd6a09efce18244982b5973171e8a24d863aad057292428145c64005bd67622c01c1044a57f3303011328299f4825faafc4d4663448e073f07 SHA512 bc8dac5e321f635416127154805c3b8d86c823f4e1f611477744f553fd9063dddb04ddb2dd9ebf85eef3ea99ba381953f6a83428adedb7dc265540f4f5efa7f9
 MISC metadata.xml 862 BLAKE2B bc7359c628af9d645b87f43a50a2f0f0d6ab1d80e3dbb0134f4b0d668990202276e4c66da640b7b63baa53d7ef7bdca90ad097566a995a02ab90efac88553884 SHA512 a6a55768f8e0a81591a44547ca0a135ad24833c0fec1f402348cb17512b8354c6c254f12a4fe62a615f955427a6893e12c9dc34d808e04a9d7065fbcf854a276
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index f7295ecb2741..abdcda4d71ed 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 27cd1020dfa7..c683aeffd467 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,3 @@
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27 SHA512 3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
-EBUILD kphotoalbum-5.8.1.ebuild 1596 BLAKE2B 42fc45d378e6e858fa9554d44e870c8f00fed9d1911f5ada226fe1fe292edd7c4024fdc8d14afe3169c88e84140233fefde42019b798d83bf3f9b9c55052f014 SHA512 754d98971d89fbb3b8d9c8b1c54d7122a18d4b02d4004839b14ea43d1564f07c65bde5e07e9671be301d129c265a69911ef844d4aed96fd06691d7827756b530
+EBUILD kphotoalbum-5.8.1.ebuild 1621 BLAKE2B 319b7eca13c524566236b7691d36d1710a55d43e55a108563ad62e5b319d0b64854b5a5981eb3bdd358d79739cb60e0e5ed790f97f28ba742d0c9d12fc5d52be SHA512 14f99f6d63622c1211e465abded6ea0723a19d8a2458f6dabd6cd2c8a7caa7a9098c0d89ef44012764b973265b8e702ff04245c185957e0f4246dc441d2703c3
 MISC metadata.xml 519 BLAKE2B cc5874959364018bdcb98942049ce40c07459d9c719d041d1b394d4f13b5e265e076b737e1522817344ddcc65307bac2518679770c34d620edd62be22d96462c SHA512 fde456bf1b2d4917b619c4f3da5875163652cb482df55d11f9f88e20c90f6071609a1a52728a1aa299a3f5d2f29c25a3ffb2de8c19ea778dbfd2f4beff9f0b1a
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 877ed523e72b..495d19aff9cb 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.74.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 05270a77b59f..54eff415e007 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -6,5 +6,5 @@ DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e
-EBUILD krita-4.4.8.ebuild 3515 BLAKE2B 2d28bebd5f455e0d6dab6da45f1733ed982574cc9ee1d1befeb3d9be1508c2bdac441b1a2e206140ed2c7be1178011db9c4a2a74258db22f42467ecf33d25ca7 SHA512 b249fdda5db441a3b5224f503610db1d2873671289e34926c0e59e3fec6509e6d3d78c10ba50472d353ba0e3576a378ebd5ba247318cbf5209391a68db72d449
+EBUILD krita-4.4.8-r1.ebuild 3539 BLAKE2B afba0345d206e6120d92239a702219b790214d256f25a091ff30eb20b411ae2e9ecebfae32a8fe9bcd932355442cd1e4e683a69d855df211b6a6155d110d18e0 SHA512 976de9866a3f765d7365342455103de59b4ad4f80bfb3ae2f18917a9fd0c67caf544bf6987688f694ee02903ce7b8c4fee45b6890d177138a63327bf0e33c239
 MISC metadata.xml 765 BLAKE2B 9e75410b77b00e7f45ff2bd1a730396c51302380f7c372084975bc763745d7e3c8bb65e8e94bb211872ea398e806f8f423d5ee2dc9c17db9ab7257dbb9e5cf44 SHA512 78524fb64544cefcec05bbf9a8fcf3b175f1aa6ca8377600470096bd2f4b6afae3c00dad4e2c58610cc84501515167e400050bc90de30c11c9fcf3d4b4668579
diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild
new file mode 100644
index 000000000000..866a9e4645e4
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip:0=
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( =media-libs/opencolorio-1* )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		<media-libs/openexr-3.0.0:0=
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
+	"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/krita/krita-4.4.8.ebuild b/media-gfx/krita/krita-4.4.8.ebuild
deleted file mode 100644
index b54ea50988e2..000000000000
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( =media-libs/opencolorio-1* )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		<media-libs/openexr-3.0.0:0=
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
-	"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index cd96b512991e..3be6611ff826 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
-EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
 EBUILD lximage-qt-0.17.0.ebuild 943 BLAKE2B 7df4a44f76b273986f3dedcd7ddc9dee2cbbd04d337cb87611336dcb1b9e2991220446b589fb33caf4e4abeb6defb172c16a342a43f5c1e247a68acc55e23bcc SHA512 f2bd743477b7fac27d2224bec1c37e20c7733367a0b3a9ab09ae60efda553feb867a7cf5fd64225690963fbeab9703701b8141c3c300f130f500290061361ea6
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
deleted file mode 100644
index 8bd658c7b2f6..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Image Viewer"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/libexif
-	>=x11-libs/libfm-qt-0.16.0:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index a14b787bb143..d54e67a1504e 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
+DIST simple-scan-40.5.tar.xz 1476536 BLAKE2B f386b2765b2479f1a41a7618a3f9f72c85d003c3ba1495012d59902059f348edb2897821a8ceaa631c2b9043a292ffceaf5bd4fc2f4442931120f3e9ff336f4b SHA512 cf87a0dbaea09ee0aa0333d487179dc1ab661a7c13321ff92cd7c7de62f6f9cdcf4a858e1fb24df07fe4b0cb01694bea915c61e2c7ce6e44ecf549613ccbfa6f
 EBUILD simple-scan-40.1.ebuild 1446 BLAKE2B d337303876bb8b236326f29bf4324f34c8a9e59bb6f0bafd8bb2ead1797484d6de9a5dc6525120afdaca61cb6a0d0ebfd630f36274596c2592f22cc972ed3fd2 SHA512 80bf6ab5a88eeb60094495f151e1155b96c426c41eea747ead16a6afdb7b1299a75c6a293941162d140b9572fb32ed6c36ec1ee0e21ec06be2455c13618b30b5
+EBUILD simple-scan-40.5.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-40.5.ebuild b/media-gfx/simple-scan/simple-scan-40.5.ebuild
new file mode 100644
index 000000000000..9389dd00888b
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-40.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gui-libs/libhandy:1[vala]
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 32db448cd636..f49624c22f45 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 391783834c1e..634b6aab72c8 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,7 @@
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
 DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
+DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
 EBUILD codec2-0.9.2-r1.ebuild 706 BLAKE2B a218f37e38b20790cc280773b409675fb38bdbb242e1c5a7ed580428af548fc74af642a922994ad1e660b2aedbbe9bca856e67e7e30bbe540e70d83f3b560fc7 SHA512 5643f89600c13da66732d4ebae57cc6679b66c4d0b1ebc9551ed546d71c3efb9f33613df88ae6315283553c5eff4e010df5e7b13d53618a1eae353b73006905f
-EBUILD codec2-1.0.0.ebuild 715 BLAKE2B 89ee2ccb98ff237e235c166f1a7a87fb72594dad57f83e3d546f5d7be560fae9ce01eb059bdef10050fedb14d19fdb38145ea99651869d2ede7e41dcc5dd0efe SHA512 4d6c31b654805cf26df5f0444f59fb2baa43d7f81ce54e35aca1f15c5ffb29248a083531b06738b4ca0a4ef2893493efe084df237b07ab297839218abb9b6702
+EBUILD codec2-1.0.0.ebuild 714 BLAKE2B ac8fe2fdfa4feabbacc2165bb8974381a6a65013985b60af9c9c9116b330e3a5908a868c936328a68781fde4b8835f9eff4493163595b4ec02edea42769d7686 SHA512 bc237a285ab7df29ad4528d78463801fc9523e7920cb5fb50f48a294cfdde230526fed48b0660363430e9dcaf2b4a4e84ec80080a39edd5d080e8f3ac22f8439
+EBUILD codec2-1.0.1.ebuild 719 BLAKE2B 4916b9c96aae9b647bb1035900de6c8b336fd7107d51b7d970d2b6d29cbb680962b80efc58bf6c5e4e723ae707ef5c1dc926f3305fc345441b061358c13693f8 SHA512 92d7dbcbe6632f5b64209b5aa208df6cebf5e0d2cd17dbb40e531bfaa404605fdd91a956ac3d2982f1401f385bd31b05c5709aff662260dbb3d03da05a29a336
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
index b403037a4ae8..2469842139d6 100644
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ b/media-libs/codec2/codec2-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.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"
 IUSE="examples test"
 # Not yet passing, but infrastructure added to run
 RESTRICT="test"
diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1.ebuild
new file mode 100644
index 000000000000..43e5b77c8f43
--- /dev/null
+++ b/media-libs/codec2/codec2-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples test"
+# Not yet passing, but infrastructure added to run
+RESTRICT="test"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=$(usex test)
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 0f76066619d6..4ee11a99f5e2 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,3 +1,5 @@
 DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
+DIST Image-ExifTool-12.30.tar.gz 4948601 BLAKE2B 359c06dc5d4f71e186d7a265488cb16e47e40438d8a0e2d4e74f75b6aac7efd1c5b3271a158cb8b822eace5f6b437d5d39458c31ae8e6e886e93f2e643f8c9a9 SHA512 2966854d8fd163fd5aaaca5608eeab2a3f0681fe9e22e006840acacd2ff2aaecd6076bcec23989facb7baf64aa96425ad7eeceb4045da44004421b8f10050935
 EBUILD exiftool-12.26.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
+EBUILD exiftool-12.30.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.30.ebuild b/media-libs/exiftool/exiftool-12.30.ebuild
new file mode 100644
index 000000000000..48300e4ce1a6
--- /dev/null
+++ b/media-libs/exiftool/exiftool-12.30.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d80ebddd8727..1195cb5e89a9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,7 +4,7 @@ DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328
 DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
 EBUILD harfbuzz-2.8.2-r1.ebuild 2547 BLAKE2B 8c1cc61fda1ffbd7bb0c6bba79e7b0f2121b6a533a994536723f1ce6f58ed9cab2ef5c08f704a7cd66775e9f65e7f426fd3cb3c9ae8e01aeafc4ba8160ff2cd5 SHA512 7f6e6715df93de2ece043f2e651463241bb6095d5fc5e1e1b90a24647eafe94ffc845f0814ac52b59804e546140f8f3d929e1ea225e228cb1018c32cbe893ca4
-EBUILD harfbuzz-2.9.1.ebuild 2508 BLAKE2B 8a0cca52dd12e8048ef4080b9b283c3321a63681db85ee76a6d1bd478d9e92fde3a04f5d06016a21aa154ec5cd961a48ab0063719470b7339872a5f86fd35e33 SHA512 7556bd49fb22c181f72db9918bfe494a41978fae9ec5d5841bd582c4c9f4e3a48d325f6d5ae5fbddf5e530878b77a267ec8ea49d656b6e2be8c555848cac4d19
+EBUILD harfbuzz-2.9.1.ebuild 2505 BLAKE2B 1de2fdb70f4647273658b95cf2425c7c94d56d55c695d4df4b94b4c375d5dad50a04e2f279443061e721c19102345832d3be84cb857f9713e7ab9660e0ab3d82 SHA512 ed1bc1b2870766467bf808aa277c5db7fcda334e610378b84e739646c22cc71e810c6ad051abb0d4bb93af10a74be672b552054719a29979e653131ad4af4070
 EBUILD harfbuzz-3.0.0.ebuild 2513 BLAKE2B ed6f714333a7f48d93bdfb6bb1bdf0638bd40ac8b53817e4c147dddc82e97e02c6d5907fe7ff0171cb1e6a3f5bb1e0e32900319813aafb6a9a7c957ef053c593 SHA512 f4065a49bef78aaad3d2ddd76bd0ba5ad9b076d82c49f375dda1d1d2e2b5fa9c5e1b1c6467a836872d0e37b73f5997a15528d9c607d981e5a1964975922e26cf
 EBUILD harfbuzz-9999.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
index d7c9f253d308..e446315ae37a 100644
--- a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 5b1f01c3da56..e0028c9cd303 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,7 +1,9 @@
 DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
 DIST kImageAnnotator-0.4.2.tar.gz 166061 BLAKE2B 83e53b89a09800ebd4fbbd23b893811b20375b24e43289bf4b21766f1b77851f86686a6c18f0da7baf78b7317ddc7f9348460d4c4c7cc0fb2b4767c549355fbe SHA512 33323c774bd3e6a72d3fb575c006c9e00111840c7a277e0f20554cef184b256d4e3b810bba11dd71cee8c257d0a48103e52b24b458bad2ece8b0d0cb94db4ec9
 DIST kImageAnnotator-0.5.1.tar.gz 214671 BLAKE2B 0dc6496534c045408e64fea7d9cc80acb7891fa009cfae5be28415e80914e726b4a2927d55156520414f35bed727e7d4470f593d5b3feb04da3e8c47a8d612c7 SHA512 221ed21c5a5156a9d7cdff70d7f4c1dd186fa40f7ba0d6d0bcfd87e6d045967b83c647378f1981b33307bd6e1b52722e2e9f4229c12fc18c840040fb4f405552
+DIST kImageAnnotator-0.5.2.tar.gz 219008 BLAKE2B 6d2d53a55b013b8bb87291ffcb13126437291145a4d869c9e4b031711b8592ef465eb2b24b6473c09f9d02067d2404da15a4170a2f4e288cb1475d3c5d7d00be SHA512 42785f92954bf8fe28f5114d8ba7da9a1a22e79d1c0356642e34754218e580b147670a119d94e3b6b704deb1230a0d0f4d998541d5532783e4d569c66789af99
 EBUILD kimageannotator-0.4.1.ebuild 838 BLAKE2B a666de99e75281c219b27779a053e54cd2acf6b429046f7e7f49854c5be4505b45318fb0e4958cd14cf8f911e2b7b05127a5b96195b5b93355872b1d77097a6f SHA512 2d0d66550b2365ddac5e2d4233a4bbe49ed69ccf4302840460d7f6fb2bfd352effe720240b9d647ab60e2a91a3f04ebc7a76a451bf721964d1f4a95f091b1041
 EBUILD kimageannotator-0.4.2.ebuild 840 BLAKE2B 40b7193f516e9aa5b29a1504ab19196fc0c6ffd53f061368c123a224c5b8737e879f9bcb66bdc1b5e0e4d60329d7df8dbd02ed876161bace8f67cc3cf050286d SHA512 05c581bd2fa267f5e1ddd718b8fb947f93d00bc303226ee0f6fbe8729c1eb2f8e299bf2327a99db1ed8769277f695924b5dfcdb6e8cc9f934d5057f9bae797b1
 EBUILD kimageannotator-0.5.1.ebuild 847 BLAKE2B c9016307e724398b7e8aa54e8ac8de1852b2caf852567b942a535d90ca5a9281075ccc87a6db0d7c29be80316248ceee3f24d89e4ec2cf7a17ed9779738d2951 SHA512 075f02e5de359b9b91ad0558953a680ddecccf7ff93db88e45ecfdb34fccf49eaeba8e941e24ba81fd0eda8f5debebbea4bed675545b13443b200170495367fc
+EBUILD kimageannotator-0.5.2.ebuild 847 BLAKE2B edef643ad565d58b4e7c83d7856af62a7a2d8e5eb6695bfa9907be7193695241437efdfda1336a2679bd07211c0b227dfc7bd486141b00e49b0877a1f781f071 SHA512 a9eb001da175ba238b8dfa51e0e537e3056eaa4bed32dfb9cdf20a8c78c3479fd9e3119cb370937a0c11a85eb66d2595099fb2253364f9d699f1986648b34bee
 MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
new file mode 100644
index 000000000000..50b04954eaa2
--- /dev/null
+++ b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIRTUALX_REQUIRED="test"
+inherit cmake virtualx
+
+MY_PN=kImageAnnotator
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for annotating images"
+HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
+SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png]
+	>=media-libs/kcolorpicker-0.1.6
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c8fd435e6eec..d49c5329d3a6 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,7 +1,7 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf SHA512 e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
 DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801 SHA512 3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
+DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0 SHA512 cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
 EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
-EBUILD leptonica-1.81.0.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
 EBUILD leptonica-1.81.1.ebuild 2055 BLAKE2B f8f26bcef94f9250f4c9cf58a49641c14a873074f4cf666f7ce263b3d20e6a233bf34479664bbd0feb46eb11aeb2ed5e504c8bc4b34b335671c725bc6f218f50 SHA512 2bde386640d2edef03337bb8e23887469554b9c023f12839842ff0d415c752ee6fe27602e4ce08d55efb6f978978c7ae8dc170883a113d286248d34dc09728e9
+EBUILD leptonica-1.82.0.ebuild 2055 BLAKE2B f8f26bcef94f9250f4c9cf58a49641c14a873074f4cf666f7ce263b3d20e6a233bf34479664bbd0feb46eb11aeb2ed5e504c8bc4b34b335671c725bc6f218f50 SHA512 2bde386640d2edef03337bb8e23887469554b9c023f12839842ff0d415c752ee6fe27602e4ce08d55efb6f978978c7ae8dc170883a113d286248d34dc09728e9
 MISC metadata.xml 606 BLAKE2B 45193dccfdf3394ba6217bb096036b61059b96be60a22381e039df561a66ef091df4fe0476e2c6a6af9f4ee1cced1019d284171e767c18c56ffef3a737794582 SHA512 6b193ead9003b5f54617f4c4852a0a0477c8cd246b4a5e688578d17ec3c03293b6a45e2f6082a16ca6f432fb2bd3f43efe59c5d0cc1c5f741e91116321a10860
diff --git a/media-libs/leptonica/leptonica-1.81.0.ebuild b/media-libs/leptonica/leptonica-1.81.0.ebuild
deleted file mode 100644
index cc3881a79ba7..000000000000
--- a/media-libs/leptonica/leptonica-1.81.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	png? (
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	)
-	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( media-libs/tiff:0[zlib] )"
-
-DOCS=( README version-notes )
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# unhtmlize docs
-	local X
-	for X in ${DOCS[@]}; do
-		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
-			"${X}.html" > "${X}" || die 'awk failed'
-		rm -f -- "${X}.html"
-	done
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-shared \
-		$(use_with gif giflib) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k libopenjpeg) \
-		$(use_with png libpng) \
-		$(use_with tiff libtiff) \
-		$(use_with webp libwebp) \
-		$(use_with webp libwebpmux) \
-		$(use_with zlib) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils programs)
-}
-
-multilib_src_test() {
-	default
-
-	# ${TMPDIR} is not respected. It used to be but it lead to issues
-	# and there have been long debates with upstream about it. :(
-	rm -rf /tmp/lept/ || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# libtool archives covered by pkg-config
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild b/media-libs/leptonica/leptonica-1.82.0.ebuild
new file mode 100644
index 000000000000..f831a57c4e72
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? (
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( media-libs/tiff:0[jpeg,zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# unhtmlize docs
+	local X
+	for X in ${DOCS[@]}; do
+		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+			"${X}.html" > "${X}" || die 'awk failed'
+		rm -f -- "${X}.html"
+	done
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-shared \
+		$(use_with gif giflib) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k libopenjpeg) \
+		$(use_with png libpng) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with webp libwebpmux) \
+		$(use_with zlib) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+	default
+
+	# ${TMPDIR} is not respected. It used to be but it lead to issues
+	# and there have been long debates with upstream about it. :(
+	rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# libtool archives covered by pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
index 9f8915c62686..fade92db0d78 100644
--- a/media-libs/libfreeaptx/Manifest
+++ b/media-libs/libfreeaptx/Manifest
@@ -1,5 +1,5 @@
 AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
 DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
-EBUILD libfreeaptx-0.1.1.ebuild 1069 BLAKE2B 906828ba330b8c2cc2cb6c7bdbe5f14ce1f7406b227403bb16e87faa092c3191ca987173f4f391230366171c1222c27436b77ecc3d949e42550006ae63da563b SHA512 891ec16859505dc41b98de582e826c9d9b3bcf6dfef1e64f09bb011b15b38f16e1c2c13d5e46da80171ea499fcb6be9a7c6e551198486c4f0d53255d7d75e5b9
+EBUILD libfreeaptx-0.1.1.ebuild 1066 BLAKE2B fa88b305a88cde4141cec0eb54c088d26e293a93bceaf4f15638bcaaffda0dece75e2314cda3ce671af5877e656c390f52016eb9d5c25a4158113ccf9b83ec11 SHA512 19199f44d5f837361dc40908228b09d6c89948e410658ed7894c8415d802254b8a0c4a7d749059aad49dd154e6aa27c9e591a5f17eb21e5ce3e17989010b9dba
 EBUILD libfreeaptx-9999.ebuild 1104 BLAKE2B 9ab4ea981ac6243332276f0f17b3b941b4a49b658cabf5e6658efb7664cd71ae522683383f023788cc8dafb233d0ff94d4f21e16ed47a36f8d7273638d963706 SHA512 99f6b1912b7c00e7c2e0f55ee7c9210697b2b0d705a85920a02a58c9aaa443fa29e85128a699b76280a994b27b1a954e0c9e900c74ad41133a2484d2b671eae5
 MISC metadata.xml 443 BLAKE2B c6bc37f198358a17bb8c099093ed64f9318966930771426243e401e35d8c4c0b4d764532ded69a71ec6e5ed463d582106d8574d661bd9d9a144b71528b0d02ae SHA512 ab15fe16e8ab3e5cfc792dbbb65437e17ee76f4b9b94a08fa90f553f1d15a1c179e6cd791962ac9ddc764b50ac5410ddf0dd7c3618b2c274f6fcb5ef7c5982ea
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
index db0223a7362b..c7a81b9cd718 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
 else
 	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index fd21d7384ab1..531610bfa5d8 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -11,5 +11,5 @@ AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
 DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2
 EBUILD libid3tag-0.15.1b-r4.ebuild 1649 BLAKE2B 994ad52c6bad887199f6039839dbe51a966bd4b70b78bbdd38230a7a6d704e2ec1a68b5ede12aea6e8b8a5bbf9a48209dfbf31f8e8072128191b4b8e995a6a4f SHA512 18faa050ebab9e177ad4be3c64216fc46690fb57ae65c63ce845746d46b7c115f16e416a2e58c4280c13c709fac1e6775a947c7ead5dd1bedad4a64f09803668
-EBUILD libid3tag-0.16.1-r1.ebuild 581 BLAKE2B 37fbd8d48b46c1448b364b1385a49581229a89e1bdc51e126b464b264e36771779dcd82823adac2b575c509f6710e8de00c1a823d73c24cfcce6abdfd0b8b52e SHA512 caa8053953dee07c099960bda4ccc632738a24fc3fc6d7b33a52a95f3c50f784912ac21801a3e89f63dd5060b1aeaabb1a729f31b948e8995991d1d8ca438cd6
+EBUILD libid3tag-0.16.1-r1.ebuild 580 BLAKE2B 009a8a53d64d10897890c9dfa300ce1160f6b3973439819544ef377f1692d4df93d87db3d21b38a3e8fce2241ccda425b7c7d6d2b84d059b57e89df19a37262d SHA512 9701442bf3196995331dd689bd26ca288665b0f80c681247882171a73558e0fc838e2d944ad51795b3be6155d0ad492d1009ba566923d8d7c087ad67ce1b18fb
 MISC metadata.xml 327 BLAKE2B a160fc0168c9b0eef874a76a9b6ad1bfbbb2818750ec2d1b14b76f16fd7659fa401889fb5d19a5abc628ed1a6142c9f9b445c3314b58591409b0a31692156630 SHA512 1b879933bdd99c3cab5e88bb24ed77961ec7d4e9f0890fdf9ccc098ca1a95e6c9fe1a7b55f5f0b6c10909ddcf73af7e176228f615998653fc25d9c888af9f8fa
diff --git a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
index 98b57a4b19ab..774e9ee20b01 100644
--- a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tenacityteam/libid3tag/archive/refs/tags/${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0/${PV}" # SOVERSION = ${CMAKE_PROJECT_VERSION} in CMakeLists.txt
-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"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index bcfa7a32c75e..6ee8d9b364bc 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -9,5 +9,5 @@ DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d5
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3224 BLAKE2B e96c8b4aea2e7b1f445c80f4c4cff87b83169f7c273df39bc06dfe95cd3609e7213c685118097ca549efed282e1c315a9a1901d5001f3aa8e155fbc6def1a8f9 SHA512 7d91d57218b278bcc19010250be0446c4d85982c063469553649cfaa7038e00fce92bb59820e24c397915a5f7e8a4f952b64fb84d57caa70a6b73ba7496fd745
-EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3311 BLAKE2B 8aa7f14c4ad7aede5ab08ff430a9bd924add907cb193aa620f2a3f15949b7f5804e65518e34adb5b875ba1add63d32a12159cbc65646746f27c0954f3583c135 SHA512 4f0cc2631c5b954b438862f68ae412ba5367b203384ff44d0f8d551d55fa37a76b9ded1938ae6d8ef8d0040c9579dedb9fdca0e6093e6de54f5feedf4cf6d74a
+EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3308 BLAKE2B a564ec8e512f77cf44021081698ed5b0e14b441bfa8b3a112ecfc7a9d0fa2c1afdc9988a46a4a5fe29464b7dd1c46874fe70256d2f4dad8cfd98a28d11a10191 SHA512 59d55f613e9625be5ae27dd8942874ab632dca5e3db3cbc7eff7394f46558bbd8bbfac633d9266e92cfcc374929d47ac8af11c2d645aaeb74d5e6b9e573e5fb1
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
index 0c1d2b1f4403..a93dbfc0baa5 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 04244d115be7..afc7de079831 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,6 @@
 DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
+DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 EBUILD libmtp-1.1.18.ebuild 1607 BLAKE2B 9d275d6310114815fb4ce70d8dd66b22f2b407c9c87f7cc5182b8e1ec6b118e0b74b00cb19baba62c343628d9e915e410600da349116917074577404931ee911 SHA512 d6cc193aaca037be02340f185ea6b01e98399299a9a0710b033144f2489063f9856ccf7b7b122cf3cd4a5214d7dddc09e9d7c1be5699483f9f31531538c7683a
+EBUILD libmtp-1.1.19.ebuild 1612 BLAKE2B a6fb9432674f56058cd66b6f9280917e7315be1013fe1eb634e404cc3ab7dbef5924ef6ac8b08104972377eb382377437a9a81264b0df531a1416b544a1b57ef SHA512 0f213e76c08578a01ca1446b4b741a51132c075bf26d3e98b087164b3a4065ccfab9cdd4e23151797ba92f1a2565fdd0b99b64c2ed5e2082600b66d52758b2e3
 EBUILD libmtp-9999.ebuild 1594 BLAKE2B b539573f2e7c95d5d3622515e7f37baec057ee64be4468129484382b33e70d9b66028a5460ff2920b15fc3a2016b6c6def1d83223855448d3071493fd0eac439 SHA512 402e201946ce11315c5d366f03835a969f2b7b91e7c35f8eaf2920042b19abe104c097e1521454f31b37884c9af244829e4e9f6e765775f0dc4b7eb38cc884a1
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.19.ebuild b/media-libs/libmtp/libmtp-1.1.19.ebuild
new file mode 100644
index 000000000000..6a4e3f9455ec
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.19.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="
+	acct-group/plugdev
+	virtual/libiconv
+	virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README TODO )
+
+src_prepare() {
+	default
+
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm ChangeLog || die
+
+	if [[ ${PV} == 9999* ]]; then
+		if [[ -e /usr/share/gettext/config.rpath ]]; then
+			cp /usr/share/gettext/config.rpath . || die
+		else
+			touch config.rpath || die # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt mtpz)
+		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
+		--with-udev="$(get_udevdir)"
+		--with-udev-group=plugdev
+		--with-udev-mode=0660
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index 7594d3afe863..6110dd12fd5d 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,3 +1,3 @@
 DIST libopusenc-0.2.1.tar.gz 388071 BLAKE2B de3a69aeb6bb955352e097e41b12cf0c627ce5278687124d00996f52ccf5e8e39277e7c345bb26e75dd7d29b6a70f50396fa5a157913e0906a18acd007b1621b SHA512 adf30cacea9ac2e5889a40147f53943a1bec5279c5ff3a9b09de8ca52727a6cbaeecd338417fc5856e337ae183c85b0d366d14ec4ec329de12d50709a6f6507a
-EBUILD libopusenc-0.2.1.ebuild 614 BLAKE2B a1fce575f7ab12df5231d39e0bd8f8dc3047c8d3ea456a4fc88217dd4f311b6cd4344bfe645dfcf80dd727936398f3488d70e163329c91761ea87f9c3d5d996e SHA512 36ecb46243c0a5856a8360c1eeb542823c8d1bd2e82f91ee4af19bf882e3c39a0c0aae17fa73596bfe6ee0742f31f1046d0ee17925b4a815ee10ff29ea5371df
+EBUILD libopusenc-0.2.1.ebuild 621 BLAKE2B 73414e360c961e1a314cf0926121d6ff0795ef908ef04445f8d566254253d653ebdd1c119689f3436bb29eec5a2b5bd9f2ca3f92f263a14feb1ef8663c16db30 SHA512 3b01f1a0d031e66fde370351d88e30496ee0fb57cfd619265ff827b7bbfa2a79f49d2de138e0ed67280035ea1803b5172a94985d397779323f8c4ad1b1ed434b
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libopusenc/libopusenc-0.2.1.ebuild b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
index 87f43003c99f..28c6ad68ed83 100644
--- a/media-libs/libopusenc/libopusenc-0.2.1.ebuild
+++ b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 754140a3908d..e19446336c58 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,4 +1,4 @@
 DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
-EBUILD libpano13-2.9.20-r1.ebuild 868 BLAKE2B dc6c4d1bb745a4e96290b84dcbd8b62647860868c464a3eee3d96e11f7660b36c4092f82ee4052bc95d66bd71d43490b800d48706f7709d8a871beddeea81036 SHA512 ef5be06c6ab77742256672c355557095b5edfcb0784cb0ca3a144ecacb2b9969ab3728b849dc19e16eed412f25b700cee336c305edcbd394db6ac9f4f54caed3
+EBUILD libpano13-2.9.20-r1.ebuild 866 BLAKE2B 837f9531634617767b4c697f568470a49c7ab52f7c9e200cdc789c5ffea813810bf7847f19d569536cbcab750da90a3171269c8a124db10769c6e510098434c5 SHA512 49a049a8ca785e0badeb503f3a5b1cb7381db7a1dc7ae9894e7521918f86dcf8c586af1b5ee6f56e224dab7a5396125ad23e3c886def314d63bcc0d59d964210
 EBUILD libpano13-2.9.20.ebuild 863 BLAKE2B bfedeb2bdacaaf0869fc81b94639696d8e3a55780ece792315d106bf4b273f24ef37e3616277d36d78397f19fdedb79ddc826cb7d0eb6454dd046ee7f82c5d29 SHA512 70a3d1b93416a41481a5de719aee25a322caaf5093eb781b257c5e23d115e642531297110d785d90e552d98d0ff435b6c457e650234e801b43a5392fefc706ee
 MISC metadata.xml 325 BLAKE2B 71566f5af7a046704cb65029e19317a2115db3499d35435a1bb95981d28bc747c5d3c315ae5b5dee2702a69659908599f76491ffb43701e8ad0a3f0e7787e927 SHA512 d048905b91a3c4332ee5fd6063b36ca02b386799e829ad54b9c47df42a381f03ba46152eb16daf73aebb23da1e1439e1c720488436bb7635abd1232561852e24
diff --git a/media-libs/libpano13/libpano13-2.9.20-r1.ebuild b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
index dceea6134c5b..098c193153da 100644
--- a/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.20-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="java static-libs"
 
 DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 42a2fd7f43e6..65fa92f76f82 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839c
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f
 EBUILD libsdl2-2.0.14-r1.ebuild 6040 BLAKE2B 568f3cf2814d110c76c5eebbb5ecad94315c6b1406afebf10c8d2d92a7a8095126499fafdecc2b87032840e555264053d176688d57977f031c9b89f9bdbddcc4 SHA512 f3ab38be41cf3450e3943dcfb4426f36e81e172acd05b58a847927e83257051daec0f9f5f600bafd20939899279f1dfa466f3f9aeb0ad9030dd603e5a196770a
-EBUILD libsdl2-2.0.16.ebuild 6462 BLAKE2B bb87aa2bc641139ee7d2a4f5975140b0ade7f04effe78e88a335715e2ad1ef4589a889fea103d8754ef012664c7f4bc3bb6d04b55d514fd2f95fd3eca045990e SHA512 ab8e573d0a02f9b8298409b6d65b3f82c824dfcfef64132a2c998dac163512cb8a1263936adaa930be6935ff782038e5cec78b324f954383275daca9f0647021
+EBUILD libsdl2-2.0.16.ebuild 6460 BLAKE2B 86879979d382c2846d73a472e20319e36968edfbb1e28f370306fff193a77a99a9b5f765f0c73f0172230ec90b4171942a2ae66fa92042dae1e55342c06d3b64 SHA512 4b99db46cf2274c90169387a13b1880d5336388892e902f917cbb5137da57c15993576023c4ff02f4e82b5b62d3415020567630bbe408295022475f49b9b15e3
 MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7
diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16.ebuild
index b36fbd0f755a..5ab929261c61 100644
--- a/media-libs/libsdl2/libsdl2-2.0.16.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 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"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index d9ab811c74f4..687fba548253 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,3 +1,6 @@
+AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4fdbf7ecf8a7eae05efd4e74d5e84d6f3eb8a63eeb0abd998404819bed8d084cf98bbb79faab3877512cb713 SHA512 3c853f577c569f2228d63ed9b63ca8cdc23313b5d76b890186ae7d0741e18f1707f5470cad88daf849f8972d42a9100480e354bbfc80e8be030467cac364a58a
+DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
 DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
-EBUILD libsixel-1.8.6.ebuild 1137 BLAKE2B f800ad1ab44e827da2e31649859649d7a119d06b518ca303d31e5120e3ac2f342d914a389dbb53d3ce28987fa5e3ad5e990cfb4af4818d6262c4e7559b611d5c SHA512 e2e3b502296827210a9d3cb78b87bb4abdc1857fe00ac72c4a969d31c2af18651421095a16172402a64f92183457f120c36da5fdfbe81a0ca605a782b5c71a5b
-MISC metadata.xml 330 BLAKE2B 6739740b8d95b47ed49d70df517c040a6212a1e1d92d3e7b36e66f307600a04e30753f8ac2b80938fa2794dbba6fad4df42236f652ad653e30240a1a7d55a221 SHA512 70fe7c89c127d2998ecbda005ac12b2354bb931fc9e2143721f053f564a3fb59bdae5c8be8dc55ed7a6c849e395380f0e8fd6220ea8346b234a9563c63f09683
+EBUILD libsixel-1.10.3.ebuild 1845 BLAKE2B 3116f815a2d0d65348ec55b8cd3671c7597f11c3fe71544edbae36a00468d8150e310c47e4ae9d8853545c513ceabad73676c4959a4fb760e7d0d8706667b224 SHA512 6f93b274645512e86da7f2187543937bf9417a1676e48b99f9dd181a56332012d206b8d4dc2370eac91a2d4c555b780a34319028a105f05b73adacb726965d97
+EBUILD libsixel-1.8.6.ebuild 1848 BLAKE2B 65ebce0c43773581673555da29d7ada4e2bcafb8b2d98dd6e311b1cd9ead95d1a8d52bcc2739b5c1410c2ab776403909bcea1a7198e664d9739db6cabf920f73 SHA512 4a006fd05ba3b344d387dea8c59e6895c28f515094c84bee22fc4479c320964faf768a926bbaee008103fb74fe4b5285e97b31ff61e1e2b12db045508ab548e9
+MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/files/libsixel-meson.patch b/media-libs/libsixel/files/libsixel-meson.patch
new file mode 100644
index 000000000000..b912288e2e66
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-meson.patch
@@ -0,0 +1,65 @@
+--- a/meson.build
++++ b/meson.build
+@@ -27,7 +27,7 @@
+     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+     __attribute__((deprecated)) void test(void) {}
+ ''')
+-  conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', true)
++  conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', 1)
+ endif
+ 
+ c_args = [
+@@ -101,24 +101,24 @@
+ python2_installation = pymod.find_installation('python2', required: get_option('python2'))
+ 
+ if get_option('libcurl').enabled() and curl_found.found()
+-  conf_data.set('HAVE_LIBCURL', true)
++  conf_data.set('HAVE_LIBCURL', 1)
+   libsixel_deps += [curl_found]
+ endif
+ 
+-if get_option('jpeg').enabled() and jpeg_found
+-  conf_data.set('HAVE_JPEG', true)
++if get_option('jpeg').enabled() and jpeg_found.found()
++  conf_data.set('HAVE_JPEG', 1)
+   libsixel_deps += [jpeg_found]
+ endif
+ 
+-if get_option('png').enabled() and png_found
+-  conf_data.set('HAVE_PNG', true)
++if get_option('png').enabled() and png_found.found()
++  conf_data.set('HAVE_PNG', 1)
+   libsixel_deps += [png_found]
+ endif
+ 
+ loaders = ['stb-image']
+ 
+ if get_option('gd').enabled() and gd_found.found()
+-  conf_data.set('HAVE_GD', true)
++  conf_data.set('HAVE_GD', 1)
+   libsixel_deps += [gd_found]
+   loaders += ['gd']
+ 
+@@ -132,19 +132,19 @@
+ 
+   foreach f : gd_funcs
+     if cc.has_function(f, dependencies: gd_found)
+-      conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), true)
++      conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), 1)
+     endif
+   endforeach
+ endif
+ 
+ if get_option('gdk-pixbuf2').enabled() and gdkpixbuf2_found.found()
+-  conf_data.set('HAVE_GDK_PIXBUF2', true)
++  conf_data.set('HAVE_GDK_PIXBUF2', 1)
+   libsixel_deps += [gdkpixbuf2_found]
+   loaders += ['gdk-pixbuf2']
+ endif
+ 
+ if have_getopt_long
+-  conf_data.set('HAVE_GETOPT_LONG', true)
++  conf_data.set('HAVE_GETOPT_LONG', 1)
+ endif
+ 
+ configure_file(output: 'config.h', configuration: conf_data)
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
new file mode 100644
index 000000000000..d9e158874cf4
--- /dev/null
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
+
+inherit bash-completion-r1 distutils-r1 meson
+
+DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
+HOMEPAGE="https://github.com/libsixel/libsixel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="curl gd gtk jpeg png python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="curl? ( net-misc/curl )
+	gd? ( media-libs/gd )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-meson.patch )
+
+src_prepare() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+		cd - >/dev/null || die
+	fi
+}
+
+src_configure() {
+	emesonargs=(
+		$(meson_feature curl libcurl)
+		$(meson_feature gd)
+		$(meson_feature gtk gdk-pixbuf2)
+		$(meson_feature jpeg)
+		$(meson_feature png)
+		$(meson_feature test tests)
+		-Dbashcompletiondir="$(get_bashcompdir)"
+	)
+	meson_src_configure
+	if use python; then
+		cd python || die
+		distutils-r1_src_configure
+		cd - >/dev/null || die
+	fi
+}
+
+src_compile() {
+	meson_src_compile
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+		cd - >/dev/null || die
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	cd images || die
+	docompress -x /usr/share/doc/${PF}/images
+	docinto images
+	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+	cd - >/dev/null || die
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_install
+		cd - >/dev/null || die
+	fi
+}
diff --git a/media-libs/libsixel/libsixel-1.8.6.ebuild b/media-libs/libsixel/libsixel-1.8.6.ebuild
index ad139ad3d010..0cb049507e88 100644
--- a/media-libs/libsixel/libsixel-1.8.6.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
 
-inherit bash-completion-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
@@ -12,15 +14,30 @@ SRC_URI="https://github.com/saitoha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
-IUSE="curl gd gtk jpeg png static-libs"
+IUSE="curl gd gtk jpeg png python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="curl? ( net-misc/curl )
 	gd? ( media-libs/gd )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	png? ( media-libs/libpng:0 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+		cd - >/dev/null || die
+	fi
+}
 
 src_configure() {
 	econf \
@@ -32,6 +49,20 @@ src_configure() {
 		$(use_enable static-libs static) \
 		--with-bashcompletiondir=$(get_bashcompdir) \
 		--disable-python
+	if use python; then
+		cd python || die
+		distutils-r1_src_configure
+		cd - >/dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+		cd - >/dev/null || die
+	fi
 }
 
 src_test() {
@@ -42,8 +73,15 @@ src_install() {
 	default
 	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	cd images
+	cd images || die
 	docompress -x /usr/share/doc/${PF}/images
 	docinto images
 	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+	cd - >/dev/null || die
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_install
+		cd - >/dev/null || die
+	fi
 }
diff --git a/media-libs/libsixel/metadata.xml b/media-libs/libsixel/metadata.xml
index 457207a9bc18..3bd897a7c985 100644
--- a/media-libs/libsixel/metadata.xml
+++ b/media-libs/libsixel/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">saitoha/libsixel</remote-id>
+		<remote-id type="github">libsixel/libsixel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index a9a318276de6..aaf95eec2c15 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -3,5 +3,5 @@ DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f
 DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3
 EBUILD libuninameslist-20091231-r1.ebuild 569 BLAKE2B c6c7756ff1750da6071383171f22fdc2aba91bfb73291ba76deb5108ad24760691b9d3e75fc9a69532b82dc9590d000183b59788c533e260033d0e64d57d9e90 SHA512 94ccdd53e367cbd45c8914137d3935c1730c50bf17e6f53b56430b7442a887f9d038c2bb831cb5a0c04d104d1e6b305dcaa9a75cd590e260f56c4eeedca91c36
 EBUILD libuninameslist-20200413-r1.ebuild 598 BLAKE2B 2c00a221fdb6ecab8f83450654b0c5cc189d318749002ae8cbdcd56bf4d646e8d8fde27a1cb52520559fe836ba67e6966c6ee22aaa059443a150bb73ab1de8ed SHA512 79e1882677b8ebb5986d7ec8cf632e63f487dfa141717688b10bf6d45cf6229507b636cefa3fd40343ef8b48ffd7cf0ee5188538a437b6a6d5d5994f92a6e564
-EBUILD libuninameslist-20200413-r2.ebuild 736 BLAKE2B 378a17fd08082df44274416ba279a947a7eca65a59e8fc92408dd44d94a9ce001953d36b0fe8a952c022abefeafeb6e7d64220c01ef2972bf7e4d2ebf1937b91 SHA512 f7057f291f2171e4b6b9c2f104e2c7f1543facfa952a4ed98ab1d2da40ada2665c53e3d954f4db1217590648e3f96c8e1ce20642c614138b8391d9f4c0aefee5
+EBUILD libuninameslist-20200413-r2.ebuild 742 BLAKE2B ea3e0eb66cd17047035986b0803c58d3d4876b3b18c8f4a064e5c51186a25a89928cea8029970a3e996f46f329dfaee3bc0b655ccfecf5b12048f8dcc93c10ae SHA512 3c8b7b4d7c659a4a81c5af6eb7d7e0791571aef9d3b181adbef728e096fb02ade001db7ac43821208250aa9601ace454a8c7a4498991702a109fe2b84e5a83ae
 MISC metadata.xml 484 BLAKE2B c5aae59be58a06431b5c19c32ac89ebc77a2ca93c37e98b834e9adf11e7c4a45e7655d21621929b70fac24cc4121f50dff17e462d1d782942215aaf5cffeabe2 SHA512 2bcc9f45999095ed409b6a77b66b827395371ae177c6496056936cff949339d192288b430ff631aea20ced5b107268afe63284919a3e90d0f335427910e18f7f
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
index 1811d205d83b..105229eb3104 100644
--- a/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20200413-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200413-makefile.patch"
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 79e62404aab5..9a82a8d7cbca 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,4 +1,4 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 EBUILD sdl-net-1.2.8-r1.ebuild 950 BLAKE2B eace10eddbb039153f4de12e426cc8e7f170857541a4e4502522140bce44786e45c1e214b724fe3a57df25350bbfdc0e9447e5a8683decc72480cfa3c488b440 SHA512 5e8c3e5cf9112b614a082c9f5420cfcbae3af78fd011967fe4b2f6b81c4fa76a682a3b955eb96df2d0c72bcc14ca13bffb38e7b29c71b9fcea16b58fb04b07dd
-EBUILD sdl-net-1.2.8-r2.ebuild 736 BLAKE2B c3edf28be584c3b50b753977612e4789e19c863c7d17d930cc892a50577097e018e6e7fb0aca8558beef7e3c3452f9b7422ed11634d28fc20c9a364f892c49ab SHA512 4f4080490d6ce4a5271ab353ad33932e1b0d1de5dec53887deec8ba795446824cb31866a07177e7198a1b67a895e2da540dea28adc38beb6dbc44095caa244a7
+EBUILD sdl-net-1.2.8-r2.ebuild 735 BLAKE2B d60dc361d443cb770b582b98684252a4b1eee4baaa3d014e07eeab8a2267950f49f4fe1bd40ae27417508380f8ec8a423700ad65ea35d018224b13dc112753b1 SHA512 6d16a932eca8f89532dd9722562b2d2f05e67db42b2cbd967910f061ba5ea6a68b70de8ef663dc64c38608bef590e711ecae7b75e5d2287c98194dd61dd75e48
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index 250ce0a30680..7cfc2935b429 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 7424c0ab72f1..f00025ce53f2 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
-EBUILD sdl2-net-2.0.1.ebuild 817 BLAKE2B 1e608f52a1a0f20642bca1e461530cfaf78f2f1166172720760b4debd41b0e48344497244216ea3aab569641371a27a90d612880786f17467071d272b9799beb SHA512 9f3505b20827026d43869ca6bd51120425d566b2d1fdfbcf2f1e689ab5f01efbf5659143ca7530c55c8c3aa92e0409485ffcfc8dee976eae0a9e85b50f3d6283
+EBUILD sdl2-net-2.0.1.ebuild 824 BLAKE2B e7ec9b5ba6548415108eeaa22043969112bc3d61cd330637669272f4987dedf3b0900a1a1ec40f6696f03aef5c46afa7a6b9f74b605939fe927d5c0d9a7c5d71 SHA512 04911606d152393946e55e49ffbf5ca65ff46a472a90a4eaebc2f539726d31cd362ba69b251c3b97f53b4828b267266973d9f47aee5ffa11b2290cda98ebbcb6
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
index 195ceafd5397..fdb48511b2e9 100644
--- a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 67dea09da9e5..b83c726f1380 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -13,5 +13,5 @@ AUX smpeg-0.4.4-mmx.patch 252 BLAKE2B f5d0761bb38c021996eb19b534122d8fd9e697c5ee
 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 1700 BLAKE2B ecf32f7d3190907208c4bcacdb1f870cea8ee630331b1de09649478200a3e8235b3ff87acfecb66f84c027cf711bdf0d7861843c5998c202ab12188cccbe2e14 SHA512 2703b7b3daf913edffb240943fde93974b46c7205a5679b1c499d963b644f6e21bca00aea6ad40eed786bd8f86de22492206f4def58456037d367b6e31e5ce03
+EBUILD smpeg-0.4.4-r11.ebuild 1699 BLAKE2B 95fc2d7d3b557b5cc7a9f7e5ee981a895ae6c2f1fc5313383a99e480fb659492c43ad41f310d851eb68737dd71fe95e811d2d635ee3ac89a72ce8b1c76250deb SHA512 f4b698b0ae369f3593cd348bf0a762877871c9e176d77b28780d907adfd10e8843b745756ae0ccbc778585ee915880133cede5410367d35e556ba933ab989923
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
index 895fdd7e7b36..6a8bc98cafd9 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+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="
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 9e68663c121f..7cc2191938d6 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -2,5 +2,5 @@ AUX smpeg2-2.0.0-gcc6.patch 772 BLAKE2B b4eece6aee658b484b65856dfb851c1560af5898
 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 1127 BLAKE2B 585b66a577dcad832a42198dd35d41794d0ddcf2f23d967d2feb6da7757b5280aa9579709ce1c371af816248517a2a3d20097762f28ecd7310f0fc4a00607844 SHA512 f84af4812e479bbe1ba8f0576d43cb1f728a1b1a9c39a39872c1f9e40a2255bc63e67cea91e825e2a2063b7a294621e5e3694d11d563d1fdbeebb29875f51ddf
+EBUILD smpeg2-2.0.0-r4.ebuild 1126 BLAKE2B 13e05e2863abb824d15a90dd6f877ee02ac3eadadd34fef8fe71357d14d843c5d6bd23d1ff4648fa3a41a1346acb2907578adcea65a8906c9f28abd0cd1adc44 SHA512 5069f0cd49bd5b916118db315690a7431ec40174ba3f5f9c30310dc22e60c4893f14638700e3bc6f0ea4125e3a4501a5758c2df3952623899472d4c9b69049c4
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
index 718580f7843f..27a8a90fc821 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-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="cpu_flags_x86_mmx"
 
 DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index a6689368bd24..0a208a6f83dd 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r4.ebuild 869 BLAKE2B 634c1cab81534fcdb696f0270645dece83fe39c19571c6b7d173c214fffb6c32d93d008bee7997442e8ddbdeb4c1fc67af481dd2e890f517a21e9338a1c4be82 SHA512 1fb72a04cdca72a243585e5a56734cb819fae48803905b6f62382a85b570586c5b71bded05035a7c5ccb922a92098ef6f35ee45d92cb8ea05d03f66af2121394
+EBUILD woff2-1.0.2-r4.ebuild 875 BLAKE2B a476d41e48546fda707c634bc66921ddb0ce26cb70634017c8ea1ec686f7c2ee575a4fdde64e19c53c5224d2b78bf91a1c96daf21d84b636307155363a5bd5b8 SHA512 c9c5d23377043fa0b99dcbdcd74a2a31491aba7f8088276ac4ee15529eb0131980d66dc97692bb71365fc2dfad0aa1e98f06ede88d3eabaacb010e52e42b8595
 MISC metadata.xml 354 BLAKE2B ad57a794365a6750452e942c5570e3357d829c917f09f7d79d7cd14612d0adfe6d0dc4f0e6697a3d0ab91dbc8b4927270b7ecff99c1ca0b5f95c88d07b78d23a SHA512 c42129cdbfc646eb68afe8f1cabaefa9aacd6444a99dd469b686bea805ffe3929382ebbab79c1936d5c1b3c4709647aba751e7a73baba367687ba63f1e605afe
diff --git a/media-libs/woff2/woff2-1.0.2-r4.ebuild b/media-libs/woff2/woff2-1.0.2-r4.ebuild
index 0d01c3669e73..b492cdab3cfc 100644
--- a/media-libs/woff2/woff2-1.0.2-r4.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli:="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 6d12f723c20f..f33197ef56b4 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index b65b795317b1..2cb0f5d56cfd 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-libpng-1.16.3.ebuild 370 BLAKE2B 7b54fd7718d84da3796a2e781edeb1320dd1ca68c0d3e6dcabf63f263fc0e5b042d64f32065786b57dfdf00fca7f63b60663f8731a82f2f21d2a472308b3efb6 SHA512 07f44b9e49a22ae8ae097332f6b7bdee4109b741a83389d0fcd8da8827ab2778d1d2b0c8623be8b469610819d432fcdc8838305b052564c50a8cbafb100b0e06
-EBUILD gst-plugins-libpng-1.18.4.ebuild 403 BLAKE2B 760bd5d9a48b9a90f458ffb68d8d5e5b788242fd6a4cd30ddcd334b8b0c975c5d43f8aa34703590ea857f1a8f87d16571454b7dbb6c84177473cb8eadb8b1978 SHA512 1dbe3520ff8b0029d11600dbd4edafdbcab1389048ad6430224f9ba5505d0d3ef6a70395a9f35e9e4020fa5a39206aef69eaf3c9561991ebc01db79e55ec1d40
+EBUILD gst-plugins-libpng-1.18.4.ebuild 410 BLAKE2B b86aa7650260e9e4043a4008cec658ff1f0e0e211a1db9ed44da76e527cedaf4efae5c3c3ae880635a5e1f8f7f0743b3c85dbe07c170138cb57a95b7d7799ff3 SHA512 3a2fff3712792cd3741d765ddc63d6439155f571b9b27ab7fde064d7fd269ed567a86ac7f8ad8cfd925b7f326c74363b0a109307875f0c9cf9091cfa3a19afed
 MISC metadata.xml 484 BLAKE2B 39715acd23f06de3c5a0e7d46c75536018a122ff76fb537ef27ddfce3c9a8d8c97d435ef5393741b7d0964b75a7bd2617624f4f3173854ccc52beab06bc6fbd5 SHA512 916d09e2eaec4682390f0f530c8e3ce04dbe91c1f585ef45f3b33133774819667d7f3de33d5524000eb553ef87885ba9a026d669d3f2ba61ee93926044b992de
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.4.ebuild
index 3173a4449c44..c82d8bd3033a 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 258e91aa1fa8..76c1602258fc 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index a57357da7cef..ff34a9033c89 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,9 +1,3 @@
-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 494 BLAKE2B 36486ca125bd2701b4679178896a1b9455a1e8486e13a331df9118fc96c8e3655c92651f3e766b625919a5c0edb7a33183a54abd1ed26375930d25470dd9dff0 SHA512 aa6b14cb3c8fedfb8472fc5cee20d5e5cac1d81abb0dc740ab25e16d73ddd23c75e7d551434404a68635ec9d780807fc251765d4681c1f2507615916756c9277
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.3.54.ebuild b/media-radio/flrig/flrig-1.3.54.ebuild
deleted file mode 100644
index 6935ddd0e9e6..000000000000
--- a/media-radio/flrig/flrig-1.3.54.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
-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/flrig/flrig-1.4.0.ebuild b/media-radio/flrig/flrig-1.4.0.ebuild
deleted file mode 100644
index 955cc391d619..000000000000
--- a/media-radio/flrig/flrig-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/flrig/flrig-1.4.1.ebuild b/media-radio/flrig/flrig-1.4.1.ebuild
deleted file mode 100644
index 955cc391d619..000000000000
--- a/media-radio/flrig/flrig-1.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/tucnak/Manifest b/media-radio/tucnak/Manifest
index fd82555f4f45..749a6ca18f61 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,7 +1,3 @@
-DIST tucnak-4.28.tar.gz 3592213 BLAKE2B 24a6a381367b823e24584541c56b4d34bfeab883cf6e488a42f20fe0f05d79432017f82c10702bd97cdb9a2454129410bfc3a894803ea3aaea8dad11029c702e SHA512 c5186ba331a0127d14f637548c738482ee3050749135404dd93d636c392e1e3b5032b1c92941b22548095d3b3131cc0768f71061feed532c40c8ff1e8a06cea7
-DIST tucnak-4.29.tar.gz 3593562 BLAKE2B 8469485e8262bf6fe83b22e8a3049bdfa519d8d9d8bfadb5be7068352ce8b6bf35cd4fb070fc9d337b06ca8d241645d9f8b978ce71263b89ea60a855567c7de7 SHA512 b938a62b5691e886903e0f876b4f2a387b1f3311cd179112202cfce12684bebeed9090ae9fcfafbab859162b6c992fa33481a2e9462b5b50dd59e2f9e10f1000
 DIST tucnak-4.30.tar.gz 3594691 BLAKE2B 41ea3469ebd7ab4a50805c2806289c78ec4fe2ab28b3fea0301e486c9b9232a86b3c93ed26dc1ffc3dc531b69acb847f5cfe66b48ea2579d702d0a5427387d79 SHA512 dd840295c69c2a42ab2ac803444684e06bbf4f47623f9200832f2600bf4540817e2e375ffd1e1dcb6bb57743991396eea7f99a79182397d22dcb78adcf98f500
-EBUILD tucnak-4.28.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
-EBUILD tucnak-4.29.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
-EBUILD tucnak-4.30.ebuild 1969 BLAKE2B 90669ac9d023d134c569a8af9d18b402956b581c4e6945cfc63267bfa2ec352c300375f0e5fe2d43e9b3adc67119aec68bba3cff11c7046a7f046ea20d6561fb SHA512 2f062c4a1074d714adc1921ad0b38f4fe157c3d2fb1043a6553cff07ec67860a9c98c46d802f64d729b9cbc874b7f4f1e249b973ca94196ec6dfb75da6ae8917
+EBUILD tucnak-4.30.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.28.ebuild b/media-radio/tucnak/tucnak-4.28.ebuild
deleted file mode 100644
index 9d0aeaa30bb1..000000000000
--- a/media-radio/tucnak/tucnak-4.28.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
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.29.ebuild b/media-radio/tucnak/tucnak-4.29.ebuild
deleted file mode 100644
index 74d1b35b9c84..000000000000
--- a/media-radio/tucnak/tucnak-4.29.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
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.30.ebuild b/media-radio/tucnak/tucnak-4.30.ebuild
index 489376d7f13d..9d0aeaa30bb1 100644
--- a/media-radio/tucnak/tucnak-4.30.ebuild
+++ b/media-radio/tucnak/tucnak-4.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index b64e4a5531d4..69f71a11f5a3 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,4 +1,6 @@
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
+DIST xlog-2.0.23.tar.gz 11407743 BLAKE2B 82828d043006b7f73ee32bae5b0beb261684aa70a2c556af34a8a269b790ad76e24d40a7ddb5c9b5cfd74ac7feb510c19deacc1b3dea647594d1f5f8c1293ca4 SHA512 1c235e6a49c7d6dd049aade4a0c34ffed61c211ea31c0f8d4d62db1a03b2d1e025ffd2fd9ae42b639113485d36e1ee2e40439f74e1971eb99847f4564b21bd10
 EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
+EBUILD xlog-2.0.23.ebuild 1890 BLAKE2B 4eee0c65853210997bd9b01b5bee76103ad7bf6b9623ddaeb3cae3f9e5284310be60cd252c25acb62d73ae2115e136ab8c34b6f2382086dc9197b1048253e522 SHA512 7f451d6585b14d8f6f9488a66491d73c849a7363e80c7388d2d41e5aa84e81c7690eb233ac0b7b9ef515f4febe621430d78a37308a2d57d34fa3876222ed2bda
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xlog/xlog-2.0.23.ebuild b/media-radio/xlog/xlog-2.0.23.ebuild
new file mode 100644
index 000000000000..6a50652eae61
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.23.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg-utils
+MY_P=${P/_}
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="https://www.nongnu.org/xlog"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib:=
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	media-libs/libpng:0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS data/doc/THANKS NEWS README )
+
+src_prepare() {
+	eapply_user
+	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+
+	# Drop -Werror
+	sed -i -e "s:-Werror::g" configure.ac || die
+	# fix underlinking
+	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
+	eautoconf
+
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/hamlib-utils.c || die
+	fi
+
+	# Fix broken png files<<
+	einfo "Fixing broken png files."
+	pushd "${S}"/data/doc/manual/output/html
+	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
+		pngfix -q --out=out.png ${png}
+		mv -f out.png "${png}" || die
+	done
+	popd
+	einfo "done ..."
+
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# build system makes it complicate to inhibit updating desktop
+	# database, so just remove the offending file
+	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
+	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 00bc5201c7b4..4780d6a3c4de 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 73e9d49fa4b0..46b2480352cc 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r2.ebuild 1846 BLAKE2B 13f0637506f6d8807718d471a98212fe85ae5aae10b0eb01abdcbe46e876ff5939624c9f6157407e4f46820a23e330b5ec514bf8e40037e89e3afb45fa281395 SHA512 8ae9e62718633a189bee5ec4be418f7bf76f8c24ca95bea0abbbb5ec50783eed0aaecaf65cc4c87cc18e7da6b0977f59e52071d26c33aab48b48e0a4a853248a
+EBUILD abcde-2.9.3-r2.ebuild 1853 BLAKE2B 6564722302779ea37fda3cae939e62f3cc921415e157993a78fb64c6a55e9ff473ce6d385ef5c269896bdbde3fbcf4f1db3e795cf599d9382befdde7063c2e0c SHA512 d8063567c0ed0f0007456788eebc21db9d349529126af5da110dbedc84494a5e6ef54a9b8cbaad3802e328493f31239f4ecfc0ba58df682526ef15483a1a5194
 MISC metadata.xml 688 BLAKE2B 1b7fa0f469d0875c859efba67704f3f879a4aacdf1265e4e420ac9061d90233f60720fe9ff7c8af1d192c7c164225388db4ceaefec047c309cbe319f54d33ca4 SHA512 494ec16cb838014916286f73e1fe215afbf35ee420bd5b5451f4e53e6a0b71a168cfee109c489752ae2a39668fca07ceb2b8127f5fdfe17a141472d7f2187ada
diff --git a/media-sound/abcde/abcde-2.9.3-r2.ebuild b/media-sound/abcde/abcde-2.9.3-r2.ebuild
index 149dd9258360..146aa1487595 100644
--- a/media-sound/abcde/abcde-2.9.3-r2.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 # Enable MP3 related flags by default
 IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
 
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index f90d6378fdad..4beecd73fb15 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,4 +1,4 @@
 AUX apetag-1.12-py3.patch 3784 BLAKE2B 039a42333dd48c0b2f3562411a53be1c793b5c19b9c9afc711e16a4b8a959fdc7a2fa8564c71eb99be403d596700a98e28529a39a45bffbd3315f42571085255 SHA512 325defd7e7114406185af0547d2d53cbf7a92a365016d9e7a08d12dec14fb5b364ac1051c86db67ce2e37066db83b9a7c9995cd7a6e1fd3b1b04a39d22651f8e
 DIST apetag.1.12.tar.gz 29942 BLAKE2B 866f0ed90b9bcdbed3c0a35729327058806478d1c17a7f88528809b1480a2a55f4665ce809737010cc3b642b6ed99ec22db84b7b6ec4b14f73974274f3e31bc5 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887
-EBUILD apetag-1.12-r3.ebuild 1042 BLAKE2B 77f6457bbc746d44b950b01ac362f0c86513a3214ed96960ddb9e607f1b2fc4bb548d5af17c72a5014ddf5e0087c19a98493b474952c0e2b1d621ab34a63b4c8 SHA512 59aaa8c3f3981e8bdcba1ce419162f0d45f57a5c4b7b1f54902fd79916426ef67db41e9e753f360aadb209dba950651a77f43eb853dd9969742c62ad88175b33
+EBUILD apetag-1.12-r3.ebuild 1047 BLAKE2B f6282d6be56fc642cac71f6e33554c7d4c5d698737b25485b5b37ab4ab8ccebe3c300e6e981bbbcabfe20ed32fb87b5638403ab14bb5bc559c7504b0d09347df SHA512 3e4e6438dd7ece831711e9516c1f8f173d486bf8e59efd0ccad1c356121fdb366c7c59a65c576e62a52fbdec577f8e1ddbfdfd935cc97d82ee17b1de128fca1c
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/apetag/apetag-1.12-r3.ebuild b/media-sound/apetag/apetag-1.12-r3.ebuild
index b6cf8e73f54c..d34b04e2b1aa 100644
--- a/media-sound/apetag/apetag-1.12-r3.ebuild
+++ b/media-sound/apetag/apetag-1.12-r3.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 python-single-r1 toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
index 8aec26524336..9bde5c002eb8 100644
--- a/media-sound/cd-discid/Manifest
+++ b/media-sound/cd-discid/Manifest
@@ -1,3 +1,3 @@
 DIST cd-discid-1.4.tar.gz 12487 BLAKE2B ee20afdefaec407dd043b85fa6bf3cc8c9fdbbb1c63793161126935d75e148d65f59723bc8a4dfa95322db0fac3eaa7ab46c7ee0b927a9cc8dca9ce3a0ac1715 SHA512 f601ea8b7ad73e22ebafc22c392f120fe2e5ed2e275f8c53aab92b27ca1738b9f0c53dd5ed7a012915fe8f1f30fd2356f973895e2dbfe649937930e69faa0c29
-EBUILD cd-discid-1.4.ebuild 577 BLAKE2B 09ddcac0f177b7e7481e191fa332f6a44b6cf66934fd07397c4f910279a07ac7abbdf7c14324237ac649fbf88fefe92bd4bdf2f18f500add447dbe1c29b979fd SHA512 913f0727c1854e58c1d6f288a188e156f4351c9f6fb426f6a9d7007ab5943b4aece86f99981de6d6d03da420e453bae971bc305f4b8c04f55600c80251ae9140
+EBUILD cd-discid-1.4.ebuild 581 BLAKE2B 02936510ad26c36f6706c47ab3631715d8ea8c70645d980be856639176f122e0edd5d29934cf0c2f857bb25300747cfca3fb33ee96f184bc5e865ba8ae798c71 SHA512 aff795ea7ba10a3150bcd8d5d0556ee1cced81d9e6ee6bdd0f620c9ebce80e2e9ccb9d45d9d138ee834d05795aa4f651baa7f37680ca30f5982acf786b9e4aa1
 MISC metadata.xml 333 BLAKE2B 4b1a16625fc5d8ff1b1b5cbbbb5bc82ea1ea6179368d7cbd37fa9290681940de6472b7606f4379b472a3bfdcbdb0bd39db860aa4273eb7cf70837f0fb46629bd SHA512 23f14f1ea66d479f3c5821d177f8fc3c9253a172f52f195928e7344efa2abbcf4a950266367a8073f648dd3b50a7e40960e6b9a9a81faf383c98fb42d00bf861
diff --git a/media-sound/cd-discid/cd-discid-1.4.ebuild b/media-sound/cd-discid/cd-discid-1.4.ebuild
index 66f0a297ba05..4b4a01881fba 100644
--- a/media-sound/cd-discid/cd-discid-1.4.ebuild
+++ b/media-sound/cd-discid/cd-discid-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv x86"
 
 S=${WORKDIR}/${PN}-upstream-${PV}
 
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 42c84b03666c..bed2aaf73ca9 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -2,7 +2,7 @@ AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7e
 DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
 DIST deadbeef-1.8.7.tar.bz2 5029039 BLAKE2B f6ae0d664553435fca566593d715f8f9fab13711bb0e0488c80b9c7ff88a28425d1e3de2ee4c57b87722705c5ede53e0390b81cdbe6ce804d781dfe934dc21e9 SHA512 49a9610f8aa8d9853cd4f9a38d103f9a902993a5ae1990937a3ac5a14a4f8533f4233002893875aedf45f737d1a95c7cea189c61d6387bd8be7f3535d60c96eb
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
-EBUILD deadbeef-1.8.4.ebuild 3649 BLAKE2B efcbfeafd13306dfded91d5218592b7a07374a7f43e65b85fd32bca7d51f13b9fbde9e9cc955c6506258ac8fdcb7633ef747a932bd4d171aea4c589fc21ef8bf SHA512 3fac53f58ebab5797c40e824a7229b54c009ba0a6c082b547e38d06dd1233c6724b09b5f2e16db1f5cc898afd03585a60a5f9171d08c7c70c38d721e0e6854d0
-EBUILD deadbeef-1.8.7-r1.ebuild 4008 BLAKE2B b395224370b7e2161772565901bf439d8482910aa190a289092ceb9e93c45b04abc0e922155f96f4918f23b866047d078f6a70d0716dc974b676fe4c779f1bb4 SHA512 f89ec2e45a8997c51286c9db11b61ea2b384a7cb6ebc34f02440e3348f3c7a43dd1a00cd8c7ded9ea9a631b8ae66cc12fbaa22a09c1df228cc632c40bafe1ca8
-EBUILD deadbeef-1.8.8.ebuild 4008 BLAKE2B b395224370b7e2161772565901bf439d8482910aa190a289092ceb9e93c45b04abc0e922155f96f4918f23b866047d078f6a70d0716dc974b676fe4c779f1bb4 SHA512 f89ec2e45a8997c51286c9db11b61ea2b384a7cb6ebc34f02440e3348f3c7a43dd1a00cd8c7ded9ea9a631b8ae66cc12fbaa22a09c1df228cc632c40bafe1ca8
+EBUILD deadbeef-1.8.4-r1.ebuild 3651 BLAKE2B 729c8fe81510da3eec6fa9e0912caaa57c4e7b7e931860122e2a3b27f8ebcc41b0f7fc3ea455233f175df5ee1f169936db45eb835be3468f124c780206c96fb3 SHA512 d5ab123e4c5addf7e86b40fb9c83fdb287421204ff2db3895a4174b0ed042435845ac42be4446636496cf1f87a965a86f2aabb814564d74bc88d4ca3da45dd54
+EBUILD deadbeef-1.8.7-r2.ebuild 4010 BLAKE2B 658678730c6c67b3887628f70d19148d35b865d0295eaa67104c369db8ea0dfd896c5c604df150c410e4b2168a6bae34bbfa8aafca883f17702acc305156981e SHA512 01311fe0fe57a9c2ba841d210e4d66c63fff1638ed2f0fff06e6b3eb6b67d9a1916b0595dcc986fc172c3db61bdd8d84c3158905b5aa0371490cc5ed6e897263
+EBUILD deadbeef-1.8.8-r1.ebuild 4010 BLAKE2B 658678730c6c67b3887628f70d19148d35b865d0295eaa67104c369db8ea0dfd896c5c604df150c410e4b2168a6bae34bbfa8aafca883f17702acc305156981e SHA512 01311fe0fe57a9c2ba841d210e4d66c63fff1638ed2f0fff06e6b3eb6b67d9a1916b0595dcc986fc172c3db61bdd8d84c3158905b5aa0371490cc5ed6e897263
 MISC metadata.xml 833 BLAKE2B e76e4b70c70cfb6e3894d103a1f3489962c111fa00b60c45844de1dc6138b7e63054f58de383ac4acf7dc53804efb055cf00af2b7d2f9c323b8a6e6a520e34cc SHA512 343b5ae6082c1ca2f0cee8ed933138a43893a51356f39451b6a692d56afe5ca1d5d93675bce4e38d1789abebba537a44e6bdd2d23b87cebdde449e7243511504
diff --git a/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..723b32dae0e8
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools plocale xdg
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="https://github.com/DeaDBeeF-Player/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? ( media-libs/imlib2[jpeg,png] )
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? ( sys-apps/dbus )
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-sc68"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-imlib2)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/deadbeef/deadbeef-1.8.4.ebuild b/media-sound/deadbeef/deadbeef-1.8.4.ebuild
deleted file mode 100644
index 1e39062b99cb..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools plocale xdg
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="https://github.com/DeaDBeeF-Player/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:0=
-	dev-libs/jansson
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:0=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:0=
-	)
-	cover? ( media-libs/imlib2[jpeg,png] )
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? ( sys-apps/dbus )
-	opus? ( media-libs/opusfile	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-sc68"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
deleted file mode 100644
index 4c8c5def5bcc..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:0=
-	dev-libs/jansson
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:0=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:0=
-	)
-	cover? ( media-libs/imlib2[jpeg,png] )
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-		dev-libs/libdispatch
-	)
-	opus? ( media-libs/opusfile	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	lastfm? ( dev-libs/libdispatch )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-sc68"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild b/media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild
new file mode 100644
index 000000000000..df7525b2b282
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg flag-o-matic plocale
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? ( media-libs/imlib2[jpeg,png] )
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+		dev-libs/libdispatch
+	)
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	lastfm? ( dev-libs/libdispatch )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-sc68"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-imlib2)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild
new file mode 100644
index 000000000000..df7525b2b282
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg flag-o-matic plocale
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? ( media-libs/imlib2[jpeg,png] )
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+		dev-libs/libdispatch
+	)
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	lastfm? ( dev-libs/libdispatch )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-sc68"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-imlib2)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/deadbeef/deadbeef-1.8.8.ebuild b/media-sound/deadbeef/deadbeef-1.8.8.ebuild
deleted file mode 100644
index 4c8c5def5bcc..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.8.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:0=
-	dev-libs/jansson
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:0=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:0=
-	)
-	cover? ( media-libs/imlib2[jpeg,png] )
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-		dev-libs/libdispatch
-	)
-	opus? ( media-libs/opusfile	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	lastfm? ( dev-libs/libdispatch )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-sc68"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index e6ab118cf0f3..4d9f3b299184 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,6 +1,9 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 AUX din-50.2-gcc11-rename-identifier.patch 1207 BLAKE2B 336f06a9e4baf9e7dcb44c86c40adef61caa2ea231d695e59720e600d2fba9c7f788be63c18b135ebefcfda879ea067b633066c80a7f9b8bb501c0c31bbbe16f SHA512 2496ac4026b70f0c3b00adcf3b295ddb77c25e10f436b0222432536f0a5d3efd1d5a8df4d5ba15643c7c29323e2d25dcd197649815e90c11e19fb28dd6a8eedc
+AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
 DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
+DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
 EBUILD din-50.2.ebuild 1145 BLAKE2B ad96be1ff43ee274ffc8d7605024888952ea6f2cdf9dc8c11dd27b6192d065bf7e4e66cfeff4abdcc2514934ebe55795a33f185f59c81f147e95540a21edba8e SHA512 1050c39d47fbf190f35f410220a5c38f637c32d7bda5fd33efb896df8fc2ee2348a52f084b3f8261b912a7869008fb1a13fb0f901d9c9f13e26ba3baf285f34e
+EBUILD din-51.1.1.ebuild 1085 BLAKE2B 7daf285ccbd334752a8ce0fb3d8799c3fd987aa6d4cd0d660674494e65d2a5aed96d4c71a96ee6e1c678d45d8f50f5beb3a0da62a8cdfb3dad3ea9be2ba04cac SHA512 fa516a25c9ba70aedb1f214b474fad340f0ff3865089b7b37767ca02222ab1be6fd58b54878c4a931a00ee323501a14cdf878c3b7dfc0162b694e9ba097b1e12
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-51.1.1.ebuild b/media-sound/din/din-51.1.1.ebuild
new file mode 100644
index 000000000000..4c4933184e27
--- /dev/null
+++ b/media-sound/din/din-51.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/files/din-51.1.1-makefile.patch b/media-sound/din/files/din-51.1.1-makefile.patch
new file mode 100644
index 000000000000..9909080a9b54
--- /dev/null
+++ b/media-sound/din/files/din-51.1.1-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 377dc4c..b086c0c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index c9420db7923f..0f24512aef6b 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r2.ebuild 1787 BLAKE2B 979c11819e68541c9f9c3b97ecd8863324104854679378e29be82ba2f973a5f25f4ac5c740fe59d1dbba038e37af2b65232940a7cb80c9bc32c8639fb61134c3 SHA512 9b0a902c7fbc2c069eca6f4c2930a931fd88fb3220a46b0ca41112903351d1ef325c77b559c802f5aad76cc8940f67babc743cd0ecda7ccbfdbdb4eaab552b14
+EBUILD easytag-2.4.3-r2.ebuild 1794 BLAKE2B 90edb37db9eeae374e6a471ee17ecad9ffef3dd4ee233f4c31a536e901ff754cd3c45fbf428793ba36774f287f7d86b8e02317d0f46d7f28149f1e20ac777394 SHA512 fcca520f2fece17cc8dc134f0cf9730812756c578a5c1f3ccf68d504fa8683167a7828b2adf12d6b41e20adbf17d82d58f8bd84430232b2d6c57f75e489a54c2
 MISC metadata.xml 515 BLAKE2B 60cb9bf9c733779b208136aaabcbe19173ae5c0615d1d6b5266a5aabe7f90d21e0e7b1191eb1709c3350d312da6d5d1635f40c6b4e2572d5a57fb33d5144461d SHA512 0ff15896c4394587bff993f1a77d1b72b413bcc03f788d070b000097a7527cdb30fc8637513a457c32e592caa0bb1076043c099b2ae5172360274ca063cd5530
diff --git a/media-sound/easytag/easytag-2.4.3-r2.ebuild b/media-sound/easytag/easytag-2.4.3-r2.ebuild
index 04dd96afa0ac..bfadc0488b19 100644
--- a/media-sound/easytag/easytag-2.4.3-r2.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/id3/Manifest b/media-sound/id3/Manifest
index b9d13fe288c8..3e24f3ff1689 100644
--- a/media-sound/id3/Manifest
+++ b/media-sound/id3/Manifest
@@ -1,3 +1,3 @@
 DIST id3-0.15.tar.gz 12871 BLAKE2B 4d4b8edfbebdb79b0528817f183a76ef05f7e4f051f366bcc327e9481e39eca422cc221f4d272dea57d184089e696aeeab722839e1c2cbb6e3664656161fc0bc SHA512 b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0
-EBUILD id3-0.15-r1.ebuild 540 BLAKE2B 7f06c9a0afcd6da19b0104fe8d47e0bb2a22ef579ff9e7aecefe13d438899a15aca809bbb77512fec070bfd625865a2b89de3ecaf617912fdcd81ae72346d7be SHA512 2ea6bfea35395edc7863c2fcdba3ba6aeca6f2b7a9841f9169f51838594404874bb582a521355f72788211672251d23f285363820c9412d66e6d8ec861954bfe
+EBUILD id3-0.15-r1.ebuild 544 BLAKE2B 3329999014ca3fb41cc7b2f80f37672a81448e5f90eb95e026db8ae21858da813789f7eb50c4d0d78be704c0000793885e3733227f7413f20c5e7f6135e93bdf SHA512 a4d2c000f97034a4229a6caa397f1d562a2daa57986954290be8e6f70299ce0f4e1f286f6ac0d54071a9bf05f295b190fdacffc96fad48523505ac782b485a35
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/id3/id3-0.15-r1.ebuild b/media-sound/id3/id3-0.15-r1.ebuild
index c918d1331c9c..3cdb64eae22d 100644
--- a/media-sound/id3/id3-0.15-r1.ebuild
+++ b/media-sound/id3/id3-0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index bccb73c7b25c..2bf64e98cd85 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,3 +1,3 @@
 DIST id3v2-0.1.12.tar.gz 121476 BLAKE2B 421e95211048a6e17559736aadee2b40b4c817373f83790a23b4206aa2715ef8473bc9ae83dad480b1edac29cfe20cb8686f2d78773a2929c5f9c97bf4e718ea SHA512 f9c74ab6ffbb50ab7ae7af64dcde78a0766bcbf71308d4c9fb480543b5790e2690ae096d6a2ecaffb01b7497a18841b5235500177cf5eaa8e668cf443abc726a
-EBUILD id3v2-0.1.12-r1.ebuild 534 BLAKE2B 05444ad82510a078adda3f363065bbd02303a4dd545fa9e401ca1e6a4e311b53078ed40502b68dd5ff10684187ac82fe37655b28400df28ed9972fb6fc0f998e SHA512 663448b5e863594d112e0c451142c1dfb9a05e2f64d5b58ce683fb18ffd3cbae1e0f84d2643b2dadfc909ff8369a36b7d7618ad607c1c6a1608457ee9162871e
+EBUILD id3v2-0.1.12-r1.ebuild 541 BLAKE2B 2bb4a947cdfcb00af2c1992acccb5b1bbbd4f131f993bde31bca50994d3b1282ede44ed25f1ecc052c1f3fd07e34c67c173990b2de573dca8490bb206da865f9 SHA512 2d31517cbc438ba34925b6e75472bd7836ea00e83277bed7bb2fdb40cc33e7020d316257edb44f61d3e42ece33c382682cdfe86fa91691f35db410f0b4a71251
 MISC metadata.xml 329 BLAKE2B e5847e8db316e1593a6a796ad347af24dfb87fc8827404e8a8bb752ba28ec8829232d5dbbca348228b4351732bf0999288739b1a556a5cebb4dd5833edb03e13 SHA512 af384309c0d5c844d6e5ce8a36dc1589e9b91e676c077e3652541313e0f9a349da669d3ad4da4d05d13821e3cb77c62b5dab69182a3e7f73d04055ce6e1acf3e
diff --git a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
index 40c4ac809079..5b75ae24249b 100644
--- a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86"
 
 DEPEND="media-libs/id3lib"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index aebd285e7830..b721b106ad34 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,5 +2,5 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1431 BLAKE2B a660310d218ab64b1e25be4047c45b4d33f466a418c1c6ccbeaaf7b2d892cec52f08a80a72ef333c4b50fb05b7802360f1d12eb7967edcf0b94ae3424f58f7b3 SHA512 d2c34553cefe1b326b7fc4ba68dc92dfafa783ebd79dcb0d3ad5ffdc899402a95ae256915d2f3b02ffb352710a5f80ae1d0b8cf5596f150e4365c8cf55138c0d
+EBUILD mac-4.11.4.5.7-r1.ebuild 1438 BLAKE2B d0e2d2ea8ff1c43373605d23789267e9281c3a0707c61b8011ec94e4d5e1b76a4ed6dcd1f7a1b5dc22e4941a59679bce8d93053618b4ffeead1999900381654e SHA512 6ec7e79ee51b166cb70dd2b30abfa38381aa38e10cc79c55ac13fd25a4fc7cd819cdba8667ded36404246b7776b4eb1747bb12e365520be39afc5b2cd3115d2d
 MISC metadata.xml 374 BLAKE2B ac05d2add0cd7ac5956aad2f5a7bc031880ac86b1ba62266c3d5afcfa769e687d974cf00e1e1d4c3b50964b5a05c193f4a033eabe0ec0a6d626018aedf32be00 SHA512 586664bdcd30ef7b414740d264e143511f39411a33b845ce0f39503dd2215e501fba07c408ea777472ede967e91001617ac91dd9acb303ad8757bcabbba17b0e
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 121c906229be..aa5c9ee4ee77 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.ta
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index cf4b21cba628..19daadaae923 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.2-CVE-2019-18359-plus.patch 6742 BLAKE2B 1216085064f712751ad9c7739a5d7a3ae9ca258ce41860a177756005b911371b6784a6ee4b7b68e829e5e1b4eede86287abd048cca01db99c53aa1ac9ff94c8f SHA512 b795167c594b106b8f6336d4c975bb73812a4fbcd5e16cfcedfaeff0c291f6ea01e62f20318d5107e62c9c42e843e8cd618745acdd17fd35c4e9a5052d85227e
 DIST mp3gain-1_6_2-src.zip 71246 BLAKE2B 5172c2103bb2267bf819f36180e9cd7a9d57df6f7ddc29900e9063f97c4513972053bb0c3f1f69f7ddd12ec0cf4251e93e1b6920389a8246bfdd5650176a90d2 SHA512 ec9de6c755120480ccb72b34a0042aea7546ef923090ab04e420d5b189523b4504e29952a3d695d3c42c74348f5c3c9123ff090bcc671e43375711e085d67480
-EBUILD mp3gain-1.6.2.ebuild 672 BLAKE2B c870f64b39a698b7b46e4547108ddaa662292ef928a9fef21c5d6b3635421bb80e2084f5bf193301a31f09168f596ec2b31d6c29862c943c81aa5f6e8162d21d SHA512 7d34ba3237d51c7b55653d5f7f797d122c41992c176b5efdb7b8f72aef275bf371b14cc8ea4d684d749f7e29357aa9b2788129fc92fb5e67966371059df14f21
+EBUILD mp3gain-1.6.2.ebuild 679 BLAKE2B 1f504f0177b2c31bf51c5fd6fde9a3afefe360ea38ac3817298f90012d9b66697987b94e1d92907fb256e21de3292728379d99592594bfcd0e520596966f9159 SHA512 b43ae1d0fc00f1823e169961f659ebb95fafd1cde74b0c2e7609cb06226fa4b0da3ad79fc3df670514689da11a424914795ffb2316368f85876f624525eb3e51
 MISC metadata.xml 341 BLAKE2B c317d832e3c824113e351947dc29f61ac1c29c4bf37be664575d83c90b9c76190e0f7285175ed59abaebc64837c28a30f5282fa17d2cd3553e4c51c77a94e93f SHA512 6f3957a31217ea3ba27652b0a1ca4b10aeb83c69ccddd8c34ed1d545c445b766e97e7a2fb265c5ed2e9dc56a5d29428aa28f7deb39788362d5b377e73385ca5f
diff --git a/media-sound/mp3gain/mp3gain-1.6.2.ebuild b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
index 71da3cd40b67..77b53469929c 100644
--- a/media-sound/mp3gain/mp3gain-1.6.2.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="media-sound/mpg123"
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
index 468b63cbf3ca..fd65655e6a2d 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -1,5 +1,5 @@
 AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 BLAKE2B 4a03c449e218300328297d30229b26b425e65ab4f7a05725bea78c19ea3e6556bbf3dd9dacf1c73c064a6912120772754e65aee00af8a2f016b9bb2750b2ca2b SHA512 bf8b4fdd3ba9629cefba6eecc3db21b3fe9129429a8df1fcc7794f3eb6e802f1939d0ec23863bf91edecd94651a70f798d6888f0b94b39664b53acf68b737967
 DIST normalize-0.7.7-m4.patch.gz 5078 BLAKE2B 6bb0979c1a94b7bd52ea01cfcfbd715772fb5cd92c46124a43ff6982cc0e369c86a43c836354ea10e1f613274cb58afa4dad6c1d6656393edadc1b7e029f35a8 SHA512 a06d3a51557a0c54e1ff2d0eaec0a8ad51b0faf1457393f2c9207fd428d58e21ecbcbfbab59a15e9fcc59d6ec2dbf91fe78802a67d533a1f90cc6e46205d39f7
 DIST normalize-0.7.7.tar.bz2 388777 BLAKE2B 3ac7be8b86ada8899661d7012d7a60e4a41fcf2c510c302069d1b9ab54efd50e7e042fd5c1365bed1c28fe15b6bc804e605ea7b5f1fd7f96047a70c335275324 SHA512 5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4
-EBUILD normalize-0.7.7-r1.ebuild 848 BLAKE2B 043dbde73b794036107ed29cdf79de76d1f51e253632c1a79c0ca772a1b27e5756227b5c9058df33aba3d28d7d4b33f221e5599439645a233a80dcad2465d11c SHA512 8531086804bff285491be625b784149faead26e22579e591cdc23056d78dcf3a767e243ce22470a64008e95a9d771ea83022bf6f29cc96303dba565b40736045
+EBUILD normalize-0.7.7-r1.ebuild 855 BLAKE2B b2679bf48d017f0be3c470b3f42d89de2f7b6e589a32d6dd8b0565a45c1b310ad4808d543779787bc07367637633e577bd5ca255650c2102d3bd4baff27c572b SHA512 4a48d44886274d7b6dd4ddcde3488e836765840fb001340cc0fad985711c18e7d82ea2e8e6ea33ef3a57cfa84c65c45957e2e24305139e634b9d7c6cfd4dee61
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
index dbc8ff6009f1..07f55a40e1c2 100644
--- a/media-sound/normalize/normalize-0.7.7-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 IUSE="audiofile mad nls"
 
 RDEPEND="
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 2a7bf5aa693b..cc082df5a099 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,3 +1,3 @@
 DIST opus-tools-0.2.tar.gz 457680 BLAKE2B c5896a6303aa1e1626097622e671bc96fd292a0f0c40a56410ef1f7699f8d18540d71e70f1cace6a91bb430886f1ddb07ba08503bdf82aa81758793bcea5b530 SHA512 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
-EBUILD opus-tools-0.2.ebuild 1010 BLAKE2B 48035b227cbb485d87bb813f60f79b2035b8a6fc84297af875df6d6032c96fdbf2d0069194d69c56f8e7a78f4d45e71c8e2f69c690042140bee579958c294d32 SHA512 714738befca89da16bf502e7ffb3995be5b7135679b23f7d2539b421e55ce730df86accabed41e1faf09287125bb06c9fd782424f7e3f08968c2bbb32e04038f
+EBUILD opus-tools-0.2.ebuild 1017 BLAKE2B 8a03257b066c8132539d55e85b5ae1a3f885f0ae522c8d7b487d6b362505df25ceba717d0a43c01d1dc6bd0a9806410789514980e151e8b64cdf28ed3f88a3f5 SHA512 d3983e0b325103ee6216b7a0f8caea78d0598512b926e10086d9f9142f3a9a589b1f618c12a5ed499a460fd0c812d0f9cd736feca4363b155c2193a73d532aa1
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index ee26eaf5e0db..a52b035b9822 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="flac"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 009d8adc375c..5ec892f185e4 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
 DIST pavucontrol-qt-0.17.0.tar.xz 104120 BLAKE2B 13cfd361d134a8fb79eb6bf20ab2e2755b998e4c46105efb0e7d29a171262d795b6f77629c4b066b0d786cf1bd60784d0d7155c4b77d23ff2a0a148f3f7764a5 SHA512 b6c77fc78c62051c8c0484edb09d1e2a347fc30ae8b65f1e4b3d279499abd47aeaf19c2cb3037871ef8885a5bc787f3d0307d7c0aa0699deaba3129501fb9a3a
-EBUILD pavucontrol-qt-0.16.0.ebuild 704 BLAKE2B 75fa0c724518984b4cc80a3f8caacfcd4eb134a45accd83ac1e1b4e4f1829af9937667c358361a58882d2d8731accf530f492142bf337ee14c5896fd8964d6f4 SHA512 1e563090713059c44963b63e05293d836f363e931185c1b32b8863ec09c04129f666b1df3f810d3a974de43d3e61535c9ebcceea7fa2624ba2729e4ae05679e9
 EBUILD pavucontrol-qt-0.17.0.ebuild 671 BLAKE2B 85a5d3d4810e3580d35e16143d9a901f51d0c9f8f0f3bbba205e1430f0e3df908113b24b583ad07458a3cb9bab622ee66ef27e031e0de8c100d436db3a1618aa SHA512 56b254b486e007b0c663b2bbcc49f710e4226e4ddbf71261c9e0b2ccc16131836a460e4d264c4d0f0c98e3de5f2f944f12ed60dbd80ad37056b4f5172dbfcf2b
 MISC metadata.xml 321 BLAKE2B b7f545670cc272a1ae2adc3042c6e3aadd1c290cd0c5ae53e7b9a07dace88a7ae388c8aab67547272f9196fb25a36dcbf27e33004d39a56923c288bee9cea327 SHA512 97d8ab3268bbd28ad78fd4e1667a4e5e5920b611adc9b175c45f670afeb99d7a88101ce53aa5594436ad67e32b94501f90b97ba29c312b6f3e90c14af1035a6e
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
deleted file mode 100644
index 8fabe2c80f14..000000000000
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt GUI Pulseaudio Mixer"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	media-sound/pulseaudio[glib]
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index ad03382f6dde..79c660a5f7bf 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,7 +1,5 @@
 AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac
-DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225
 DIST picard-2.6.3.tar.gz 4320046 BLAKE2B ce308440ed4c6297128a5470b7bdced50fb22e62995c26670339ff71c70d610fc0c4ea8433f9dbacb197b710b8100de171817df604d76986596391d029b3c20f SHA512 71bdeb4777a0d996ac0093edefc448a348aa72e657ec639331e67257c47c389993d2715ccebf715458c3b606051154586d63b22b3cebd541d8b2da5e96a833b5
-EBUILD picard-2.6.2.ebuild 1652 BLAKE2B 77a92058a85fba2fa76637a7df2caa92937b29d83663212813a670d47045b3b84b363b7f48d2f3f0147bc12965708f451cb7ce3e6167864524cee37a35633d68 SHA512 7868878920aa000779f26bbf97b30123179bda3dec0aa62e998e0b9272009c8f4ac5713414fa78f6c3900a1d99fa9877d5654044d7fee252b7e302702c10e555
-EBUILD picard-2.6.3.ebuild 1513 BLAKE2B 1d080555f69c40e026f13bd5373f0c7d916f8de725fb42bff41f7beee7c86a402d738c757453c39f24f7d241df662da4acd5f22132fb16687166b9b76027b2ab SHA512 25e7d5eab89bd32e5baf06e6c1a3a8ab893da291e3752316655ba21d2a0a44f0c3497abe6baa16cfffbbec36c58dd1475aa24f81b412e8b33ba689d633d47339
+EBUILD picard-2.6.3.ebuild 1511 BLAKE2B b1171f075b1be925db317d34edf8dbc5e2c1e8b635f8c3872ab4087b9fef18d29b611dd28ddb8d0fd1ddee2312c259cd0890664c6a4c7a553c117730e888820e SHA512 defd6e9e132bee27d0e9cd904c11cd57c3a3a16c255693957e7174dd81206bab3f7eff196b5b52870b5c2c23781643970e8e66de438255a0ee428671faa8c9d4
 EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
deleted file mode 100644
index 69225481a3ad..000000000000
--- a/media-sound/picard/picard-2.6.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "If you are upgrading Picard and it does not start, try removing"
-		elog "Picard's settings:"
-		elog "        rm ~/.config/MusicBrainz/Picard.conf"
-	fi
-}
diff --git a/media-sound/picard/picard-2.6.3.ebuild b/media-sound/picard/picard-2.6.3.ebuild
index 2c7f465e7441..ea73dd432539 100644
--- a/media-sound/picard/picard-2.6.3.ebuild
+++ b/media-sound/picard/picard-2.6.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 38b1b175f308..bf0ed0e5acf2 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -5,5 +5,5 @@ AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-daemon-15.0.ebuild 9719 BLAKE2B 9d8c5bd0647218f6c81162e8627af20b8b8adc1c7106ad40f2bb288449aa03bb4c52f1911d7b8e977118afdcf748216d9759bbcfd1f1f00281db866e36360621 SHA512 5667265fb99022b342340f5e407bc6833c86df20f41f739be746fb36b74680c9e20fad2101499d844611ede393f56481fdcf8d361feb8d3404cb293a6ca25926
+EBUILD pulseaudio-daemon-15.0.ebuild 9725 BLAKE2B 1a3a670ff5323aed60c01c84dbdc68400f3cad7b56572a6ad8d77692bc94191da2aebc163446c125edf04ae83f54fe7d89591ba8f6102c87ed7f7777d9a5b9ba SHA512 ce49d520414e54ec8ef27dc7de63cd176a0f701c73f374187026aca9a5e451069a36d101d30bd680e573db266eab667bb3b5cc02a797c1dd887d815c77bafd35
 MISC metadata.xml 2745 BLAKE2B b8ff0973c3b5bdee1a05c598a7070e67ad385bfb32f51acaf80081ce9607d2bfb6a99233be9df31409dbac6a85a48f32f763f71be3ab960090ba104a613094a0 SHA512 42872d8b934e8216c30c525072977df9abc9e9487ba7de8d4a1df9343236ebb735bcb89109cd97cc0e7ddf0261370aa605aee8cdb8f5b457e26904b023a1990c
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
index 3d1ba6413c14..b8bc3c50f0e5 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
@@ -58,7 +58,7 @@ REQUIRED_USE="
 # - media-libs/speexdsp is providing echo canceller implementation and used in resampler
 # TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[glib?,systemd?]
+	>=media-libs/libpulse-${PV}[glib?,systemd?,tcpd?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index ff3df0e99392..15acc84cf81a 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,4 +1,4 @@
 AUX vorbis-tools-1.4.2-docdir.patch 416 BLAKE2B 1ce521f429314e40b9fbde91103dc0fd4cb02a0801479da8c4d5cf17334e6586c23a892f12398b9cc62c86fd17394d5325bd580c5be1d03ffd11e5a21bf18443 SHA512 96f1ef85b92e25dd1d029cf19b4e81ca455cbf9da83b49bf50ce10bbbf02a0150975eaeb2ded262c8931d213d6d767013ced4d7334ab5a6fa1c06f55bf278c91
 DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
-EBUILD vorbis-tools-1.4.2.ebuild 945 BLAKE2B e89fedc5e2f1873a0dc6d68d68a7e0cd55f5d1deb58c5b0209240e51bebd99860be202d466d09e706ed2571a17811811f438fe843942191c3a3a9b2c2667b35e SHA512 504608faefc9c5cfaab1c802419533da15dd935e08e4c903937a775263b9277b4c738da17cf8b29254e2ffaa09c1a64a4045fe4a06f8a9060309756f8f4b9550
+EBUILD vorbis-tools-1.4.2.ebuild 952 BLAKE2B 2cc908d0fceb0e070ce57a34f3e0cf7356659d5c0555730e624813ccaab957afd995336ee77450941cf2471507549374ff2e4f5e45b07a647df18e35c600ae19 SHA512 eca66b567ec9f5bab9465620acf728b68e76cd6823c700b4677c2b1559c19a6740c6465a7dbaf89c1e168e51149e910026170494a9d433b7ed656b646555b59a
 MISC metadata.xml 428 BLAKE2B 06363d3740051fdb8d99d36d6f488019d80f87d82c2919f6be0e22f3c8041b516f0c9da7dbbad266147498ea3b15446bf1a0614413bbfe0b799adb92ef9c96f4 SHA512 f288eb76ce48927f0b30db2a3efb4ebb0ae25f77c0dfdd7e4272763232afb75c6010ebdcff5869f0201395aa81597907197ee14f7fa1c0df16c4eeb83076014e
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
index 9c088f59ceb2..379c4e4b0fea 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/vorbisgain/Manifest b/media-sound/vorbisgain/Manifest
index 5ff0605a6ac2..916aefea44b3 100644
--- a/media-sound/vorbisgain/Manifest
+++ b/media-sound/vorbisgain/Manifest
@@ -1,4 +1,4 @@
 AUX vorbisgain-0.37-fix-errno-and-warnings.patch 2111 BLAKE2B 3f24e408b6931d5e59ca04f47e17366f42579beb8119fb8208cbc86513644df25277c6cad9f0885916adcdf724ccb6b915c1064da27a720a864a7fcbaa222543 SHA512 f42aecb99865f60c91814daaa615dd55e84f391d622d41310c12c5f570bbe7628e903802590a6866ae10a02c7f6982bdac208b5a1b191bb49efcd3ea66a86062
 DIST vorbisgain-0.37.tar.gz 208977 BLAKE2B d29185dc2ddccb97df94b164747d9fcf3c06ac5e2f602f7ca24d9d38b20792525188b697c74728a5992626fd7ef4748fd8a9adee165802f51f88b54be6be3f67 SHA512 67181834e1a0d7c6e1ccd984e2d30ebf1dcdff84caa77f75e5e771de8414904810e966a43852b7184e075d2428fd8b431124835efc370ce6504b8b2756746e04
-EBUILD vorbisgain-0.37-r2.ebuild 589 BLAKE2B 9704bb68e863584093d863c86fec7b906cc9d2c6b6f860a064c330bbb1e4985e090d4e3294e1191e2e75c4b8391299ae483b27aa2efed9839571938af33c7848 SHA512 38c46320143e35787d8422857cf4a1dd61531ec9e72e6d54870724734d038b52fb20cd90b5ffea5d1799d5ec5f1aae619a097a1d6a8eafc38950088cf2353ca1
+EBUILD vorbisgain-0.37-r2.ebuild 593 BLAKE2B da9028b8b2ea00cf514c5266c96b5c37a63560c983023ab1cc5c2726f9fdef239e4d60f5eaf8d67ef73a148a856740122c6aa4ed3d502c1a9bd6469ac000f0b4 SHA512 4517d6733302612a367bf254243dc96fc117522f08fd4b3c51ea8812ba1d8b553c1b67b66527fc94779fb5dbfc1973ec949e3da6e63c8fc77ce454fa937946c9
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
index 5491f2e4e0ef..89c9d228496b 100644
--- a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://sjeng.org/ftp/vorbis/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index dcf92e8f7582..57a01caf5ccf 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -2,5 +2,5 @@ AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364
 DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
 DIST xwax-1.8.tar.gz 86268 BLAKE2B 7fbde34e6c1a3508da6ea8230cec7d2663503882182e403bf9bbf2b7327248c1b2e38a21392615a359d30d4a65f558e55346f99bf8f89621a18bcf9e8cf09139 SHA512 db37a16ecc5437f9b085c17e5e645e04b76a18aa7f7d8e8448a2994435596394ea7f2b52a6734194be7cf0b7099995f0f8735c2c547f3f57525339c4dc671d9d
 EBUILD xwax-1.7-r1.ebuild 1977 BLAKE2B 1d54913f2c3e018371d8a4b2b5c9a19d5e9fd044e256b4fb8273666f66200ed6796c431a831c856b3aeb548c3b7e8b26a1118b77218f5c644eb487c2227af319 SHA512 c6c989d648d059aa011a031842c7d3a007b2d139a83165c5f82df7c960fe00c33a1e48bfad32bce549c4ff4c63e6f7853e79e1772696fdae91a219b679709dd9
-EBUILD xwax-1.8.ebuild 1981 BLAKE2B 9f534a9bcafafff0e66ca09030f05bdf917adcb10693d37d1638e53c3a295a8b42add98691e1c350841830059dbe78caf35e0752402a09dc1161f4e38813d2d1 SHA512 f967b41799f4dfbc7756ebd7421fb9ee5c6a11376e213278f0e3ae4cc6df851e0aaf6e672fb0404cd0facbec4525a15c0a6cf40ccc2c9432f3b4f6821f8a4815
+EBUILD xwax-1.8.ebuild 1979 BLAKE2B e6828b8dba9e50e7506c53e43a2ea6e6f13ddb3168225ad5e58aa8150fdbc9c8a8eb8c136036175889cd021ecddf87d406dad95f1f95ed0d9df2d2d0b5a34bce SHA512 d5967367b8375064a6adec86a855c8b54efe6790280326c6bde0a471f40d8a0838dba04c3cf0a992514bc78c57206f9e635f23e800bd393ddf5d1881899e4eda
 MISC metadata.xml 706 BLAKE2B 43e84daeedcc941ec85d093b2cbd437adfe54f76ffa382e65848f8ffc0b2aeafeabf23fc5d7b9ca0a9341a0c6e08f9d71d41e1126ccf0c5bdee96727e200b013 SHA512 19e6898741b91ff55ac37fcb9094e9c685e13efaee7ed2c4ef22a882162c83f6d04c25a13ca71c810b82228b6daad56a971fb124da9d6395002ab244c30ac7d1
diff --git a/media-sound/xwax/xwax-1.8.ebuild b/media-sound/xwax/xwax-1.8.ebuild
index 8c74789b19ce..0a944c4484b0 100644
--- a/media-sound/xwax/xwax-1.8.ebuild
+++ b/media-sound/xwax/xwax-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 08207fdd8084..524670f1a34a 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-2.0.2.tar.gz 7017339 BLAKE2B a0e129b3f667dff28e043ab69416992556f4e737e786baa79c361cff9411b849acf815e9d37f1a0338ce81f3014c3f44f0a27c3287cdd9c29d6c453a44c49cc2 SHA512 f83eed05dbe63e1966086ac0d19d02fafabce7ce10c6579ab8a95fd5fec7c040d516a4d979f38181f31c9f7720e92fac3c99c3737ddc4b0d4005bcdc45dea40f
 DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
-EBUILD yoshimi-2.0.2.ebuild 1003 BLAKE2B 91bfecb1c3e29de09bebf9f193a34a1a0da8d9b75b8bdb44c0f6da0f9d6e73352a175781e8497c18589a5995567027363ed4173864cb9821b35aa54ca840e807 SHA512 4a888ff968ba8473d2bae1dcc2a26b233a19d38a75be15f94e0bc48863853cdf2932ecd9d7064461a46d999b60d1865d91f64564639627ddc42cb17e7c3aba48
-EBUILD yoshimi-2.1.0-r1.ebuild 1195 BLAKE2B 0d5c2293fd43c238fb68bbbb0cd21f5554d16dccd9ca10de130136ff7813c450cc1ede150b8b278ac2b9e9d8502332cf9032ff433ccab94f9bdbc882af85e295 SHA512 1837120f7c243549b618bb261b46ed0ad6ac3846c3b89a6126b5a73b203a8d9a2b250ae441c6253bbcff61cfd36b2945bf1faaaaf79d2735d16a35c8db930a42
+EBUILD yoshimi-2.1.0-r1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.0.2.ebuild b/media-sound/yoshimi/yoshimi-2.0.2.ebuild
deleted file mode 100644
index 4328ab5da19a..000000000000
--- a/media-sound/yoshimi/yoshimi-2.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/mxml
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
index 23dfc649dc2c..e4052c27b49d 100644
--- a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 241f04ea7468..00c3be2f4873 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/atomicparsley-wez/Manifest b/media-video/atomicparsley-wez/Manifest
index 2369beec5a95..8f1fe5db8439 100644
--- a/media-video/atomicparsley-wez/Manifest
+++ b/media-video/atomicparsley-wez/Manifest
@@ -1,3 +1,3 @@
 DIST atomicparsley-wez-0.9.6.tar.bz2 178956 BLAKE2B e7c9bc2f3b923194fef173b72b98e4654745e0811457a1e8cb29150ab265447c2bfa71b645869661f6fd92bb30a58f25ae3aa29b20255aa09ee63f3ab738b8c5 SHA512 1f094fd4d43f652319abd2eee70529d9a57e7843b4b725815b9939ad90cf56e3f061ffd9104507a7d74cabbdd9b7cb24ca12d30c88a89832629da3091bbcf1b6
-EBUILD atomicparsley-wez-0.9.6.ebuild 706 BLAKE2B 15164f7304863f7cd4e28d098aa79f900f3ee7dca0d298d85bd786fa10df2786e7e0dad0717beafda61b071e5037efcd75366f3ec1ae5cc7085545603b5dd3a8 SHA512 02e001d95d8ecbf656b28d2b5e0a998251a643adf7d28c6ba8e923007ccd806c71687354fa738bac83f726f84450f3de31427d93f5b95fd197e2e123f1cd5a18
+EBUILD atomicparsley-wez-0.9.6.ebuild 710 BLAKE2B 3ea5d79eedea3cc15f2bbafb23d2830d3a4e2dc8965c1cd88f9406c24bbe2d2193633e2e141bdb68b056650c712fe61b170f6c7b4e333f30f17496fd2d2ed2ef SHA512 3852772adc8f8c30b909498548ba9fe9414ef88d6600b4b1fb5995311e25498fca10d66e0cbe60b50756819bbb92446733041805e76e5c8a99167fadeb6f44aa
 MISC metadata.xml 366 BLAKE2B 3d4b050b8bbd4b17192df4b60b165faae307084a2dc081658c6dc22d5471cd19019c62453d13187035f62af73049bbaaad0cd17723080a3f69aac44bb24f0b31 SHA512 f684ca0c9a4172c43056c594829df51983662c6327e468bad4b20470d12d60f22cc73c35df06a97523908e6e6189366b74b521cc2c6493e85f5591c86a130690
diff --git a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
index 87fbafb2ae38..7f1cfc0f1f1d 100644
--- a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
+++ b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/wez/${MY_PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index 2c481d17a181..bf6630623b1d 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -1,5 +1,5 @@
 AUX atomicparsley-0.9.0-environment.patch 6195 BLAKE2B 86b8f11524c5f1011ea66fefc84ceb2559ce51824ef17c951640ba63c1fe59b3cc0b0f738754d0ad23ffa4cb395bf4bcae140d39f17a79a5b6b85d07a107271a SHA512 99e871d3ec76a4d6ff0c254241a9eca591786712ddce906d4f6df26a57142e28e489c4d289b4d24977cbbe2352d5e537532f82a561d57476cc63e07d2c7e2eb3
 AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 BLAKE2B 5f1304e85beed2697787511641a4043d989e532b3aaf0b61c9e50576a2276bae0d60757a35884bcb7dad8b322e9248d33d963d6223c8d51732366c38958ff5b3 SHA512 a139ec08b6918d1a879c97a294f6ec7cafe7c98eb81db977987ca274334347c7954a3f71d9facad72642654e79b3de742ea7ea2c5ec008b79ac89cfb6c936874
 DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982
-EBUILD atomicparsley-0.9.0.ebuild 830 BLAKE2B ad1da9c3c599ca89de5f1fc4ebd4ea20fb658579e5bc94035ad55d670ee05df2c59e70135c26636077f5648dc4daadee08d6b02b254fcc54c8b305ed4b20635b SHA512 7c58729243aa0b4fc03810e76d6dbbd466c8f7302e4f931311fc8add9ba73893fe632ed37fdcc64e3b648c0c9d5d9a3000549da07b6f4ebee37768c5d216251d
+EBUILD atomicparsley-0.9.0.ebuild 837 BLAKE2B 728dc681ca62e254a0fbd525d5ce0642226c85a9e478a554cd2ff7e78139e76ce5ab2e567198ea6e87b689eed84baaefb202fa4cb0f67de0da1ed2ac2139e2d6 SHA512 7459d82fd113b6c86f8eff3eac07815338719e24200e1dd4d8d12cf7f29d6259508710b3cd8a2967227eedac2dbf3767dd9852fec497195b4d4c62eb56daa3e0
 MISC metadata.xml 307 BLAKE2B 3640f77bf82eb56de11af0ff0bbd29c7e4ea63b24c5aa1a53010b1fca6a85941c659fe069679b6d7fd11bce1b4a120a4e93e0b128f4c5bdd5e8574a5e8e67c99 SHA512 35d4d49d8c98be6ce817c5bff2a744fbbe3f996996946ad6f4aa0a0025ab3063bc028f397ac704cd01b449b8f652927a243b3c4418cdcc8c8ca7ee2d463fafe2
diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
index 3002e5401e2b..c60e09385f43 100644
--- a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
+++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index dc39302994aa..8f728eca3ca1 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -3,6 +3,6 @@ AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
-EBUILD handbrake-1.3.3-r1.ebuild 4173 BLAKE2B 00f0f0214e52a1ec0cbb5a0aaeaf438d1a728f56b0c942fc3ba808b89793e16cc5c1db0a773b54821201b2b594aa1397bf6a8784793d8c6eb8e529303075cb04 SHA512 8dffe9fc3e05b210f3251cea43e720bc67d9edd9c0771886c3e83abf3d3a7f18a903c6923c3ef33d30a35f00f9f536e991e98575168acf45351eb1866c4ad499
-EBUILD handbrake-9999.ebuild 4175 BLAKE2B 7e9a8a9be4f0a3e1d33daeeecd62b40b2a4aadee12f3fe10b4a25af638a557912bb70490e641d37361a849583b0a2accac5ff453ed03e74b2e1a9d05e929814e SHA512 aab693480348d51909c134ded062bb4b7b4bfdcad985cce409c1b6916dc5898272755d53bd36f8abd8f803ad692229f8f0ba18b2208eaa2088e6f871fde3b603
+EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
+EBUILD handbrake-9999.ebuild 4177 BLAKE2B 25cb3cfc7d3ceb109bec0000e28c686774135de354e247c05c065c04da16902f7e7f9865aa857358b6c34dabbc0973081d4c89528c5d4a477182f7ea3692a675 SHA512 7f3d69592b79bfa420f60d692cc6c2e6ed17220fb782a93686ae0d84e3c95f953e3faddf85af2d4f7d204d4ced7d0f9a6c92127a59ddf09ef912a03d720bb82c
 MISC metadata.xml 966 BLAKE2B f6c02a468a505d238d9800831bf0bb74557d3c4975eb7708952bd30708edff587a32c6b50f53c2190327e9ad172de2c9aa85d38a2fadfc4c41676c10186fbb80 SHA512 1849d7132897355e89b0e8fcadaf6b1a5041d5df4a5433f964ac2a6a97ce1adde340e5304e6fc3e0f5b9fd345b827ea709323bcbfc30f9a3448fbd9dca0f10d2
diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
deleted file mode 100644
index 2473cf819b8c..000000000000
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,162 +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 gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson
-	dev-libs/libxml2
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	>=media-libs/dav1d-0.5.1
-	media-libs/libdvdnav
-	media-libs/libdvdread:=
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=media-libs/libvpx-1.8
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-		media-plugins/gst-plugins-gdkpixbuf:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/nasm
-	dev-util/intltool"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
-	# Fix x265 linkage... again again #730034
-	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..a0fb60145610
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
@@ -0,0 +1,162 @@
+# 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 gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	app-arch/xz-utils
+	media-libs/speex
+	dev-libs/jansson:=
+	dev-libs/libxml2
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	>=media-libs/dav1d-0.5.1
+	media-libs/libdvdnav
+	media-libs/libdvdread:=
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=media-libs/libvpx-1.8
+	nvenc? ( media-libs/nv-codec-headers )
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+		media-plugins/gst-plugins-gdkpixbuf:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		dev-libs/libgudev:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/nasm
+	dev-util/intltool"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+	# Fix x265 linkage... again again #730034
+	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+)
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(usex !gtk --disable-gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
+		$(use_enable nvenc) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	if use gtk ; then
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index d6c33bf60882..f90d1b9f1528 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 RDEPEND="
 	app-arch/xz-utils
 	media-libs/speex
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-libs/libxml2
 	media-libs/a52dec
 	media-libs/libass:=
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index a24ec8334c25..7635c4b47714 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,4 +1,4 @@
-AUX lsdvd-0.17-autotools.patch 538 BLAKE2B cd5967fe1ae36d355db2a2b8f35a9a28d69f852729b8fc62425c7e71676f253ba3e6d47a4c9cd181bd45258b550e6c457b1d9baff125ae3d5f66a7c206330d44 SHA512 7fc4b172d8ca75019165758b2bad030e6a5ffc28cf542e1f0d9025078029578cb96b6ba5f1a6bd877f315baef74aa302dae78352636b03592e5a1343da5680b0
+AUX lsdvd-0.17-autotools.patch 466 BLAKE2B 3ec7a605c54b3808df96bec660e824b29ba8e5dc582c155bab27aa7e28d68041f314e57e495688358a6173ec5f8e0f1047716dfec8ec43c90e0c162e498923c0 SHA512 477a514d25379b11b8c44fcef62481f667c1a839f74e3e731ed3e15291e3e80db7848c1d8606d46bfd18b8b2cc4d931cb4194f5703c524d2251eba5a093299f2
 DIST lsdvd-0.17.tar.gz 99250 BLAKE2B 2b3203527aa4aabd43d26de5f983733f5570905a81043f49e18531a29198499ebb2b9c1ed9caf4ff061639ca02f047c13f95948c09bad7b105d8c02bb3ec9c67 SHA512 d217ebe063c9d4c1584abe99cba5c5d09e1d600d26c58f90d542235f9a629433aa24f24fd8399c639e21391e7a5e8bdf54a9c85083aed63eae1090f4c23677e0
-EBUILD lsdvd-0.17.ebuild 612 BLAKE2B 817ea630f91a2546cf8e53e014062c4df7dbc087885002704699fda654cae8ce832afa190c4660ac99b8da1718baa27d611a3261bf6281ab4f7610e6f40641e4 SHA512 7a154ac1eeaf585fac025d5d3ae8a529c2768084e7c56b2e799deb0b7433f0c895dcd5f1fae012aaf9e17c2f5ee6027966f6b5afec6072f25b3c8002a0b30c23
+EBUILD lsdvd-0.17.ebuild 586 BLAKE2B e1112386508736a3c35d055bd25ff739810e2d34e064f4f15d1f91a8940be3d412d7d4fc7d78da1688b7d31dfcbc0ea6209e782b0ac89d3fdb7271e5b7ea9ffa SHA512 17ffc29a6e7a13da7f26946cccb37692e87dec0805194cdd4d295f0f356019fbaba6e01c043e0f4827233c7715be439a5d743bde711c7a6f0897e7d1de289ace
 MISC metadata.xml 299 BLAKE2B 14baa9779438a685ba4c67b40becb5ecb849fc0605aa1cc60664f59af85776868f5bb4ad2c416b9f163344c07a5c2099ab3b5ef3e9b45200ab71b6ad1ddddac0 SHA512 e145df76dd8df4a6d68ee786b05055ed02632d76f36c818ecb376d50ec5397218fb004cf8d8da1ac0c23c5d8e14b5afaea4049f9723b466d3216504764d3cae7
diff --git a/media-video/lsdvd/files/lsdvd-0.17-autotools.patch b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch
index c2f7e9456ed9..33a954f001c7 100644
--- a/media-video/lsdvd/files/lsdvd-0.17-autotools.patch
+++ b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2014-10-04 00:36:04.484376722 -0600
-+++ configure.ac	2014-10-04 00:36:25.080207028 -0600
+--- a/configure.ac
++++ b/configure.ac
 @@ -1,9 +1,6 @@
  AC_INIT([lsdvd], [0.17])
  AM_INIT_AUTOMAKE([foreign])
@@ -9,4 +9,4 @@
 -fi
  AC_SYS_LARGEFILE
  PKG_CHECK_MODULES([DVDREAD], [dvdread >= 4.1.3])
- AC_ARG_ENABLE([debug],
\ No newline at end of file
+ AC_ARG_ENABLE([debug],
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index fda1e95f98df..b4b39ff9fa7d 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,24 +1,28 @@
 # Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="https://sourceforge.net/projects/lsdvd/"
-SRC_URI="mirror://sourceforge/lsdvd/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="media-libs/libdvdread:0="
 DEPEND="${RDEPEND}"
-DOCS="AUTHORS README ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17-autotools.patch
+)
+
+DOCS=(AUTHORS README ChangeLog)
 
 src_prepare() {
-	rm "${S}/aclocal.m4" "${S}/Makefile.in"
-	epatch "${FILESDIR}"/${P}-autotools.patch
+	default
 	eautoreconf
 }
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index fd6e124ec8e2..885ccaf9dfaf 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,3 +1,5 @@
 DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
+DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830
 EBUILD mjpegtools-2.2.0-r1.ebuild 2679 BLAKE2B 5f67591a0b27b85095b1522d1de4efe1373f1ba67a552cab271d5a933c7da6d5e42f3f53ab8daaf9a84c522ac71bc1cddf13869ffce7fe4b7a2f14adee1decea SHA512 58a9ae7d7a37ccfce311668a532b98aa0c28fc86b05cc41369f5f983e74413f3feaa360af57ff20ad62ed4f94f76f2cdaf7b6cf2dae95b0e28c3024df73ec609
+EBUILD mjpegtools-2.2.1.ebuild 2683 BLAKE2B 96dd3dad40d964f0a9951ea9ac88a22f818de2fb67c4fdf869196eb04327cccab6d00a0f9cb361d244fcaa5e207d71727886c763149348be214135c79b7f1380 SHA512 c318d9c10e1a9b2822e40be8d1f9631b982dcc720e93ad6c46a4ee33c444272287d94a9838f8659a22a6fdf3dfafdd78d6ae30f5447fe0b1df7c6a7c6e6d1b06
 MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926
diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
new file mode 100644
index 000000000000..54975b16164c
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2)
+SLOT="1/2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+	sdl? (
+		>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/awk
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--enable-compile-warnings
+		$(use_enable cpu_flags_x86_mmx simd-accel)
+		$(use_enable static-libs static)
+		--enable-largefile
+
+		$(use_with quicktime libquicktime)
+		$(use_with dv libdv)
+		$(use_with sdl libsdl)
+		--without-v4l
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 85e9bfe77559..eacbf5fff0ce 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -4,7 +4,7 @@ DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e
 DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179
 DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3
-EBUILD obs-studio-26.1.2-r1.ebuild 4006 BLAKE2B f7bbf701f886efa63171ea25bcc8303c54fa60bea7ad72b7160d625193aa929ccfd4a4a5adb91628025b6a5240441ee52c79a01757b22a41cf933994978789f8 SHA512 0ce7a598bf46398e054981a71a7a6e904a0f45078d2014c8c43b85b164d9c812f4a60b75f57343ea89709c73cf60cdc83f751aedd34dbc71b9bff035197c0c1b
-EBUILD obs-studio-27.0.1.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea
-EBUILD obs-studio-9999.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea
+EBUILD obs-studio-26.1.2-r2.ebuild 4008 BLAKE2B f4dff57e5e7edf5c6b5a7512cdaab44c764704ae4f9faa2023258d53c1f7f80246c8625b18b7148df37a457c84a9d3e70b9f0d2005a22de0911e5dd7010bfb8f SHA512 08a92ab707e07d73a89cb2227f9bec4790fdc2d62d7e7f8c5cc35a2375ba1269906b90a00f08b70b1737705fd4c7bd619a3ead879fef3d91fda1b605f604d26e
+EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34
+EBUILD obs-studio-9999.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34
 MISC metadata.xml 1581 BLAKE2B d05f9c5d2df5f8c866391d442b464d861d0fcf969dd2509e61b0c6de37fd297a9c89d4610642f87ad12e1fec5b13c401cd7121b2edbfc75e070ddea2c6e5ad86 SHA512 809d3758b41687a9e107cc3f14e7592cba52a74833c6f49581e7c20abb77bb88ff23ee8bb923ee0fee5c090408ceb4aa9799b51a477c2e6feb50ce38eb373a19
diff --git a/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
deleted file mode 100644
index 3e12ab881f7e..000000000000
--- a/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/x264:=
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
-	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-	)
-
-	if [[ ${PV} != *9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !lua)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	#external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
-		ewarn "and while it fixes Python support at least to some extent, it"
-		ewarn "may cause other issues."
-		ewarn ""
-		ewarn "Please report any such issues to the Gentoo maintainer."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild
new file mode 100644
index 000000000000..0ff7ff59c0e0
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single python-single-r1 xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
+	>=dev-libs/jansson-2.5:=
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/x264:=
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls:= )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
+	)
+
+	if [[ ${PV} != *9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !lua)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+		ewarn "and while it fixes Python support at least to some extent, it"
+		ewarn "may cause other issues."
+		ewarn ""
+		ewarn "Please report any such issues to the Gentoo maintainer."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild b/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild
new file mode 100644
index 000000000000..4c9f4cd3f3a8
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg cmake lua-single python-single-r1
+
+OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
+CEF_DIR="cef_binary_4280_linux64"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=( plugins/obs-browser )
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+	+alsa browser decklink fdk jack lua nvenc pipewire
+	pulseaudio python speex +ssl truetype v4l vlc wayland
+"
+REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
+	dev-libs/jansson:=
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[wayland?]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/x264:=
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb:=
+	alsa? ( media-libs/alsa-lib )
+	browser? (
+		app-accessibility/at-spi2-atk
+		dev-libs/atk
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		net-print/cups
+		x11-libs/libXScrnSaver
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
+	fdk? ( media-libs/fdk-aac:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls:= )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+	wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif use browser; then
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+	fi
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		$(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
+		-DBUILD_BROWSER=$(usex browser)
+		-DBUILD_VST=no
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_DECKLINK=$(usex !decklink)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
+
+		# deprecated and currently cause issues
+		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
+		-DLIBOBS_PREFER_IMAGEMAGICK=no
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !lua)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if use python; then
+		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+		ewarn "and while it fixes Python support at least to some extent, it"
+		ewarn "may cause other issues."
+		ewarn ""
+		ewarn "Please report any such issues to the Gentoo maintainer."
+	fi
+}
diff --git a/media-video/obs-studio/obs-studio-27.0.1.ebuild b/media-video/obs-studio/obs-studio-27.0.1.ebuild
deleted file mode 100644
index 56839893506e..000000000000
--- a/media-video/obs-studio/obs-studio-27.0.1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake lua-single python-single-r1
-
-OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
-CEF_DIR="cef_binary_4280_linux64"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=( plugins/obs-browser )
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua nvenc pipewire
-	pulseaudio python speex +ssl truetype v4l vlc wayland
-"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	dev-libs/jansson
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[wayland?]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/x264:=
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb:=
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		app-accessibility/at-spi2-atk
-		dev-libs/atk
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		net-print/cups
-		x11-libs/libXScrnSaver
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc:= )
-	wayland? ( dev-libs/wayland )
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	usr/lib*/obs-plugins/chrome-sandbox
-	usr/lib*/obs-plugins/libEGL.so
-	usr/lib*/obs-plugins/libGLESv2.so
-	usr/lib*/obs-plugins/libcef.so
-	usr/lib*/obs-plugins/swiftshader/libEGL.so
-	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif use browser; then
-		rm -d ${P}/plugins/obs-browser || die
-		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-	fi
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		$(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
-		-DBUILD_BROWSER=$(usex browser)
-		-DBUILD_VST=no
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_DECKLINK=$(usex !decklink)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-
-		# deprecated and currently cause issues
-		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
-		-DLIBOBS_PREFER_IMAGEMAGICK=no
-	)
-
-	if [[ ${PV} != 9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !lua)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
-	if use python; then
-		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
-		ewarn "and while it fixes Python support at least to some extent, it"
-		ewarn "may cause other issues."
-		ewarn ""
-		ewarn "Please report any such issues to the Gentoo maintainer."
-	fi
-}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 56839893506e..4c9f4cd3f3a8 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	python? ( dev-lang/swig )
 "
 DEPEND="
-	dev-libs/jansson
+	dev-libs/jansson:=
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5[wayland?]
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3cc4fd8f8c28..3ea27ed4f2ad 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -9,6 +9,9 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c
 AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
 AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407
 AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa1786da4db762a78011672226836525413d10fed3a18d43457277b6b868dfe0ee8e189143f76c971dd9c53809794864bcc642c804bf962ab8 SHA512 08b4998a3129f824c68310d2fc87245311e1d4b85a09a57f1d9bab76f990aa5d95686f22f3835a1072b7e6c0b6eb0246cc9c81884588f0146d26f9c215d9c565
+AUX pipewire-0.3.38-find-readline.patch 1546 BLAKE2B c8d6a8d53e8f71792c5055dabb0a66d8a2b93641e4ade45542fbcb3269ebabb3319c1225f63433cccf8000f4585607383a903045112e9bd204f95bed4e92546e SHA512 c09d604e09552c1dca29b9709c8571a9bc1393fa885e249d8e71403a5669ef732d0e14b9a7c9f315a55b03c2dd2022bfa9f71f4430ae7f93a8d01b686f6bf246
+AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a8d2f5c4ac09ba9fd448b3c77446dc523a07d8ed090f08fec1029357c5cb67ea696f57aa3c22de1df5aa01d789c5c96cfdab5 SHA512 e35d35905da4f35b1db5c1e8a8dada24e83320dc38c4353f7c7dc4cc442c9a73aed02b4df99d66983683f36a004f85bdba9a287ff9e0e8ce71624e1703fced7b
+AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
@@ -18,12 +21,14 @@ DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3
 DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
+DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d
 EBUILD pipewire-0.3.33-r1.ebuild 9797 BLAKE2B ef2472ea8e6e06d286a72b00cc77fa04dbf6ffef5cf93cb1db75fca910114bf09442a72fe06709ab40f54f36206de47ff2b068381bb8d82c1e8077c79a7f683c SHA512 f2fcd471370696005008ec8614493cab105e08faf07f13effc76866c7f022f474a9e255c184069d5a371507713b1ca1e967ef0d254ea8e314dec3a105c13ec6e
 EBUILD pipewire-0.3.34.ebuild 9816 BLAKE2B 067c01652c0dbb7981606af3818735c37772ad4c2852761ccba4f94c1983246699b6445351458faed259024454052f69ca2ea03e5ad9b47581900ce32f458a0d SHA512 1b7ee3e5ebf11b27bf6c276d83dccc8c3b0fc013e9b75f82ffdedf70e712e9de1bd268b06e8c7cbeed4a71bd0ab5ec249055c817e17c655a011666e35bf62801
 EBUILD pipewire-0.3.35.ebuild 9979 BLAKE2B 12d3135ef817c2266c911dd3182f9f876acee795038b77b7674d41521dd603fa7c8d874887cf841d4dcbb0376a4d0fcbd36f9e03245a9e359810338f69303b58 SHA512 5c3c314dca12e15736c4a16fd28799c3c982a5bca9bddc0ba0033727696aa685d4d52d2d7c5fe25e23e95c0930d11420845fc531b3388de7a33a9ee0a8d25587
-EBUILD pipewire-0.3.36.ebuild 10268 BLAKE2B a471b8d685b05244db999f568d7cb1d434f21273219357e0257f1234754e9752d9d8c1f3eade8a7e12e0a4edcc3de635e6f83abb7b03252dd82bee42a3436661 SHA512 e0531808150431e59560d40c9fc4fb34af096f7182439662e32913396d906356de13b6b487ca6c9aeb1ea9e04ae274d3c8495710a631776f341d7741cc441a64
+EBUILD pipewire-0.3.36.ebuild 10265 BLAKE2B 2f8126a2b17057613566895fea3d83fdb72fb305cd838144145aac61fb83dee6e6b49cba0a5745d2ae7451aedbcd9c72b67a716220a82858215bb549c9f3b7aa SHA512 378cdac981be1f8d55e5aafc7e869ef7ab49619784c4f91065aa94368fc5338b7cb4dc602c83ea0ae543aa29b39c616e96df37cc985f9d26dfeb3f1ea334d91e
 EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
-EBUILD pipewire-9999.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
+EBUILD pipewire-0.3.38.ebuild 10331 BLAKE2B b4d2175802683b15af627551c6f7911c1a79979d8544987b3be4bbdd910621b7847667050d5605798e2cf17d1bbb130083ec0a9f3421ed167d18ca9abd84cf20 SHA512 21caf157edf054945b92b0ac7a402bb7e51c8bb03e740bac33fb2f392cb5ee76d276f3d88f3e9cbcd9108f535b6017f657889ca0a37f0c992e053124ffc62698
+EBUILD pipewire-9999.ebuild 10126 BLAKE2B 26b722b3d6b6b603e9b73fc0272bd75b9e99fbb39c314e2cd8f864147cebe20b777d26d3ac922eef43addfdf94c1faf785279f0f6540b7b38fd6ef7f8c76e9cc SHA512 cd811868b41e04bf2c65884839910010d0641bea72f4afd3d2df9f23dd4a0a87d863f3481955dc1bde2db86893cbc08d4ddbe478f68e65a5aef2171ef4429dad
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
new file mode 100644
index 000000000000..6b56304f5d17
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch
+
+From: Joshua Strobl <joshua@streambits.io>
+Date: Thu, 30 Sep 2021 23:11:50 +0300
+Subject: [PATCH] Fix readline detection by allowing fallback to cc
+ find_library
+
+--- a/meson.build
++++ b/meson.build
+@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1')
+ sdl_dep = dependency('sdl2', required : get_option('sdl2'))
+ summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+ readline_dep = dependency('readline', required : false)
++
++if not readline_dep.found()
++  readline_dep = cc.find_library('readline', required: false)
++endif
++
+ summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+ ncurses_dep = dependency('ncursesw', required : false)
+ sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
+@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd'
+     : dependency('', required: false))
+ 
+ # On FreeBSD, libintl library is required for gettext
+-libintl_dep = cc.find_library('intl', required: false)
++libintl_dep = dependency('intl', required: false)
++
++if not libintl_dep.found()
++    libintl_dep = cc.find_library('intl', required: false)
++endif
++summary({'intl support': libintl_dep.found()}, bool_yn: true)
+ 
+ need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session')
+ alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
+GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
new file mode 100644
index 000000000000..222aa58cce13
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch
@@ -0,0 +1,18 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.patch
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 30 Sep 2021 11:12:27 +0200
+Subject: [PATCH] cpu: fix compilation on ARM
+
+--- a/spa/plugins/support/cpu-arm.c
++++ b/spa/plugins/support/cpu-arm.c
+@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
+ 	int arch;
+ 
+ 	if (!(cpuinfo = get_cpuinfo())) {
+-		spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
++		spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
+ 		return 1;
+ 	}
+ 
+GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
new file mode 100644
index 000000000000..beabd1a30291
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch
@@ -0,0 +1,70 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d71a10b7fa9b5c560485b6bbde409c10d3fdd114.patch
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 30 Sep 2021 12:54:29 +0200
+Subject: [PATCH] libcamera: handle failure gracefully
+
+Don't try to access NULL pointers
+--- a/spa/plugins/libcamera/libcamera-client.c
++++ b/spa/plugins/libcamera/libcamera-client.c
+@@ -210,10 +210,10 @@ impl_init(const struct spa_handle_factory *factory,
+ 			SPA_DEVICE_CHANGE_MASK_PROPS;
+ 	this->info.flags = 0;
+ 
+-	if(this->dev.camera == NULL) {
++	if(this->dev.camera == NULL)
+ 		this->dev.camera = (LibCamera*)newLibCamera();
++	if(this->dev.camera != NULL)
+ 		libcamera_set_log(this->dev.camera, this->dev.log);
+-	}
+ 
+ 	return 0;
+ }
+--- a/spa/plugins/libcamera/libcamera-source.c
++++ b/spa/plugins/libcamera/libcamera-source.c
+@@ -994,10 +994,10 @@ impl_init(const struct spa_handle_factory *factory,
+ 	port->dev.log = this->log;
+ 	port->dev.fd = -1;
+ 
+-	if(port->dev.camera == NULL) {
++	if(port->dev.camera == NULL)
+ 		port->dev.camera = (LibCamera*)newLibCamera();
++	if(port->dev.camera != NULL)
+ 		libcamera_set_log(port->dev.camera, port->dev.log);
+-	}
+ 
+ 	if (info && (str = spa_dict_lookup(info, SPA_KEY_API_LIBCAMERA_PATH))) {
+ 		strncpy(this->props.device, str, 63);
+--- a/spa/plugins/libcamera/libcamera_wrapper.cpp
++++ b/spa/plugins/libcamera/libcamera_wrapper.cpp
+@@ -540,7 +540,8 @@ extern "C" {
+ 	}
+ 
+ 	void LibCamera::close() {
+-		this->cam_->release();
++		if (this->cam_)
++			this->cam_->release();
+ 	}
+ 
+ 	void LibCamera::connect()
+@@ -775,6 +776,9 @@ extern "C" {
+ 		std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>();
+ 		LibCamera* camera = new LibCamera();
+ 
++		pthread_mutexattr_init(&attr);
++		pthread_mutex_init(&camera->lock, &attr);
++
+ 		ret = cm->start();
+ 		if (ret) {
+ 			deleteLibCamera(camera);
+@@ -794,9 +798,6 @@ extern "C" {
+ 			return nullptr;
+ 		}
+ 
+-		pthread_mutexattr_init(&attr);
+-		pthread_mutex_init(&camera->lock, &attr);
+-
+ 		camera->ring_buffer_init();
+ 
+ 		return camera;
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild
index 43ac9052449d..ed38e2d391cb 100644
--- a/media-video/pipewire/pipewire-0.3.36.ebuild
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.38.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild
new file mode 100644
index 000000000000..9b2951c07937
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.38.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib optfeature python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="jack-sdk? ( !jack-client )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	# Upstream
+	"${FILESDIR}"/${P}-fix-arm-build.patch
+	"${FILESDIR}"/${P}-libcamera-null-deref.patch # (we don't have it in ::gentoo but let's be nice)
+	"${FILESDIR}"/${P}-find-readline.patch # just in case
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		# Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
+		# but default is same as before and right now, this is fatal with unreleased Meson.
+		#$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
+		elog
+		elog "  systemctl --user disable --now pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user enable --now pipewire-media-session.service"
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
+		elog "autospawning of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable --now ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 7725dfa300f5..b6c000cf8a53 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
 	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
 	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
 	virtual/libudev[${MULTILIB_USEDEP}]
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 01a05d6c1158..bcb0f5d5d491 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1,4 +1,6 @@
+DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9
 DIST vidcutter-6.0.5.tar.gz 9911435 BLAKE2B 2d901768064b7c3b7444289db84e8f8d6e179d915b04f870a6b397f0d905c6b4ecab0768d045a8c1aa43b3bf7bccb2dcd60e9c043595f2aaf857ce657ec997f8 SHA512 b4a0e0cc3132038e9216f05117768695ba30840f04251c60561b7555cde9064efcf12440c801c834c2160d5b5acad011dc31055d9547269a5689361c875bca80
+EBUILD vidcutter-6.0.5.1.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5
 EBUILD vidcutter-6.0.5.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5
 EBUILD vidcutter-9999.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5
 MISC metadata.xml 461 BLAKE2B 0eeb6abbb7914b27cd567263de9001cfe17c9bd3b98a0887b21fd76b908a48c0abb3695039d21803709d47483078d15c5d412be7c408640ece0a433806272640 SHA512 55fd2db2f66d5cbc2410dfc57f235b90554cf3de4aaa88fc5069d499590ec45264499881f049c5469771f063638a65adad89686717c28abb89ef6ea632c88a30
diff --git a/media-video/vidcutter/vidcutter-6.0.5.1.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1.ebuild
new file mode 100644
index 000000000000..8ec68eb7ef9e
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-6.0.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-video/ffmpeg[X,encode]
+	media-video/mediainfo"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d8cfd34732ce..ff5f5356e031 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8fea7f448100..af47f195eb11 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Sep 2021 18:39:19 +0000
+Fri, 01 Oct 2021 19:09:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 988ae8e36832..6d99946d64ff 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-09-25T18:39:22Z
+TIMESTAMP 2021-10-01T19:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFPbNpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFXXNNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAB7w/6Ag2SXvVSrUOHkkhmDWP3WyXXwf2Cr9CBSLRrCuR3uedPjF4NkFBSJNv6
-Z34IFUykdPPnY4Ls/KNDB8FntxkaFW7vwQz0CpBvYC8NXv9rN2OUA6bTTbWT9W2P
-z3zUz4aoSGUXW+UWGqFHfm3sjWE9RXGktboCVDCq2JHDkko/88RRGzQyN2+2K9jk
-WmEwASy9dkAeSucc4PNMawWyMb8IL4l//SeTniA3aR13AK1zOMcC3pA3JZ5bi3ew
-EhdJ0dqDmCWwohI1tKsra0R2LUakIPC0QKQTC7iDkoMvNavv7Zc2wUFacX4fjgVr
-6hLArRbsEI8eRxjmYFPA3+nDcUT6Dm3tMOXxiPXNlktRlg6xJUQU9eNAbJcgmpyg
-4qTEX85ORuqk7D+6hf6utc0NQXBxEeAGVX6fUfun5d5XB58jquK5fWvq5ww9IeZ/
-5TIFUXHTgfGYMKgiXUy9XRvIGrB3hdDaBYwooIZ22LcScuf0msbTNM/UPJbFrnUD
-tke+84EkufOExe2mpvYfYThmXZpyQxnEomuve+Eljfi1mRWYVPE6cHiXWkIQBVez
-/+HrQDniOKFtlEVm6cOnSU3IABzXVQ8Y6V++6/CxWh2FvUGBLqhQ6V1amPwXzuVp
-qDy9uzN+jQXZnu3zeC3WBNKTEQiJxNZj/bUBFGVDMpCkC+VL+LA=
-=wXdy
+klCxHw//VrTORuVfM4JRKQLkxs6+hKMl2P12Lkch8S9QqkZPXbLraoDOudh785aF
+OBxo3Pw9YJCMM1/epCr/Qtf+HMNKmPIWYUgH6gVXWtyEpV49Vtwtzl2zOkfp+pD0
+QbEpHcpTISAfZAzDxlO9WCu6A/rAvo1LgDQpGEm6yzzIJMUCzQ8CS3ypXa82jz88
+yxwx9RTxpwb8rK/WqzVkP5dB6QQmAlq6LQbjrhV2i70Ks09IgqGkeXeIJyQ71Vrb
+Ly0AnK1M5fpHyDXEcrzQ4DifZGR0T4qAoAS/pMKL+KAOJEgNineEKmOLf32ed7m6
+65ZbgYN2PUbxTTrt8EKTJopxd/hZOxlS49u19OvA0mBSSoXu0C4kfmCOoTbhK7Vm
+Y9OnvXtlTYZOYovByDMj2691W5iQP16ELzhx17kBdHsfRa6AQLnpwwQuESNRfFQP
+ZlH5a/JFjLB9wZ1ZiBL7qtLc1QzXbogOZmxvJWNTM1He4EMEH/CfCr5jyrYQN9TN
+cT8sYlB8XL8SRwbxstCB5j/Nlsil6ERyCBLOvj9MP5Fo7733xAu1L9jJErJa8rDO
+KHPRHZNYy8LaIXATP4YvTf3+REOM/jKCMV7ng1FyT2bTSJynVM7P76YV4A31TnLY
+/BPvhwn1gE3Myt/lNE0x0nCY7CQn2WUto+c+yTPEGDiDa4cXCwM=
+=hANn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8fea7f448100..af47f195eb11 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Sep 2021 18:39:19 +0000
+Fri, 01 Oct 2021 19:09:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e6b2565930fe..5976d3dc6a3c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index fbade200158d..ed155e74a0f3 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-4.3.0 b/metadata/md5-cache/app-admin/ansible-4.3.0
index a094ae877b30..6bc0fb60bd94 100644
--- a/metadata/md5-cache/app-admin/ansible-4.3.0
+++ b/metadata/md5-cache/app-admin/ansible-4.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-4.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e700802ffb2e5566b7b2fffc1b179512
diff --git a/metadata/md5-cache/app-admin/ansible-4.5.0 b/metadata/md5-cache/app-admin/ansible-4.5.0
index f134ef6471b0..923e604177bb 100644
--- a/metadata/md5-cache/app-admin/ansible-4.5.0
+++ b/metadata/md5-cache/app-admin/ansible-4.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-4.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab0b2cfebc407d368a4d3dc372748fda
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.10 b/metadata/md5-cache/app-admin/ansible-base-2.10.10
index a23ea33f3b8b..828e93cd8d60 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.10
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc3dd91e083aed9b244d539c2d28ef5b
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.3 b/metadata/md5-cache/app-admin/ansible-base-2.11.3
index 7d37783b5226..9efadfba381e 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.3
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9ea692625ff5ec7d07e257a34f0f32d
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.4 b/metadata/md5-cache/app-admin/ansible-base-2.11.4
index 2321ddff04ee..31e6c5c5f146 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.4
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=213f59cbd459e3ce584ee84104535aac
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.5 b/metadata/md5-cache/app-admin/ansible-base-2.11.5
index fbbed2992335..b1861e5d12e6 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.11.5
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=213f59cbd459e3ce584ee84104535aac
diff --git a/metadata/md5-cache/app-admin/ansible-base-9999 b/metadata/md5-cache/app-admin/ansible-base-9999
index a59cc544d247..4c95e56710f5 100644
--- a/metadata/md5-cache/app-admin/ansible-base-9999
+++ b/metadata/md5-cache/app-admin/ansible-base-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=213f59cbd459e3ce584ee84104535aac
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
index 31ca673999db..e252e7b2b92b 100644
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.28
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python3_8(-)?] dev-python/jsonxs[python_t
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e26ee05d67f9ba8c1290e1c54a0ef162
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.30 b/metadata/md5-cache/app-admin/ansible-cmdb-1.30
index 349d469f9e88..38d784c1a1f1 100644
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.30
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.30
@@ -11,5 +11,5 @@ RDEPEND=dev-python/mako[python_targets_python3_8(-)?] dev-python/jsonxs[python_t
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.30.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bc0c620445adcbd8e0e4be5a8866cf2
diff --git a/metadata/md5-cache/app-admin/ansible-lint-5.0.12 b/metadata/md5-cache/app-admin/ansible-lint-5.0.12
index 29528a9f1a8d..d1f2c690dd00 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-5.0.12
+++ b/metadata/md5-cache/app-admin/ansible-lint-5.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-lint/ansible-lint-5.0.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3576cad645d9264bea3e5a012e73c62
diff --git a/metadata/md5-cache/app-admin/ansible-modules-hashivault-4.6.2 b/metadata/md5-cache/app-admin/ansible-modules-hashivault-4.6.2
index faf1d6c80cd6..439727d39d89 100644
--- a/metadata/md5-cache/app-admin/ansible-modules-hashivault-4.6.2
+++ b/metadata/md5-cache/app-admin/ansible-modules-hashivault-4.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/TerryHowe/ansible-modules-hashivault/archive/4.6.2.tar.gz -> ansible-modules-hashivault-4.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=758255d21bd7231ba4f4a2da5f452713
diff --git a/metadata/md5-cache/app-admin/ansible-molecule-3.3.4 b/metadata/md5-cache/app-admin/ansible-molecule-3.3.4
index 95ff37ce094a..0a8b007e6afc 100644
--- a/metadata/md5-cache/app-admin/ansible-molecule-3.3.4
+++ b/metadata/md5-cache/app-admin/ansible-molecule-3.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/molecule/molecule-3.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d952c9b844ff239ac23ee0d8612849e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.28 b/metadata/md5-cache/app-admin/awscli-1.20.28
index 56679ec0b7f3..c28cfbcb6f25 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.28
+++ b/metadata/md5-cache/app-admin/awscli-1.20.28
@@ -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/aws/aws-cli/archive/1.20.28.tar.gz -> awscli-1.20.28.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1d34d6a3aa1066bda8901e9c3a3f674
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.40 b/metadata/md5-cache/app-admin/awscli-1.20.40
index 4a3a49076101..9578ac0c2852 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.40
+++ b/metadata/md5-cache/app-admin/awscli-1.20.40
@@ -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/aws/aws-cli/archive/1.20.40.tar.gz -> awscli-1.20.40.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.41 b/metadata/md5-cache/app-admin/awscli-1.20.41
index 1a294ba60a3e..add5b7cac5e3 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.41
+++ b/metadata/md5-cache/app-admin/awscli-1.20.41
@@ -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/aws/aws-cli/archive/1.20.41.tar.gz -> awscli-1.20.41.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.42 b/metadata/md5-cache/app-admin/awscli-1.20.42
index 65c8c92dad95..3ad9e77da38d 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.42
+++ b/metadata/md5-cache/app-admin/awscli-1.20.42
@@ -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/aws/aws-cli/archive/1.20.42.tar.gz -> awscli-1.20.42.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.43 b/metadata/md5-cache/app-admin/awscli-1.20.43
index 7e10799e7489..ed1daf375405 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.43
+++ b/metadata/md5-cache/app-admin/awscli-1.20.43
@@ -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/aws/aws-cli/archive/1.20.43.tar.gz -> awscli-1.20.43.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.44 b/metadata/md5-cache/app-admin/awscli-1.20.44
index 8ed6cfcb54db..d32e09acd7fd 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.44
+++ b/metadata/md5-cache/app-admin/awscli-1.20.44
@@ -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/aws/aws-cli/archive/1.20.44.tar.gz -> awscli-1.20.44.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.45 b/metadata/md5-cache/app-admin/awscli-1.20.45
index 49260196a835..3457b556907c 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.45
+++ b/metadata/md5-cache/app-admin/awscli-1.20.45
@@ -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/aws/aws-cli/archive/1.20.45.tar.gz -> awscli-1.20.45.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.46 b/metadata/md5-cache/app-admin/awscli-1.20.46
index f64cbcdb8ba6..e8fb78ea6e64 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.46
+++ b/metadata/md5-cache/app-admin/awscli-1.20.46
@@ -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/aws/aws-cli/archive/1.20.46.tar.gz -> awscli-1.20.46.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d449de323be56f12d4d81a4e80c8ed38
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.47 b/metadata/md5-cache/app-admin/awscli-1.20.47
index c4ea1fe24d33..d7ae7447d12e 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.47
+++ b/metadata/md5-cache/app-admin/awscli-1.20.47
@@ -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/aws/aws-cli/archive/1.20.47.tar.gz -> awscli-1.20.47.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d449de323be56f12d4d81a4e80c8ed38
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.48 b/metadata/md5-cache/app-admin/awscli-1.20.48
index b7e0468ad9cf..2fcf4ca6b7a4 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.48
+++ b/metadata/md5-cache/app-admin/awscli-1.20.48
@@ -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/aws/aws-cli/archive/1.20.48.tar.gz -> awscli-1.20.48.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d449de323be56f12d4d81a4e80c8ed38
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.49 b/metadata/md5-cache/app-admin/awscli-1.20.49
new file mode 100644
index 000000000000..02577b8ff9e2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.49
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.49[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=8
+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.49[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.49.tar.gz -> awscli-1.20.49.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d449de323be56f12d4d81a4e80c8ed38
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.50 b/metadata/md5-cache/app-admin/awscli-1.20.50
new file mode 100644
index 000000000000..8afea6dd8bd1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.50
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.50[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/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=Universal Command Line Environment for AWS
+EAPI=8
+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.50[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.50.tar.gz -> awscli-1.20.50.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.51 b/metadata/md5-cache/app-admin/awscli-1.20.51
new file mode 100644
index 000000000000..c90a3410b720
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.51
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.51[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/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=Universal Command Line Environment for AWS
+EAPI=8
+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.51[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.51.tar.gz -> awscli-1.20.51.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.52 b/metadata/md5-cache/app-admin/awscli-1.20.52
new file mode 100644
index 000000000000..7463d7ee45a9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.52
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.52[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/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=Universal Command Line Environment for AWS
+EAPI=8
+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.52[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.52.tar.gz -> awscli-1.20.52.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/cdist-6.9.4 b/metadata/md5-cache/app-admin/cdist-6.9.4
index bf8500559741..aa59ca8a3020 100644
--- a/metadata/md5-cache/app-admin/cdist-6.9.4
+++ b/metadata/md5-cache/app-admin/cdist-6.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://code.ungleich.ch/ungleich-public/cdist/-/archive/6.9.4/cdist-6.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a7f15e001c782a09fbe429e2c3abab9
diff --git a/metadata/md5-cache/app-admin/clustershell-1.8.3 b/metadata/md5-cache/app-admin/clustershell-1.8.3
index e16058b4256d..e3eeef300377 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.8.3
+++ b/metadata/md5-cache/app-admin/clustershell-1.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.8.3.tar.gz -> clustershell-1.8.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=38b91093e4409ae4323715ab915abd2b
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
index 9dffc7900eed..c58edc2efa7c 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_8(-)?] ) p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v0.4.3.tar.gz -> eclean-kernel-0.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6c511ac96ad1928e46c1ddbce066477
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
index 458cfed9a089..c7d23f745269 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
+++ b/metadata/md5-cache/app-admin/eclean-kernel-2.99.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/mgorny/eclean-kernel/archive/v2.99.2.tar.gz -> eclean-kernel-2.99.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95cbbeb9a478f754dafc8b8f1c293706
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.3 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.3
index 934c53d5a85c..46d083163d3e 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-2.99.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/mgorny/eclean-kernel/archive/v2.99.3.tar.gz -> eclean-kernel-2.99.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab50afe6eb52a7588305f0d35d7ef48c
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-9999 b/metadata/md5-cache/app-admin/eclean-kernel-9999
index 28f21ceee7aa..87814446c8c5 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-9999
+++ b/metadata/md5-cache/app-admin/eclean-kernel-9999
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_8(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e459a842f0618b4b859476d964e3feb
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index 587e4768f635..461df206865e 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -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/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12a9c1d70265e74521ea148d09ccd058
diff --git a/metadata/md5-cache/app-admin/gnome-abrt-1.3.6 b/metadata/md5-cache/app-admin/gnome-abrt-1.3.6
deleted file mode 100644
index 4b1844542140..000000000000
--- a/metadata/md5-cache/app-admin/gnome-abrt-1.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc app-text/xmlto ) virtual/pkgconfig >=sys-devel/gettext-0.17 >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install 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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.0.20:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-admin/abrt-2.10.10-r1 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A utility for viewing problems that have occurred with the system
-EAPI=7
-HOMEPAGE=https://github.com/abrt/gnome-abrt
-IUSE=doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.0.20:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-admin/abrt-2.10.10-r1 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.19[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/abrt/gnome-abrt/archive/1.3.6.tar.gz -> gnome-abrt-1.3.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc87a7d643665f1c204f42daee2c0405
diff --git a/metadata/md5-cache/app-admin/gnome-abrt-1.4.0 b/metadata/md5-cache/app-admin/gnome-abrt-1.4.0
index 35470a38359d..40a0df62e80f 100644
--- a/metadata/md5-cache/app-admin/gnome-abrt-1.4.0
+++ b/metadata/md5-cache/app-admin/gnome-abrt-1.4.0
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-text/asciidoc app-text/xmlto ) virtual/pkgconfig >=sys-devel/gettext-0.17 >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install 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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.14.0:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-admin/abrt-2.14.0 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.19[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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.14.0:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/abrt-2.14.0 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyxdg-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=A utility for viewing problems that have occurred with the system
 EAPI=8
 HOMEPAGE=https://github.com/abrt/gnome-abrt
-IUSE=doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.14.0:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-admin/abrt-2.14.0 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.19[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(-)?] >=x11-libs/gtk+-3.10.0:3 >=dev-libs/libreport-2.14.0:0=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/abrt-2.14.0 >=dev-python/pygobject-3.29.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyxdg-0.19[python_targets_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/abrt/gnome-abrt/archive/1.4.0.tar.gz -> gnome-abrt-1.4.0.tar.gz
 _eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63e83212c999edd69dbe1c31518205fd
+_md5_=83fc5cee4c61475431d5ff30e3252aa4
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.4-r2 b/metadata/md5-cache/app-admin/keepassxc-2.6.4-r2
deleted file mode 100644
index 2f958ab0efee..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ccache? ( dev-util/ccache ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=7
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser ccache keeshare +network test yubikey
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/keepassxc-2.6.4-src.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f52dc34be389760cf6e5f08bdd9d1e0
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.5 b/metadata/md5-cache/app-admin/keepassxc-2.6.5
deleted file mode 100644
index 38026a7e3ba9..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=7
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser ccache doc keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.6.5.tar.gz -> keepassxc-2.6.5.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd9e2c7f639db7a58e9443839674bae5
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index dc296af1d4ef..32737c867e78 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -1,8 +1,8 @@
 BDEPEND=ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=7
+EAPI=8
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype browser ccache doc keeshare +network test yubikey
 LICENSE=LGPL-2.1 GPL-2 GPL-3
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b30dcd26e1b7a8537ee333750373b894
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3fa41f122dbdbc74105cc7ebbb959760
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
index acba5e65c296..d06abe7050a0 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_8(-)?] dev-python/pyparsing[pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8d571d338fb6c04645cc0ec09fda149e
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
index 1ce727705f9e..fbacf3a14132 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docopt[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/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ccac1e6c495ee11a6c38fd9551847898
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13_p20201212 b/metadata/md5-cache/app-admin/ps_mem-3.13_p20201212
index 98c3f87e7c3e..9ce199ee0925 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13_p20201212
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13_p20201212
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/f26d3f416430d1e25659fa6dd5e7412029d8fa9c.tar.gz -> ps_mem-3.13_p20201212.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=c39a8ae0ec2eec40116eef729a036c79
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
deleted file mode 100644
index 82cb905989f3..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+++ /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 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_6.19.1-1focal_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=9134d597eab86b2808d6f3f4c6465c92
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2
new file mode 100644
index 000000000000..1a941aa7fd5e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2
@@ -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 virtual/libcrypt:= 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 virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=4fe57d617b4b61aecbddc09b71ca25d1
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.10.0 b/metadata/md5-cache/app-admin/puppet-agent-7.10.0
deleted file mode 100644
index 5be30fde0d30..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-7.10.0
+++ /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.10.0-1focal_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=ddb938da7f861b21a21937d6f72a3a44
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1 b/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1
new file mode 100644
index 000000000000..9414f7be3d3f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1
@@ -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 virtual/libcrypt:= 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 virtual/libcrypt:= 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.10.0-1focal_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=6b585a3670450a3b0a2a6d4c6b775747
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.11.0 b/metadata/md5-cache/app-admin/puppet-agent-7.11.0
deleted file mode 100644
index 4be3d1a8395c..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-7.11.0
+++ /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.11.0-1focal_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=34350fbf6223d9870033c8049249ad75
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1 b/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1
new file mode 100644
index 000000000000..65614d42feda
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1
@@ -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 virtual/libcrypt:= 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 virtual/libcrypt:= 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.11.0-1focal_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=46595034e84f5a15813f4bfd6b01bad1
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 569e64394e0b..eab8497a6992 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 35e0b1b2dbef..fe431e7eed2a 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf096e9938becafe3e1f4b34958e5b89
diff --git a/metadata/md5-cache/app-admin/salt-3000.8-r1 b/metadata/md5-cache/app-admin/salt-3000.8-r1
index 660ace95607c..d31f01c79476 100644
--- a/metadata/md5-cache/app-admin/salt-3000.8-r1
+++ b/metadata/md5-cache/app-admin/salt-3000.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test ) test
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.8.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd686e80c96f0fc5e94d7871efb7595c
diff --git a/metadata/md5-cache/app-admin/salt-3000.9-r1 b/metadata/md5-cache/app-admin/salt-3000.9-r1
index d6e37c14f173..ffe2eaa846f9 100644
--- a/metadata/md5-cache/app-admin/salt-3000.9-r1
+++ b/metadata/md5-cache/app-admin/salt-3000.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.9.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64bd26c3f37add4a113dc37d2711765b
diff --git a/metadata/md5-cache/app-admin/salt-3001.6-r1 b/metadata/md5-cache/app-admin/salt-3001.6-r1
index 969e63b96763..9c0c4d9f949c 100644
--- a/metadata/md5-cache/app-admin/salt-3001.6-r1
+++ b/metadata/md5-cache/app-admin/salt-3001.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3001.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29dbea826d7028feb0c2d3e83af19ac6
diff --git a/metadata/md5-cache/app-admin/salt-3001.8 b/metadata/md5-cache/app-admin/salt-3001.8
index 3c66d28cdb01..0b3c5b58157b 100644
--- a/metadata/md5-cache/app-admin/salt-3001.8
+++ b/metadata/md5-cache/app-admin/salt-3001.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3001.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6349051bf2880821893e2f4f87371ea4
diff --git a/metadata/md5-cache/app-admin/salt-3002.5-r1 b/metadata/md5-cache/app-admin/salt-3002.5-r1
index 62e3fa4bc6d1..50c9c3392d78 100644
--- a/metadata/md5-cache/app-admin/salt-3002.5-r1
+++ b/metadata/md5-cache/app-admin/salt-3002.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3002.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a56136d24ade8dfaca38f6c2ebd65745
diff --git a/metadata/md5-cache/app-admin/salt-3002.7 b/metadata/md5-cache/app-admin/salt-3002.7
index 977b198ee16f..333eb79361be 100644
--- a/metadata/md5-cache/app-admin/salt-3002.7
+++ b/metadata/md5-cache/app-admin/salt-3002.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3002.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1b7860694b57555009eb398f159121f
diff --git a/metadata/md5-cache/app-admin/salt-3003-r1 b/metadata/md5-cache/app-admin/salt-3003-r1
index 10aea114e9f8..0fdbfe6bde1f 100644
--- a/metadata/md5-cache/app-admin/salt-3003-r1
+++ b/metadata/md5-cache/app-admin/salt-3003-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f13d2d01bbd5398d0fad0b7713bf8d13
diff --git a/metadata/md5-cache/app-admin/salt-3003.1-r1 b/metadata/md5-cache/app-admin/salt-3003.1-r1
index 65f44aa4d611..4080d3fc36df 100644
--- a/metadata/md5-cache/app-admin/salt-3003.1-r1
+++ b/metadata/md5-cache/app-admin/salt-3003.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b7679942a235da5cfb9582cb8aacfdc
diff --git a/metadata/md5-cache/app-admin/salt-3003.3 b/metadata/md5-cache/app-admin/salt-3003.3
index 9e3dc42550e4..88f965409f5e 100644
--- a/metadata/md5-cache/app-admin/salt-3003.3
+++ b/metadata/md5-cache/app-admin/salt-3003.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=830dc678f0872b9ada94809d0c5a54ee
diff --git a/metadata/md5-cache/app-admin/setools-4.3.0 b/metadata/md5-cache/app-admin/setools-4.3.0
index a9e8b19ce8d2..c5eabc37c34d 100644
--- a/metadata/md5-cache/app-admin/setools-4.3.0
+++ b/metadata/md5-cache/app-admin/setools-4.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.3.0/setools-4.3.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=887fc9cab8913b7b8490fed9cf25ae3e
diff --git a/metadata/md5-cache/app-admin/setools-4.4.0-r2 b/metadata/md5-cache/app-admin/setools-4.4.0-r2
index e91e404fbb40..e9e2b0267292 100644
--- a/metadata/md5-cache/app-admin/setools-4.4.0-r2
+++ b/metadata/md5-cache/app-admin/setools-4.4.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.0/setools-4.4.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bb6928d78d84972aba2a41a6b26aebd
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index 7febf16fb17c..80816ace78dc 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7946193ac09fefd649754f6d4a85af7d
diff --git a/metadata/md5-cache/app-admin/supervisor-4.2.0 b/metadata/md5-cache/app-admin/supervisor-4.2.0
index c8da5ca3a997..f6efe833c599 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.2.0
+++ b/metadata/md5-cache/app-admin/supervisor-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed06d74eac891d6286dd1368d1973693
diff --git a/metadata/md5-cache/app-admin/supervisor-4.2.1 b/metadata/md5-cache/app-admin/supervisor-4.2.1
index 1730800aee1b..c74653641bf5 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.2.1
+++ b/metadata/md5-cache/app-admin/supervisor-4.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=mirror://pypi/s/supervisor/supervisor-4.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67a3c55cbd1bf695be059af44f5d240c
diff --git a/metadata/md5-cache/app-admin/supervisor-4.2.2 b/metadata/md5-cache/app-admin/supervisor-4.2.2
index ce8459fc275a..0a9095847b38 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.2.2
+++ b/metadata/md5-cache/app-admin/supervisor-4.2.2
@@ -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/supervisor/supervisor-4.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc6fe23091f62b8ef87b81e442e7f44a
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.33.2 b/metadata/md5-cache/app-admin/syslog-ng-3.33.2
index 21b84ca07fae..b751cff3960b 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.33.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.33.2
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.33.2/syslog-ng-3.33.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a8e19ddf34781d96771bee62ee93b00
+_md5_=fc3908c50aa80a6f58912fe792cd7841
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r2 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r2
deleted file mode 100644
index f0e513f85bc4..000000000000
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.4 >=net-libs/libnetfilter_acct-1.0.3 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) nflog? ( >=net-libs/libnetfilter_log-1.0.1 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
-DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
-EAPI=7
-HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
-IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog kernel_linux
-KEYWORDS=amd64 ~ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.4 >=net-libs/libnetfilter_acct-1.0.3 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) nflog? ( >=net-libs/libnetfilter_log-1.0.1 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) acct-user/ulogd acct-group/ulogd selinux? ( sec-policy/selinux-ulogd )
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aa5db0fd7e4a5005d90db0d42debec27
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r3 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r3
new file mode 100644
index 000000000000..119183b6928d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7-r3
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson:= ) nfacct? ( >=net-libs/libmnl-1.0.4 >=net-libs/libnetfilter_acct-1.0.3 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) nflog? ( >=net-libs/libnetfilter_log-1.0.1 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
+IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog kernel_linux
+KEYWORDS=amd64 ~ia64 ppc x86
+LICENSE=GPL-2
+RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson:= ) nfacct? ( >=net-libs/libmnl-1.0.4 >=net-libs/libnetfilter_acct-1.0.3 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) nflog? ( >=net-libs/libnetfilter_log-1.0.1 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) acct-user/ulogd acct-group/ulogd selinux? ( sec-policy/selinux-ulogd )
+SLOT=0
+SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8f488ffc1b481afea466853efca6c7f5
diff --git a/metadata/md5-cache/app-admin/vault-1.8.3 b/metadata/md5-cache/app-admin/vault-1.8.3
new file mode 100644
index 000000000000..a9df2463da94
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.8.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.8.3.tar.gz -> vault-1.8.3.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.8.3-webui.tar.xz ) mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/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.6.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.zip -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.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.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip 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//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//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//git.apache.org/thrift.git/@v/v0.12.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v44.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.7.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!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.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.zip -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.mod -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.13.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.zip -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.zip -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.mod -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.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/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190412020505-60e2075261b6.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.zip -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.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/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.zip -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.mod -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.zip -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.mod -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/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.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.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/aws/aws-sdk-go-v2/@v/v1.3.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.zip -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.mod -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.0.0-20171023180738-a3a6125de932.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.zip -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.zip -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.mod -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod mirror://goproxy//github.com/c2h5oh/datasize/@v/v0.0.0-20200112174442-28bbd4740fee.mod -> github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.zip -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.mod -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.zip -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.mod -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/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.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.zip -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.mod -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 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/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190827140505-75bee3e2ccb6.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190827140505-75bee3e2ccb6.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.zip -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.mod -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 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-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.zip -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.mod -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.zip -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.mod -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip 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/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200319182547-c7ad2b866182.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.zip -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.mod -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.zip -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.mod -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.zip -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.mod -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.4.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.zip -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.mod -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.zip -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.mod -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.zip -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.mod -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20170215233205-553a64147049.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-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-metrics-stackdriver/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180628210949-0892b62f0d9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.zip -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.mod -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.zip -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.mod -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.6.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.zip -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.mod -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.zip -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.mod -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.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-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.zip -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.mod -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.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-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2-0.20191002163536-9c6bd3e3eb17.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/huaweicloud/golangsdk/@v/v0.0.0-20200304081349-45ec0797f2a4.mod -> github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.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/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.zip -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.zip -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.zip -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.mod -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.zip -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.mod -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.zip -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.mod -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.zip -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.mod -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.zip -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.mod -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.zip -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.mod -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.3.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.zip -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/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/lestrrat-go/jwx/@v/v0.9.0.mod -> github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/lib/pq/@v/v0.0.0-20180327071824-d34b9ff171c2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.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-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-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.zip -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.mod -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.zip -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.mod -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.zip -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.mod -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.zip -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.mod -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.zip -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.mod -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/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/nwaples/rardecode/@v/v1.1.0.zip -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.mod -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.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.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.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/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.zip -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.mod -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.3.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.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/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.4+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.zip -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.zip -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.mod -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v0.0.0-20180815053127-5633e0862627.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/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/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-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-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/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/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip 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/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.zip -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.mod -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180725160413-e900ae048470.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180725160413-e900ae048470.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.zip -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/square/go-jose/@v/v2.4.1+incompatible.mod -> github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/square/go-jose/v3/@v/v3.0.0-20200225220504-708a9fe87ddc.mod -> github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.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.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yandex-cloud/go-genproto/@v/v0.0.0-20200722140432-762fe965ce77.mod -> github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod mirror://goproxy//github.com/yandex-cloud/go-sdk/@v/v0.0.0-20200722140627-2194e5077f13.mod -> github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod mirror://goproxy//github.com/yhat/scrape/@v/v0.0.0-20161128144610-24b7890b0945.mod -> github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.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.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.zip -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.mod -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.19.1.mod -> go.opencensus.io%2F@v%2Fv0.19.1.mod mirror://goproxy//go.opencensus.io/@v/v0.19.2.mod -> go.opencensus.io%2F@v%2Fv0.19.2.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/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-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-20181217174547-8f45f776aaf1.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181217174547-8f45f776aaf1.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200320220750-118fecf932d8.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.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-20200505041828-1ed23360d12c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201002202402-0a1ea396d57c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.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-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/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-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-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181218192612-074acd46bca6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181218192612-074acd46bca6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190712062909-fae7ac547cb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200409092240-59c9f1ba88fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.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-20210514084401-e8d321eab015.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.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-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181219222714-6e267b5cc78e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181219222714-6e267b5cc78e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190424220101-1e8e1cfdf96b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190718200317-82a3ea8a504c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20200409170454-77362c5149f0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200416214402-fc959738d646.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200521155704-91d71f6c2f04.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod mirror://goproxy//golang.org/x/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-20181220000619-583d854617af.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod mirror://goproxy//google.golang.org/api/@v/v0.2.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.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/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.21.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.21.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.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181219182458-5a97ab628bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181219182458-5a97ab628bfb.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-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200323114720-3f67cca34472.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.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-20200409111301-baae70f3302d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200416231807-8751e049a2a0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.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.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.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.zip -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.mod -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.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.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-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-20180920025451-e3ad64cb4ed3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180920025451-e3ad64cb4ed3.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.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190409092523-d687e77c8ae9.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190409092423-760d1845f48b.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20190306015804-8e90cee79f82.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.zip -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.mod -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=694cecb6b71f1d00e28a67a1a81461a4
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r2 b/metadata/md5-cache/app-admin/webapp-config-1.55-r2
index 7aa52148e2e3..cdff973e6cd8 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r2
@@ -11,5 +11,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c8971d40e818563f690ae7170eb4de4
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index d65153d131d8..f686be36a6fd 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56463370df552e13ed53db46e1aae3ce
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.2 b/metadata/md5-cache/app-admin/xkcdpass-1.19.2
index 0cb7aff722d3..755b8d6d9d21 100644
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.2
+++ b/metadata/md5-cache/app-admin/xkcdpass-1.19.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_8 python_targets_pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xkcdpass/xkcdpass-1.19.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ea067280cb67b9f94384ccd293e8073
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.3 b/metadata/md5-cache/app-admin/xkcdpass-1.19.3
index 53cba6325084..6c8d84554e5a 100644
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.3
+++ b/metadata/md5-cache/app-admin/xkcdpass-1.19.3
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_8 python_targets_pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xkcdpass/xkcdpass-1.19.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=861738ffedc3fcf620f0dc18b64cf139
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index f4efa7fd7308..9ea307c745f9 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
index 3a338109f02f..9b7c902a1eae 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=7
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) dev-libs/openssl:0= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
 REQUIRED_USE=libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a8b28110ad12d3331f5e5b0dc74162f
+_md5_=f02a3821566fa3e4de7215392d1f902b
diff --git a/metadata/md5-cache/app-antivirus/fangfrisch-1.4.0 b/metadata/md5-cache/app-antivirus/fangfrisch-1.4.0
index 8ab2ac0e2071..a51354cdda0a 100644
--- a/metadata/md5-cache/app-antivirus/fangfrisch-1.4.0
+++ b/metadata/md5-cache/app-antivirus/fangfrisch-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rseichter/fangfrisch/archive/1.4.0.tar.gz -> fangfrisch-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a4aec40f01c60069b9020382b007d6a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c44b9863035f..acfe9f223646 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/advancecomp-2.2_pre20190301 b/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
index 91ea3b843416..bdf741bc64eb 100644
--- a/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
+++ b/metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
@@ -4,11 +4,11 @@ DEPEND=app-arch/bzip2:= sys-libs/zlib:=
 DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
 EAPI=7
 HOMEPAGE=https://www.advancemame.it/comp-readme.html
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ Apache-2.0 LGPL-2.1+ MIT
 RDEPEND=app-arch/bzip2:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/amadvance/advancecomp/archive/fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz -> advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c4d72061cf8b6edcf2f7866a8611665
+_md5_=abe5c4916b55cc2af7fdcdf52dc93480
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
index 850b7044d96e..69644e9b13cc 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7bd5f9dc0797605f42aebddd50a61c5
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 cf36f7d944cc..07c690ac4640 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 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	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _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 e5d8236772a0..d88e85abff9e 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r2
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 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	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=56de6ee6b194d7d32734ccb70b22e637
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 522a12a13ad6..4c76746ad6e1 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r3
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 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	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f733ac6089721dc02fc72ea58f9df91e
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 47fdf32fb348..e1d565c2b6ab 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_t
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=056c7a25bbe2fc2765584096200492eb
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.3.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.3.0
deleted file mode 100644
index f29eb7eaa363..000000000000
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.16.0
-DESCRIPTION=Qt GUI File Archiver
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.16.0
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.3.0/lxqt-archiver-0.3.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc627bcc5173a1dff8a24973f2ea7e26
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 546f1362f777..052382129760 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=390a86ea0e0e699ada17c2afc418660e
diff --git a/metadata/md5-cache/app-arch/pax-20201030 b/metadata/md5-cache/app-arch/pax-20201030
index 688a5b7d1e08..7012feecc37f 100644
--- a/metadata/md5-cache/app-arch/pax-20201030
+++ b/metadata/md5-cache/app-arch/pax-20201030
@@ -4,10 +4,10 @@ DEPEND=elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=pax (Portable Archive eXchange) is the POSIX standard archive tool
 EAPI=7
 HOMEPAGE=https://www.mirbsd.org/pax.htm
-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=BSD
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20201030.cpio.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eaee3c6d32f8e9935aff94ad763fe766
+_md5_=c7a9a2904dd7a03e531fba8fbd458830
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index e7d9e3f149f0..f5d95fc4db54 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=619e80dc907ef97996c8a9a99d0df24b
diff --git a/metadata/md5-cache/app-arch/unrpa-2.3.0 b/metadata/md5-cache/app-arch/unrpa-2.3.0
index 2c1839dadf6c..80f62d1213a8 100644
--- a/metadata/md5-cache/app-arch/unrpa-2.3.0
+++ b/metadata/md5-cache/app-arch/unrpa-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/2.3.0.tar.gz -> unrpa-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42209a1f1ea6aa953d10fe9f089b59e2
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 2302f4fb0faa..30d2e25d2079 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ec846d64306afd7f444e95e2df51047a
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index 3fae020dfac5..f473a29f0774 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c02a119764cdf3fd6b4d18ceedf4fbc4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c55741ab4891..620cfe852ab9 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/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
index e53cf682a545..f05b522fab2a 100644
--- a/metadata/md5-cache/app-backup/attic-0.16-r1
+++ b/metadata/md5-cache/app-backup/attic-0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71bd3cf3844e623b6ba130ba0f5de79e
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index 0b670087ab49..e16480e2e57c 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/msgpack[python_targets_python3_8(-)?] dev-libs/openssl:0= dev-python/llfuse[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71bd3cf3844e623b6ba130ba0f5de79e
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.12 b/metadata/md5-cache/app-backup/bareos-18.2.12
deleted file mode 100644
index 62b821120847..000000000000
--- a/metadata/md5-cache/app-backup/bareos-18.2.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.12.tar.gz -> bareos-18.2.12.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b2aa08d2fa780337250fdeb3118de66
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.12-r1 b/metadata/md5-cache/app-backup/bareos-18.2.12-r1
new file mode 100644
index 000000000000..e3c7d20427db
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-18.2.12-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=http://www.bareos.org/
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.12.tar.gz -> bareos-18.2.12.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1757f0ae4eb26f5bdcd99bd793fc7cf6
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.11 b/metadata/md5-cache/app-backup/bareos-19.2.11
deleted file mode 100644
index b32a607285cf..000000000000
--- a/metadata/md5-cache/app-backup/bareos-19.2.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
-REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.11.tar.gz -> bareos-19.2.11.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1940714a24c3715bba7b9492f8199235
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.11-r1 b/metadata/md5-cache/app-backup/bareos-19.2.11-r1
new file mode 100644
index 000000000000..a3d2df74dc3d
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-19.2.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
+REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.11.tar.gz -> bareos-19.2.11.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5e09a039bed0a72be818a1998613205
diff --git a/metadata/md5-cache/app-backup/bareos-20.0.3 b/metadata/md5-cache/app-backup/bareos-20.0.3
deleted file mode 100644
index 64139957bc3b..000000000000
--- a/metadata/md5-cache/app-backup/bareos-20.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) vmware? ( dev-lang/python:2.7 )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax vmware xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) vmware? ( dev-lang/python:2.7 ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
-REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/20.0.3.tar.gz -> bareos-20.0.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5d7557e7dea6dfef85175ce66bc2dc4
diff --git a/metadata/md5-cache/app-backup/bareos-20.0.3-r2 b/metadata/md5-cache/app-backup/bareos-20.0.3-r2
new file mode 100644
index 000000000000..824dec77523f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-20.0.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax vmware xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson:= ) ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
+REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/20.0.3.tar.gz -> bareos-20.0.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0e311077e72590a3982c4d139dfff422
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.15 b/metadata/md5-cache/app-backup/borgbackup-1.1.15
index f08874ee8303..34827d74438d 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.15
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.15
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=825f7f6087cc957a2341c085791245d1
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.16 b/metadata/md5-cache/app-backup/borgbackup-1.1.16
index 7a7a7306617f..5e822f6b0d2e 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.16
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.16
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aad794b12723094a401b8d4cb3b452b6
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1 b/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
index 07ffdee71341..95f60489360c 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.17.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55c68abe0bad4dbe91905ace1c3c740a
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index a4f03e93d9ca..edd86d1af118 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=636ae820f1ffdf6dec6dbe5f2641a830
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.15 b/metadata/md5-cache/app-backup/borgmatic-1.5.15
index 722a96e83f58..1d46bb91b966 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.15
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.15
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a309074f4af1392bdc2600073342731
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.18 b/metadata/md5-cache/app-backup/borgmatic-1.5.18
index 3d2d808bf934..f0daf14f7ab8 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.18
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.18
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be381851d29f9debba1f18c01d79f996
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
index 76e2459aa2a6..fb92d734a4c8 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8567a58d439e664fd057e7505a466f9b
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
index cf4ff5db0600..fefc4dc553b9 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.3.0
+++ b/metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8567a58d439e664fd057e7505a466f9b
diff --git a/metadata/md5-cache/app-backup/dar-2.7.2 b/metadata/md5-cache/app-backup/dar-2.7.2
new file mode 100644
index 000000000000..f94717f6a6e8
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.7.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:1= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=8
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:1= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.7.2.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8eadfa1c62ef475925d17505427ff08c
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.19 b/metadata/md5-cache/app-backup/duplicity-0.8.19
index 1721761794b4..52cef1a85124 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.19
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.19
@@ -12,5 +12,5 @@ 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.19/+download/duplicity-0.8.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90fd6c7e5641c96f1f15399c6509ac3b
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.20 b/metadata/md5-cache/app-backup/duplicity-0.8.20
index 2ce0e4950b45..0f93e9d23cf0 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.20
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.20
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd7763531e56858a55e1a1bd57a7138a
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.0 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
index 0d67b5f85b2a..c3a945e5e63d 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_8(-)?] dev-python/pyxattr[pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.0/rdiff-backup-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=feb06d2b9e1ba80179b094969b2019c0
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
index d480ad06d153..95c2e82fa23d 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.5/rdiff-backup-2.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=767c72913b2a0868f81ba238df8a5cf9
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
index 060e650b896f..9303c4b7ef4e 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95820fd1b0ed93f3fd9519de71e53271
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0 b/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
index 2ca8c2c2293e..a5f6f68b3fb2 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e855aa1aa169f94e50e9728b9985456
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index dc740be339a0..344e420aeec2 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.13.03 b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.03
deleted file mode 100644
index 91b3bcb5010f..000000000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=7
-HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
-SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.13.03.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03c63513d7627dd1a0058eace7b13794
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04 b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04
new file mode 100644
index 000000000000..75e38a23643c
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.13.04.tar.xz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=03c63513d7627dd1a0058eace7b13794
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 790cddb7ae1d..a7b4233e0dca 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/brasero-3.12.3 b/metadata/md5-cache/app-cdr/brasero-3.12.3
new file mode 100644
index 000000000000..1ddcf6244d7b
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/intltool-0.50 dev-util/itstool >=dev-util/gtk-doc-am-1.12 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.3 ) app-text/yelp-tools gnome-base/gnome-common sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( app-misc/tracker:3= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CD/DVD burning application for the GNOME desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
+IUSE=+css +introspection +libburn mp3 nautilus playlist test tracker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+PDEPEND=gnome-base/gvfs
+RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( app-misc/tracker:3= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/cdrtools app-cdr/dvd+rw-tools )
+RESTRICT=!test? ( test )
+SLOT=0/3.1
+SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.3.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3eaa6843a045ff130443ceacd5f4559f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fb531c42ce0e..5943ad7e4850 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.17.0 b/metadata/md5-cache/app-crypt/acme-1.17.0
index bc330af89f4d..12e2ac400b54 100644
--- a/metadata/md5-cache/app-crypt/acme-1.17.0
+++ b/metadata/md5-cache/app-crypt/acme-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.17.0.tar.gz -> certbot-1.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68dfdb3d537c2b088ba7872c7c6a049f
diff --git a/metadata/md5-cache/app-crypt/acme-1.18.0-r1 b/metadata/md5-cache/app-crypt/acme-1.18.0-r1
index e27b6b1bc712..cd56d308ad92 100644
--- a/metadata/md5-cache/app-crypt/acme-1.18.0-r1
+++ b/metadata/md5-cache/app-crypt/acme-1.18.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=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10205a480c529377199a51612cefdece
diff --git a/metadata/md5-cache/app-crypt/acme-1.19.0 b/metadata/md5-cache/app-crypt/acme-1.19.0
index 5869aeeede7a..7151f5be692d 100644
--- a/metadata/md5-cache/app-crypt/acme-1.19.0
+++ b/metadata/md5-cache/app-crypt/acme-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=020d1a106690b6b647caddeda921e4a4
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index dea4f3c26ed3..68cf5309842e 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=020d1a106690b6b647caddeda921e4a4
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.1.0 b/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
index cc17b7fdd061..99a26a01d6c1 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0 python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.1.0.tar.gz -> acme-tiny-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcf89e565827fcbc47bfb7517a0bf4c7
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-9999 b/metadata/md5-cache/app-crypt/acme-tiny-9999
index 9b7f80d746ca..af9ca3e61fc9 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-9999
+++ b/metadata/md5-cache/app-crypt/acme-tiny-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7e030b2cc699747f6c9386ba25b4156
diff --git a/metadata/md5-cache/app-crypt/certbot-1.17.0 b/metadata/md5-cache/app-crypt/certbot-1.17.0
index 01628d7268b9..6ff032f76970 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.17.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-1.17.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.17.0.tar.gz -> certbot-1.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ccc15512e7f9209b5788ff824263c77f
diff --git a/metadata/md5-cache/app-crypt/certbot-1.18.0 b/metadata/md5-cache/app-crypt/certbot-1.18.0
index bafb3bbb4970..273f51785b93 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.18.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ad7e3f0d4a7738e35b0deb3902a101f
diff --git a/metadata/md5-cache/app-crypt/certbot-1.19.0 b/metadata/md5-cache/app-crypt/certbot-1.19.0
index 4e88d0579702..a2ef38986e89 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c82f965cc91e1305643b6e9d50723c73
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 3758a87a2241..c7601e8758a4 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c82f965cc91e1305643b6e9d50723c73
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.17.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.17.0
index 29284e8169a5..4baaeb38687b 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.17.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-1.17.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.17.0.tar.gz -> certbot-1.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28fccfabedb5b12e5310f1b139ce0088
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.18.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.18.0
index a91cc4078647..a8055a9eadac 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.18.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f75df8fc983b59753ed6d1fdd8030b6
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.19.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
index 5543d0f736d4..d9cdd097dbe6 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2937a2f0a1a646baa44adc99ed8f7ae9
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 19b37a46895f..028c9369cf7a 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2937a2f0a1a646baa44adc99ed8f7ae9
diff --git a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1 b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
index 7a05ee87c6df..c7d87127d058 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
+++ b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/certbot-0.31.0[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-dns-nsone-0.39.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ce26f55d3c1fe4d81be40f0cddc8d19
diff --git a/metadata/md5-cache/app-crypt/certbot-dns-nsone-1.18.0 b/metadata/md5-cache/app-crypt/certbot-dns-nsone-1.18.0
index d3074866e385..0975fa8fdfb1 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-nsone-1.18.0
+++ b/metadata/md5-cache/app-crypt/certbot-dns-nsone-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-dns-nsone-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd0381886c7d54e5c0c3064916aa3602
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.17.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.17.0
index 2842fd0b6a47..89af3f149d6d 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.17.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-1.17.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.17.0.tar.gz -> certbot-1.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ec81ba9c9bd4d676249fa60462aae666
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0
index b3bd79b3a41f..07f40b3d1d02 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7181e0a6a0d85a66932bcbe7c8dd5a1
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
index b3dfdbc85246..8cb35d27286b 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56f218daad0a9b500bece0425d65b488
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index f8247988ad8b..b3d3094f9e97 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56f218daad0a9b500bece0425d65b488
diff --git a/metadata/md5-cache/app-crypt/glep63-check-10 b/metadata/md5-cache/app-crypt/glep63-check-10
index ab01732f86f7..0118260e101f 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-10
+++ b/metadata/md5-cache/app-crypt/glep63-check-10
@@ -1,6 +1,6 @@
 BDEPEND=test? ( app-crypt/gnupg 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(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( sys-libs/libfaketime )
+DEPEND=test? ( >=app-crypt/gnupg-2.2.29 sys-libs/libfaketime )
 DESCRIPTION=GLEP 63 compliance checker for OpenPGP keys
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/glep63-check/
@@ -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/mgorny/glep63-check/archive/v10.tar.gz -> glep63-check-10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7decdae42549423c05da83d4915de34
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5568e0f9bcbd56ce99a8ffded6d731e8
diff --git a/metadata/md5-cache/app-crypt/glep63-check-9 b/metadata/md5-cache/app-crypt/glep63-check-9
index 138a9449a27c..67b03c8991d1 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-9
+++ b/metadata/md5-cache/app-crypt/glep63-check-9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( pytho
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/glep63-check/archive/v9.tar.gz -> glep63-check-9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dee2c6b87c39dc1d5927c88f873b43e2
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.15.1 b/metadata/md5-cache/app-crypt/gpgme-1.15.1
index a8b7ea738863..87ad61fd8c7f 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.15.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.15.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 597d8a437f31..9610516937d6 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.16.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.16.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=483130733737d14b4b7158ca760f82d2
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-1.3.2 b/metadata/md5-cache/app-crypt/ima-evm-utils-1.3.2
new file mode 100644
index 000000000000..70b3f81f0926
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( app-editors/vim-core ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
+DESCRIPTION=Supporting tools for IMA and EVM
+EAPI=7
+HOMEPAGE=http://linux-ima.sourceforge.net
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/linux-ima/ima-evm-utils-1.3.2.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=de6ca404a15202966f551298bc8a2b2b
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-9999 b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
index 66c5bca9ac42..90a5c53ea64d 100644
--- a/metadata/md5-cache/app-crypt/ima-evm-utils-9999
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
@@ -1,12 +1,14 @@
+BDEPEND=app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt test? ( app-editors/vim-core ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/openssl:0= sys-apps/keyutils:= app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
 DESCRIPTION=Supporting tools for IMA and EVM
-EAPI=6
+EAPI=7
 HOMEPAGE=http://linux-ima.sourceforge.net
-IUSE=debug
+IUSE=debug test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= sys-apps/keyutils:=
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56c5e1ffb398b0c3d4d087dcd67482ad
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a209fb2a92c6e1b05c916cc72baf7a5
diff --git a/metadata/md5-cache/app-crypt/pius-3.0.0-r1 b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
index ec307cd961d2..62948a740b15 100644
--- a/metadata/md5-cache/app-crypt/pius-3.0.0-r1
+++ b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaymzh/pius/releases/download/v3.0.0/pius-3.0.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc955c97025afe8570aca3d63a6fe445
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.6.0 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.6.0
deleted file mode 100644
index f02e5b3da179..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive 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 python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools[fapi?] !fapi? ( app-crypt/tpm2-tss ) fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] ) dev-db/sqlite:3 dev-libs/openssl:= dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A PKCS#11 interface for TPM2 hardware
-EAPI=7
-HOMEPAGE=https://tpm2-software.github.io/
-IUSE=fapi python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools[fapi?] !fapi? ( app-crypt/tpm2-tss ) fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] ) dev-db/sqlite:3 dev-libs/openssl:= dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1-modules[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[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.6.0/tpm2-pkcs11-1.6.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1b7a60fc42b24117e2485602efd78aa
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.7.0 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.7.0
new file mode 100644
index 000000000000..fbd6a5ba72d7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-util/cmocka ) app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools[fapi?] !fapi? ( app-crypt/tpm2-tss ) fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] ) dev-db/sqlite:3 dev-libs/libyaml dev-libs/openssl:= dev-python/bcrypt[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/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=A PKCS#11 interface for TPM2 hardware
+EAPI=8
+HOMEPAGE=https://tpm2-software.github.io/
+IUSE=fapi test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools[fapi?] !fapi? ( app-crypt/tpm2-tss ) fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] ) dev-db/sqlite:3 dev-libs/libyaml dev-libs/openssl:= dev-python/bcrypt[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/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.7.0/tpm2-pkcs11-1.7.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff3c71923f9f292209d70ca9eac6078f
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2
index 143bce0e0e07..18cf5a5b4b28 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb3c38456b99b0d591d5cff39a615dbd
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0
index e6a81fc8ef19..39c80d806bdf 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc45a43fbadf9b3a6116fa36a5d71022
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
index c462da04bb46..30577dd617b5 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ff50bb28b5aea5dbb1254d9b9b0a893
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
index 6a1179600c73..6b5d077a4c8a 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c78b4a1ecad16cfba4bc8413c495f96
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index cddcab5c9baf..64f22e6c5623 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/bookview-3.2.1 b/metadata/md5-cache/app-dicts/bookview-3.2.1
index 5fa7dffb57fb..7451e3f5f0cc 100644
--- a/metadata/md5-cache/app-dicts/bookview-3.2.1
+++ b/metadata/md5-cache/app-dicts/bookview-3.2.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/tk:0
 DESCRIPTION=NDTP client written in Tcl/Tk
 EAPI=7
 HOMEPAGE=http://www.sra.co.jp/people/m-kasahr/bookview/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/tk:0
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/bookview-3.2.1.tar.gz
-_md5_=9bb7ede90b6b591688b3fd6c3bee9010
+_md5_=0e44309bb0c69788ec48939dca8dd7dd
diff --git a/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1 b/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
index fc824e86171f..0c0085f2b5cb 100644
--- a/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
+++ b/metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
 EAPI=7
 HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=FDL-1.3
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=mirror://gnu/vera/vera-1.24.tar.gz
-_md5_=76f9feab3d3007fc93bb25c1678f4209
+_md5_=1f7cb9a15c1c951f020084ae958adec2
diff --git a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33-r1 b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33-r1
index e4608bf25eb4..3d5d94a1f47c 100644
--- a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33-r1
+++ b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=WordNet for dict
 EAPI=7
 HOMEPAGE=https://wordnet.princeton.edu
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=Princeton
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=3fc4ce5f7041be86dfc0de470b148935
+_md5_=7f03347d3708bdc472f4c179fdfeb956
diff --git a/metadata/md5-cache/app-dicts/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index 6d9c45db47e8..d2a7fe890bf1 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -5,10 +5,10 @@ DESCRIPTION=Dictionary application that implements the Dict protocol
 EAPI=7
 HOMEPAGE=https://www.dikt.tv/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-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/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !app-dicts/dikt:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://bitbucket-archive.softwareheritage.org/static/67/67f37093-df38-43b8-845b-2952e0a33bb3/attachments/dikt-2s1.txz -> dikt-2s1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3e0c65bae78b025216532f9b623b55d
+_md5_=1b84957a9f4aa5cff8b30e8cef23608d
diff --git a/metadata/md5-cache/app-dicts/eblook-1.6.1 b/metadata/md5-cache/app-dicts/eblook-1.6.1
index ed7cad4dfb8c..4726b846e651 100644
--- a/metadata/md5-cache/app-dicts/eblook-1.6.1
+++ b/metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/eb-3.3.4
 DESCRIPTION=Interactive search utility for electronic dictionaries
 EAPI=7
 HOMEPAGE=http://openlab.ring.gr.jp/edict/eblook/
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=~amd64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/eb-3.3.4
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/edict/eblook/dist/eblook-1.6.1.tar.gz
-_md5_=77a70d066b2f1680e354617f6efa51da
+_md5_=51177bfee8a3e5aa9d9af2ef557c4df9
diff --git a/metadata/md5-cache/app-dicts/edictionary-2.6-r1 b/metadata/md5-cache/app-dicts/edictionary-2.6-r1
index d9b0faae8287..8da4b735ccb4 100644
--- a/metadata/md5-cache/app-dicts/edictionary-2.6-r1
+++ b/metadata/md5-cache/app-dicts/edictionary-2.6-r1
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Command line dictionary and thesaurus
 EAPI=6
 HOMEPAGE=http://edictionary.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/edictionary/edict-2.6.tar.gz
-_md5_=a5536e825b7955fcac73572b84d4c35c
+_md5_=6cfc1d891e1b4088f1795da41ff49cd3
diff --git a/metadata/md5-cache/app-dicts/freedict-deu-eng-1.0 b/metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
index 2e2eafeab7ee..a1fac3a1d41c 100644
--- a/metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from German to English
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/deu-eng.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=ee58dad289500149c482bd93a908f8e3
+_md5_=31fa556117b24fffc55e97763ce776e5
diff --git a/metadata/md5-cache/app-dicts/freedict-eng-fra-1.0 b/metadata/md5-cache/app-dicts/freedict-eng-fra-1.0
index 7f0739de0b73..07f7b374f0ec 100644
--- a/metadata/md5-cache/app-dicts/freedict-eng-fra-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-eng-fra-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from English to French
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/eng-fra.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=76ea0ceb8418d22a634b3ed919ad5744
+_md5_=b7a032a51b06c6e56496916e5dfa68a5
diff --git a/metadata/md5-cache/app-dicts/freedict-eng-ita-1.0 b/metadata/md5-cache/app-dicts/freedict-eng-ita-1.0
index 2cac934d6ee9..a1928a3bf2cd 100644
--- a/metadata/md5-cache/app-dicts/freedict-eng-ita-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-eng-ita-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from English to Italian
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/eng-ita.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=e43137314da85e14a39bbdcb8b34ba58
+_md5_=b4d954da7803f6c413310d60b4d94ee1
diff --git a/metadata/md5-cache/app-dicts/freedict-eng-swe-1.0 b/metadata/md5-cache/app-dicts/freedict-eng-swe-1.0
index 0d2fd99590a6..c31ee8e73ada 100644
--- a/metadata/md5-cache/app-dicts/freedict-eng-swe-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-eng-swe-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from English to Swedish
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/eng-swe.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=1a3226e30dbe68b63a0831f58be65e67
+_md5_=9c21b82ec656f50a0d76c8de5a73d9f1
diff --git a/metadata/md5-cache/app-dicts/freedict-fra-eng-1.0 b/metadata/md5-cache/app-dicts/freedict-fra-eng-1.0
index f3632d29f22d..3beec814f763 100644
--- a/metadata/md5-cache/app-dicts/freedict-fra-eng-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-fra-eng-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from French to English
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/fra-eng.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=12a8e86654cfa309ccb8bd5a1d215667
+_md5_=7b870c8d2cbd197e57504f32ab691bfa
diff --git a/metadata/md5-cache/app-dicts/freedict-ita-eng-1.0 b/metadata/md5-cache/app-dicts/freedict-ita-eng-1.0
index 1932b3a18ed9..b449c3953d35 100644
--- a/metadata/md5-cache/app-dicts/freedict-ita-eng-1.0
+++ b/metadata/md5-cache/app-dicts/freedict-ita-eng-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Freedict for language translation from Italian to English
 EAPI=7
 HOMEPAGE=http://freedict.sourceforge.net/en/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/dictd
 SLOT=0
 SRC_URI=http://freedict.sourceforge.net/download/linux/ita-eng.tar.gz
 _eclasses_=freedict	28afcb3a582b563f43bbb7525b375001
-_md5_=846b21dbda5587548cecf4481d29be55
+_md5_=d70492aa3fe96b96f0308514f885c6bb
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-40.0 b/metadata/md5-cache/app-dicts/gnome-dictionary-40.0
index d2ebcf85464c..7445c378aac7 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-40.0
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-40.0
@@ -5,10 +5,10 @@ DESCRIPTION=Dictionary utility for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
 IUSE=ipv6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.21.2:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dictionary/40/gnome-dictionary-40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51f27cbf87904e618550ff17c4ad8dc8
+_md5_=aea2df3222d3e0d87871133b255849b1
diff --git a/metadata/md5-cache/app-dicts/gwaei-3.6.2 b/metadata/md5-cache/app-dicts/gwaei-3.6.2
index 01e22c4c6b02..2639ed7d2c7b 100644
--- a/metadata/md5-cache/app-dicts/gwaei-3.6.2
+++ b/metadata/md5-cache/app-dicts/gwaei-3.6.2
@@ -5,11 +5,11 @@ DESCRIPTION=Japanese-English Dictionary for GNOME
 EAPI=7
 HOMEPAGE=http://gwaei.sourceforge.net/
 IUSE=gtk hunspell nls mecab test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-text/gnome-doc-utils-0.14.0 ) hunspell? ( app-text/hunspell ) nls? ( virtual/libintl ) mecab? ( app-text/mecab )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwaei/gwaei-3.6.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=10f87eca237f48612b8ef8532116774a
+_md5_=2d3c928595c8ea54b660fb67196799c6
diff --git a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2 b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
index 49ccc05e6f79..e1db280f218f 100644
--- a/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
+++ b/metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Japanese dictionary for ChaSen
 EAPI=7
 HOMEPAGE=http://sourceforge.jp/projects/ipadic/
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=ipadic
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/ipadic/24435/ipadic-2.7.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7609b32e388de11847c184e86921775
+_md5_=3ab9b0ee3d398372276aa83de8c71b0e
diff --git a/metadata/md5-cache/app-dicts/kasumi-2.5-r1 b/metadata/md5-cache/app-dicts/kasumi-2.5-r1
index ac8c34b8711a..32e7077ecaff 100644
--- a/metadata/md5-cache/app-dicts/kasumi-2.5-r1
+++ b/metadata/md5-cache/app-dicts/kasumi-2.5-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Anthy dictionary maintenance tool
 EAPI=7
 HOMEPAGE=http://kasumi.osdn.jp/
 IUSE=nls
-KEYWORDS=~alpha amd64 ppc sparc x86
+KEYWORDS=~alpha amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/anthy virtual/libiconv x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/kasumi/41436/kasumi-2.5.tar.gz
-_md5_=4d338f2a5a17ecb8ba75e07bfc6374f9
+_md5_=43843ecf6d3c6db687ebd136ebfe5f96
diff --git a/metadata/md5-cache/app-dicts/libydpdict-1.0.4 b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
index 7006f7d67f77..9e27ae7ff7ad 100644
--- a/metadata/md5-cache/app-dicts/libydpdict-1.0.4
+++ b/metadata/md5-cache/app-dicts/libydpdict-1.0.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library for handling the Collins Dictionary database
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/libydpdict
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libydpdict/archive/1.0.4.tar.gz -> libydpdict-1.0.4.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0943dbcebbbfc8ed84ade667fdd8d1eb
+_md5_=b87c7d6c9916ede27f2cc8b7f7acdf40
diff --git a/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2 b/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
index 0b8a353c62b9..c0ed5d97e83d 100644
--- a/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
+++ b/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip app-text/mecab
 DESCRIPTION=IPA dictionary for MeCab
 EAPI=6
 HOMEPAGE=https://osdn.jp/projects/unidic/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=|| ( BSD GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/unidic/58338/unidic-mecab-2.1.2_src.zip
-_md5_=01e0a661c2a892cb9e435e58113b4588
+_md5_=4355112d1bac4116901b05598d0a5fbf
diff --git a/metadata/md5-cache/app-dicts/migemo-dict-200812 b/metadata/md5-cache/app-dicts/migemo-dict-200812
index ee17f2f540aa..9ed018675786 100644
--- a/metadata/md5-cache/app-dicts/migemo-dict-200812
+++ b/metadata/md5-cache/app-dicts/migemo-dict-200812
@@ -3,8 +3,8 @@ DESCRIPTION=Dictionary files for the Migemo and C/Migemo
 EAPI=7
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
 IUSE=unicode
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/migemo-dict-200812.tar.bz2
-_md5_=1a6b38b0f48cef87a9dd85e1766ef42f
+_md5_=3fc5ef5e9c2ed842fc73c1bb9459bbd2
diff --git a/metadata/md5-cache/app-dicts/myspell-tr-1.2 b/metadata/md5-cache/app-dicts/myspell-tr-1.2
index 0fd354486017..b3008056c527 100644
--- a/metadata/md5-cache/app-dicts/myspell-tr-1.2
+++ b/metadata/md5-cache/app-dicts/myspell-tr-1.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Turkish dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/en/extensions/show/turkish-spellcheck-dictionary
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/oo-turkish-dict-v1-2.oxt
 _eclasses_=myspell-r2	ef7a68d04e0a4e113580dda8d3142612
-_md5_=914d02465c895351c8d2594321b79292
+_md5_=dd595754432e20f13b9f43d9c25c14b7
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 254628e516fe..1a9914aecf6f 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Dictionary files for PRIME input method
 EAPI=5
 HOMEPAGE=http://taiyaki.org/prime/
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=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 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0bd17095789e877f00c2839e3293870f
+_md5_=6e3c0518bd8ae6a36ce995e26f27bfec
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
index 8529c4934e2c..7a340ff71a85 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cdict-big5-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=9cb5a4cc39685b2ac07094ebed4b689f
+_md5_=b27804f9c00f555874ac91a2cc2d10af
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
index 29d7e4c13a94..5257486b781d 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cdict-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=feadab5829a32c0fb69d767740918465
+_md5_=7cf1a86197908a53e14f074524050611
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
index 335bae343591..971dc158e409 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cedict-big5-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=4671bbe01a9d3b0754bc99186f374457
+_md5_=891f5b65ea0b6cb1d42656c5b507b5e2
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
index 9edaf35d940e..d60bfecff785 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-cedict-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=bbe34db76e352667489b6e289448bd24
+_md5_=8781b7bd1a819aa28b4d0dda3ece2467
diff --git a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2 b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
index 4f93c5a2e1c5..a47edfb02d29 100644
--- a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary for Dictd.org's Devil's Dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/dict.org/
 IUSE=+zlib
-KEYWORDS=~amd64 ppc sparc x86
+KEYWORDS=~amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.dict.org_devils-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=159b6d827455a100a4dc41a01498e639
+_md5_=6553efd3bb653d96e87a20dbc672fbf0
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
index 4577df855e47..2d47c7ce72c0 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to German
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-deu-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=876e26696845f4a72b0e8aa5b65d236c
+_md5_=d4ea6aaa70784f2b4c4a8b837be3a102
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
index b8f7f1f2434d..a7b402ceef84 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to French
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-fra-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=cdb588590ac4875600558d3b44212c9b
+_md5_=167ed089d8f861a3c6b0e1bd2768f2b5
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
index 6ab246175850..46eb180c5bfd 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Italian
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-ita-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=f1aaf8c4c128595cc57a405593206bf2
+_md5_=28b2b0c9762195146d5f615b77540fbd
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
index bd0dba76d49c..2be1c8fc20b9 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Latin
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-lat-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=1661f6642ffae327a5d7a326a9859e86
+_md5_=bff6f6eb8453f3ccd5dc482d0804fa58
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
index c8e2a974fba7..93b223f157c4 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Russian
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-rus-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=4102c748dafbf47f7a3494d0a93c52b4
+_md5_=851bfd88ccacb5a0d66b215e0f79772b
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
index 9ed4412d905e..327ffbb52301 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Spanish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-spa-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=c0d457e45bb7947be8a5a64172bfb231
+_md5_=35ea58343f3b102e44c1667d3af4e0f1
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
index 8886db60c305..9155ca7d66a6 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Swedish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-swe-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=5f642b4885d8740aefd457f53ad66555
+_md5_=672db6a94b8fda0f91347a73c75e49d6
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
index bf425f4eeead..2993dad812ae 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Turkish
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-eng-tur-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=9983db4d08d80e1fb610a126c0f62f19
+_md5_=7670cedb6bc998376e224cd78f98b501
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
index 7ec99a631647..8ba185306db2 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Turkish to German
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-deu-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=f51e28aa5de0950b52d3d606ed799a80
+_md5_=2d02b0caebd3009fa9448537f51b013d
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
index 3fd023e42a7c..057cde6f328c 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Turkish to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/freedict.de/
 IUSE=+zlib
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=amd64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-eng-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=28b76e571bb294ed50495c332af0f2fa
+_md5_=cdcbfc281cc609eec42d27d3e610947b
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
index 57c69ff06e91..fb7d891affd7 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Japanese
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/ja/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc sparc x86
+KEYWORDS=~amd64 ~ppc ~riscv sparc x86
 LICENSE=GDLS
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-en-ja-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=33f6c2ab21332eec3a8f44320baa7d2d
+_md5_=d862e33b42ef65ffacc31246cd489321
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r2 b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r2
index 19fdfb1e0d32..8eec7483d595 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r2
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Japanese
 EAPI=7
 HOMEPAGE=http://download.huzheng.org/ja
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-en-ja-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=0f096d1282ef45c89eb8d3cdae6491be
+_md5_=90871512befd3942b67336b327833208
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
index 890be9f083e0..e885ac62bab0 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Japanese to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/ja/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc sparc x86
+KEYWORDS=~amd64 ~ppc ~riscv sparc x86
 LICENSE=GDLS
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-ja-en-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=ccfbbb2319155df05a1614fbba476927
+_md5_=90a50f9ed90ed30a977184e40d03085d
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r2 b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r2
index 387c14332bba..3cb753af9c86 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r2
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Japanese to English
 EAPI=7
 HOMEPAGE=http://download.huzheng.org/ja
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-ja-en-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=702ade1efabd569537be58d4b21155ac
+_md5_=2ea76b630b781f5a2197ead34eaa7ae2
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
index 6b8b3d84c4b6..f5a8b0569917 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ppc sparc x86
+KEYWORDS=~amd64 ~arm ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=c3e2cc94b07ed20a752793054ab8b650
+_md5_=84fdcdad00861e1011d1738727aebe9d
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
index 60897ac38ce9..456a1e2e9f84 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~ppc sparc x86
+KEYWORDS=~amd64 ~arm ~ppc ~riscv sparc x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=18bdce15e22fe4332c99a33150352653
+_md5_=83aedb3e853140628dd45ca831162da8
diff --git a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2 b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
index bdbe3b2c2043..121739bd282a 100644
--- a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary for Mova.org's Smiley Dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/mova.org/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.mova.org_smiley-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=d18fe45d53cce2c7dfde86e1b2840d31
+_md5_=c2fecd728f80b4b5d7e7aea4dcbd243f
diff --git a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
index 221bd2a05708..e9d6be1c0f93 100644
--- a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-oxford-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=372a9e45f7f5fb494cdb0f4987c92768
+_md5_=d8cda67db27eeb8fb7c1c719bb59a5ee
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
index 9ebf185f8a81..69dda16075e7 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Japanese Romaji
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_eng-jpn-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=99fb02e4d891eecd33f3530466e444b1
+_md5_=67002377afcb859a83a5346a344422dc
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
index 0de2400125f1..efd242bd330f 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Japanese Romaji to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_jpn-eng-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=d55e395f4c4fd1127f69723ec9f15f40
+_md5_=4e24fbf56d7ae13b4ef9562b735b7876
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
index ebd7c895a8ae..b2a9e2ac5413 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Quick but still useful Russian to English dictionary
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/Quick/
 IUSE=+zlib
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-quick_rus-eng-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=b2e29d5eb386fd36c4ca5263ec4c10e1
+_md5_=033867ee93ce3149fc79167677d28f05
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
index efe04f6aa1a7..2c7c402bd931 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=5e2212480e9344a1926cd757033668d2
+_md5_=3ab4b348653c083e75e92e6bcd607cc4
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
index 4f8734b5cfd7..f776da7ac59d 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=b51389cda9fb30da817a05aea7a8c32a
+_md5_=9755375ce9af1a93d29d1b9fc278064a
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
index 3bfe71db8df0..eff995545365 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_TW/
 IUSE=+zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=83156da90f3c820263f32bdd3c3a6110
+_md5_=1842dae65490ea72ee016043afd62cc6
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
index b5a85e7d22d7..1e39ee008d2a 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
 EAPI=6
 HOMEPAGE=http://download.huzheng.org/zh_CN/
 IUSE=+zlib
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
 _eclasses_=stardict	d43f716f9a7f355ead783b3180783bca
-_md5_=6baacac9abf61b87ac91bf5050376e4e
+_md5_=7a348df4d8fdc71507a9067ec36adccd
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.47 b/metadata/md5-cache/app-dicts/verbiste-0.1.47
index 28e71bdd39de..5f19504b1d64 100644
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.47
+++ b/metadata/md5-cache/app-dicts/verbiste-0.1.47
@@ -5,10 +5,10 @@ DESCRIPTION=French conjugation system
 EAPI=7
 HOMEPAGE=http://sarrazip.com/dev/verbiste.html
 IUSE=gtk
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
 SLOT=0
 SRC_URI=http://sarrazip.com/dev/verbiste-0.1.47.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d80e24781c7ed35bded16b176d2b89e0
+_md5_=6797f51a83a822c8f58029db5751ff49
diff --git a/metadata/md5-cache/app-dicts/wnn-ldic-1.04 b/metadata/md5-cache/app-dicts/wnn-ldic-1.04
index af19eef621cd..bb53184cf78c 100644
--- a/metadata/md5-cache/app-dicts/wnn-ldic-1.04
+++ b/metadata/md5-cache/app-dicts/wnn-ldic-1.04
@@ -3,8 +3,8 @@ DEPEND=app-i18n/freewnn
 DESCRIPTION=Wnn dictionary for librarian
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=HPND
 SLOT=0
 SRC_URI=mirror://gentoo/ldic-1.04-wnn.txt
-_md5_=9137555a948f55afd532d8b751f4ab00
+_md5_=a1e2f3be78a5a1f8564a171937df92ac
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.1 b/metadata/md5-cache/app-dicts/wordnet-3.1
index 85e5f629651e..30c281b5dcd3 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.1
+++ b/metadata/md5-cache/app-dicts/wordnet-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=A lexical database for the English language
 EAPI=6
 HOMEPAGE=https://wordnet.princeton.edu/
 IUSE=doc
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Princeton
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2 http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b05e78d4e2c0855715920f02c846e1ee
+_md5_=32c503a1c08c2be8f39b60b1c7ddc9ee
diff --git a/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1 b/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
index d13f56db4f62..d7b13be2d160 100644
--- a/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
+++ b/metadata/md5-cache/app-dicts/ydpdict-1.0.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interface for the Collins Dictionary
 EAPI=7
 HOMEPAGE=https://github.com/wojtekka/ydpdict
 IUSE=ao
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=app-dicts/libydpdict sys-libs/ncurses:=[unicode(+)] ao? ( media-libs/libao )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/ydpdict/archive/1.0.3.tar.gz -> ydpdict-1.0.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c400284d90aaa1e06ebd3a81d558fe16
+_md5_=d4ba4599fa25d1f1fffc1a07faf144a3
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 1bdf125ec447..c9e2a87b0d4d 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/cppman-0.5.1 b/metadata/md5-cache/app-doc/cppman-0.5.1
index e3a0e35a5e91..e5f4d996c28d 100644
--- a/metadata/md5-cache/app-doc/cppman-0.5.1
+++ b/metadata/md5-cache/app-doc/cppman-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/groff python_single_target_python3_8? ( dev-python/beautifulsou
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/aitjcize/cppman/archive/0.5.1.tar.gz -> cppman-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab5aec5f0eaa20b2fddab478ea74bd16
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d50b80449b7c..d0de48361323 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r4 b/metadata/md5-cache/app-editors/emacs-27.2-r4
deleted file mode 100644
index 0d577e4790fa..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs !app-editors/emacs-vcs:27
-RESTRICT=test
-SLOT=27
-SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-3.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0f058baec3980d4fb8eb50965b2f9e9
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r5 b/metadata/md5-cache/app-editors/emacs-27.2-r5
new file mode 100644
index 000000000000..81433960b591
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r5
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs !app-editors/emacs-vcs:27
+RESTRICT=test
+SLOT=27
+SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-3.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5da6d6adf1e11d1f835a322be03acd7
diff --git a/metadata/md5-cache/app-editors/emacs-27.2.9999 b/metadata/md5-cache/app-editors/emacs-27.2.9999
index 56a7489930bf..871dd8433853 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2.9999
+++ b/metadata/md5-cache/app-editors/emacs-27.2.9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ IDEPEND=app-eselect/eselect-emacs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs !app-editors/emacs-vcs:27
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs !app-editors/emacs-vcs:27
 RESTRICT=test
 SLOT=27-vcs
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2786a2824026f127a2c2fd5dcd13142d
+_md5_=bc2fbdbac4526373999821b99cdaa951
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
deleted file mode 100644
index 59df4dbd943f..000000000000
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
-RESTRICT=test
-SLOT=28-vcs
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a2a1f3ac7ec19c8aace714283a5b6983
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-28.0.9999-r1
new file mode 100644
index 000000000000..5ba534682dff
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+PROPERTIES=live
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=28-vcs
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd53f35e6155f129db0719728827822f
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999 b/metadata/md5-cache/app-editors/emacs-29.0.9999
new file mode 100644
index 000000000000..b2f6345c0eb0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+PROPERTIES=live
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=29-vcs
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba0126b5ea7f3a0549ccaf9ed887d419
diff --git a/metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206 b/metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206
index 09c481fd35db..472323b2e1cc 100644
--- a/metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206
+++ b/metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/ht-2.1.1_pre20161206.tar.gz
-_md5_=9be826772c5612a778a0a2527fb4f97a
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/ht-2.1.1_pre20161206.tar.gz
+_md5_=43f68d17e181125bbbf75a78db1f099f
diff --git a/metadata/md5-cache/app-editors/kakoune-2021.08.28 b/metadata/md5-cache/app-editors/kakoune-2021.08.28
deleted file mode 100644
index 5f05c905f1ab..000000000000
--- a/metadata/md5-cache/app-editors/kakoune-2021.08.28
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modal editor inspired by vim
-EAPI=8
-HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=https://github.com/mawww/kakoune/archive/v2021.08.28.tar.gz -> kakoune-2021.08.28.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=201795e32cac4d734365dc80102d5538
diff --git a/metadata/md5-cache/app-editors/kakoune-2021.08.28-r1 b/metadata/md5-cache/app-editors/kakoune-2021.08.28-r1
new file mode 100644
index 000000000000..687dc14ceec6
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kakoune-2021.08.28-r1
@@ -0,0 +1,11 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Modal editor inspired by vim
+EAPI=8
+HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Unlicense
+SLOT=0
+SRC_URI=https://github.com/mawww/kakoune/releases/download/v2021.08.28/kakoune-2021.08.28.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6cbd78be92b57afea47a0dead7b94b55
diff --git a/metadata/md5-cache/app-editors/neovim-0.5.1 b/metadata/md5-cache/app-editors/neovim-0.5.1
new file mode 100644
index 000000000000..2fe7730738c3
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.5.1
@@ -0,0 +1,15 @@
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-util/gperf virtual/libiconv virtual/libintl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] 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-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) 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= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=7
+HOMEPAGE=https://neovim.io
+IUSE=+lto +nvimpager +tui lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=Apache-2.0 vim
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] 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-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) 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 )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.5.1.tar.gz -> neovim-0.5.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6a8c2b6913b7a875ad2a012911a80ce3
diff --git a/metadata/md5-cache/app-editors/pyvim-3.0.2 b/metadata/md5-cache/app-editors/pyvim-3.0.2
index db30d94adbf3..a6af5ed28fcb 100644
--- a/metadata/md5-cache/app-editors/pyvim-3.0.2
+++ b/metadata/md5-cache/app-editors/pyvim-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-vi dev-python/docopt[python_targets_python3_8(-)?,py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyvim/pyvim-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b89a3fab334860cca4ab5c606858bd7
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
index ee4ba7fa92f5..68b739cd23c8 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d49da7f847da144f7c10f26ebce81880
diff --git a/metadata/md5-cache/app-editors/retext-7.1.0 b/metadata/md5-cache/app-editors/retext-7.1.0
index aa354079826a..4311120c81b1 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	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 19d42b5cde82..22316fae481b 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7be5b92d4bd878327d33b6bd86763cec
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index a243c0fcb9f7..b8c1a7a2bce4 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=15883466f143b8f61feb4993a825dc2a
diff --git a/metadata/md5-cache/app-editors/sandy-0.4-r1 b/metadata/md5-cache/app-editors/sandy-0.4-r1
index b755d493996a..29375d08c5e4 100644
--- a/metadata/md5-cache/app-editors/sandy-0.4-r1
+++ b/metadata/md5-cache/app-editors/sandy-0.4-r1
@@ -10,5 +10,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://git.suckless.org/sandy/snapshot/sandy-0.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=811f9a823d412460003eaa7dd7eb7d74
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index fafca0e53eb5..e024314666f7 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/pymacs-0.26-r2 b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
index 2ec09e073f3f..7ac4574c8fd7 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_8? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcf4e61d4c54df95f4840aa1aa330543
diff --git a/metadata/md5-cache/app-emacs/vm-9999 b/metadata/md5-cache/app-emacs/vm-9999
new file mode 100644
index 000000000000..d549f8281f99
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/vm-9999
@@ -0,0 +1,12 @@
+BDEPEND=bbdb? ( app-emacs/bbdb ) sys-apps/texinfo >=app-editors/emacs-23.1:* dev-vcs/breezy sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=The VM mail reader for Emacs
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/viewmail/
+IUSE=bbdb ssl
+LICENSE=GPL-2+
+PROPERTIES=live
+RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
+SLOT=0
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bzr	ff9acaab4370f070e17f34198f2e4b0e	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=02dd201365556a860a02209e449a6c09
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bdf99707e286..9c067565484f 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/cloud-init-20.4 b/metadata/md5-cache/app-emulation/cloud-init-20.4
index 4f4d8d56c025..7fdab283522b 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-20.4
+++ b/metadata/md5-cache/app-emulation/cloud-init-20.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/20.4/+download/cloud-init-20.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a53e0ed9caa4f56d3a33b55ea69e0d5
diff --git a/metadata/md5-cache/app-emulation/cloud-init-21.2 b/metadata/md5-cache/app-emulation/cloud-init-21.2
index 9b282c714d2f..ae608760a790 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-21.2
+++ b/metadata/md5-cache/app-emulation/cloud-init-21.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/21.2/+download/cloud-init-21.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b10acd2916adfbb49161069054bc116
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index caa6fa733d61..b1c48af600d4 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jinja[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4e889b05da23623ca61d8933300019c
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
index c678f8439a96..00acb9ad9967 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ec39e4f0200ff1a26b3d8024a18e251
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 480eb8e58f31..c79fb2230214 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3cec61237aad6cb3d0bccb039ed949e
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.4 b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
index aa06a1907d4f..e35b943753dc 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.27.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.27.4.tar.gz -> docker-compose-1.27.4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a5632caf1c51f0eee2cae8868dae990
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.4 b/metadata/md5-cache/app-emulation/docker-compose-1.28.4
index b88f5ebfc6d6..98769c4b9d3c 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.4.tar.gz -> docker-compose-1.28.4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d77118406bddaf77c025569df720b46
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.5 b/metadata/md5-cache/app-emulation/docker-compose-1.28.5
index 502f4424726c..753c5b02a79f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.5
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.5.tar.gz -> docker-compose-1.28.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91f01d1cd5321d00f91e072967899711
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.28.6 b/metadata/md5-cache/app-emulation/docker-compose-1.28.6
index f925a4ff646a..389a65dfd24f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.6
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.28.6.tar.gz -> docker-compose-1.28.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e133be6244b0f7223ef6605cef25cc15
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.0 b/metadata/md5-cache/app-emulation/docker-compose-1.29.0
index 25d56b2e4058..15250341c989 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.0.tar.gz -> docker-compose-1.29.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.1 b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
index 29b1061ad7e7..7dc6022c5cdd 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.1
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.1.tar.gz -> docker-compose-1.29.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.2 b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
index 248ad275e19d..b5a2dda938f1 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b15930b151a7fe7f8976d1e46f8b3ec
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index 8849c6625660..c1b24d1578a3 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -9,6 +9,6 @@ KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) gpm? ( sys-libs/gpm ) svga? ( media-libs/svgalib ) X? ( x11-apps/xset )
 SLOT=0
-SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
+SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~sam/distfiles/dosemu-1.4.1_pre20130107.zip
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b1fff0a13c7a74af747c1630f4c4c0a
+_md5_=5a310464a14494d3d97939ed7d0baa94
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
index d67ca503b586..c701b8108991 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
@@ -11,5 +11,5 @@ RDEPEND=app-emulation/fs-uae python_single_target_python3_8? ( dev-python/PyQt5[
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://fs-uae.net/stable/3.0.5/fs-uae-launcher-3.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=55e7c239b87d625ba822895cc6e96907
diff --git a/metadata/md5-cache/app-emulation/glean-1.18.2 b/metadata/md5-cache/app-emulation/glean-1.18.2
index 377f17234000..a6467b3f2e09 100644
--- a/metadata/md5-cache/app-emulation/glean-1.18.2
+++ b/metadata/md5-cache/app-emulation/glean-1.18.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glean/glean-1.18.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad5b4060ad54175e53a6c9edd7b3b02e
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r4 b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r4
deleted file mode 100644
index 1dc3729bbd85..000000000000
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev ) net-libs/rpcsvc-proto
-DESCRIPTION=Opensourced tools for VMware guests
-EAPI=7
-HOMEPAGE=https://github.com/vmware/open-vm-tools
-IUSE=X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
-REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
-SLOT=0
-SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.2.0/open-vm-tools-11.2.0-16938113.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0346e3e277d62d1bd9a6663efc4a2bdc
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3 b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
index 2ddbb91b7a52..f11b1f4ef72a 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for VMware guests
 EAPI=7
 HOMEPAGE=https://github.com/vmware/open-vm-tools
 IUSE=X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.2.5/open-vm-tools-11.2.5-17337674.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=deb63c1525414f824f23459a7d0f5472
+_md5_=bb5e321d63e7d9b2e997d0e9541b93fb
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794 b/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
new file mode 100644
index 000000000000..2e15d47e6210
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev ) net-libs/rpcsvc-proto
+DESCRIPTION=Tools for VMware guests
+EAPI=7
+HOMEPAGE=https://github.com/vmware/open-vm-tools
+IUSE=X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
+REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
+SLOT=0
+SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.3.5/open-vm-tools-11.3.5-18557794.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=763bc09b66f068c52c3c31ac5f57779c
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.5.2 b/metadata/md5-cache/app-emulation/protontricks-1.5.2
index c4d4bd2376e6..a0cde25e4349 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.5.2
+++ b/metadata/md5-cache/app-emulation/protontricks-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Matoking/protontricks/archive/1.5.2.tar.gz -> protontricks-1.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=94567ea1a521ba952b6c4eeb57535652
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.6.0 b/metadata/md5-cache/app-emulation/protontricks-1.6.0
index 8867b844923a..ec738b40d226 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.6.0
+++ b/metadata/md5-cache/app-emulation/protontricks-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Matoking/protontricks/archive/1.6.0.tar.gz -> protontricks-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9198370d3753a0acfd1cfe63d532191a
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905 b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
index 3bf133b9390f..92d0720270a3 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TomasTomecek/sen/archive/02e5872ee2905861e1da06ab5174e1a3f41f0e0b.tar.gz -> sen-0.6.1_p20200905.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=504a8b6d322add10d45e7d969bcbd2cf
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0 b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
index 7a36b70636c9..4e29a5222e7c 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
@@ -1,5 +1,5 @@
 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 setup
+DEFINED_PHASES=configure install postinst setup
 DEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
 DESCRIPTION=SPICE VD Linux Guest Agent
 EAPI=7
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.spice-space.org/
 IUSE=gtk selinux systemd kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
+RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.21.0.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3c4f72d3558a6953d4e932c6f5b92f1
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5d2348534090904ee65036e08e5b46c7
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.18 b/metadata/md5-cache/app-emulation/vagrant-2.2.18
new file mode 100644
index 000000000000..ef03d6c08343
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.18
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby26(-)] test? ( dev-ruby/rspec[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby27(-)] test? ( dev-ruby/rspec[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=7
+HOMEPAGE=https://vagrantup.com/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[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 )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.18.tar.gz -> vagrant-2.2.18.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3bf4915f6f7fab5d3a5b4ca37620cdd7
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
index 32e9a50fcc9d..a7a3da90d515 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst python_single_target_python3_8? ( dev-lang/pytho
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0f08ab3a92c4eef2f203544e3c04ab27
diff --git a/metadata/md5-cache/app-emulation/virt-manager-3.1.0 b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
index 21f93fb19650..2f941d8def90 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-3.1.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst python_single_target_python3_8? ( dev-lang/pytho
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-3.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=80fc2f6c8ad825092a5ffe325b507344
diff --git a/metadata/md5-cache/app-emulation/virt-manager-3.2.0 b/metadata/md5-cache/app-emulation/virt-manager-3.2.0
index 407e29f69401..4c2036948e6b 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-3.2.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-3.2.0
@@ -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=http://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=046fb4d748b2c585bce82dce8046dc59
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 50dc2e923914..5a87d3843d4e 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=28a716395be1a990af45f093d2951cbc
diff --git a/metadata/md5-cache/app-emulation/wine-mono-6.4.0 b/metadata/md5-cache/app-emulation/wine-mono-6.4.0
new file mode 100644
index 000000000000..753581ced4b1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-mono-6.4.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!!app-emulation/wine:0
+DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
+EAPI=7
+HOMEPAGE=https://www.winehq.org/
+IUSE=+shared
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
+SLOT=6.4.0
+SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.tar.xz )
+_md5_=3bfd44b807f09bbabfd48107859a6589
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.14 b/metadata/md5-cache/app-emulation/wine-staging-6.14
deleted file mode 100644
index 46ecd9acea2c..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-6.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.14
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.14.tar.gz -> wine-staging-6.14.tar.gz )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d753f83aedac07d27411077a1f992566
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.18 b/metadata/md5-cache/app-emulation/wine-staging-6.18
new file mode 100644
index 000000000000..30cb0b0d2c91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.18
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.18.tar.gz -> wine-staging-6.18.tar.gz )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2b167226eab88f58467cad7497746e77
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index bb08dc33fb21..191f051d0ff6 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b68fa47ab5c75ee3108b04b37908462
+_md5_=2b167226eab88f58467cad7497746e77
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.14 b/metadata/md5-cache/app-emulation/wine-vanilla-6.14
deleted file mode 100644
index fbf98dc90825..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.14
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=89b087f668fbd98dc8dcba34c40cf5fe
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.18 b/metadata/md5-cache/app-emulation/wine-vanilla-6.18
new file mode 100644
index 000000000000..ad0f90efc116
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.18
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5165db895616941fd41971ac86a2a7f7
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 77faffa579c9..f0a2a7a22991 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -6,10 +6,10 @@ 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
 LICENSE=LGPL-2.1
 PROPERTIES=live
-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/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+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/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5c040e886a342b5527122ad7a34a7a9
+_md5_=5165db895616941fd41971ac86a2a7f7
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 62e9defeb4dd..9407e216f056 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/freewnn-1.1.1_alpha23-r1 b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
index bf6073162848..2154357fd352 100644
--- a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
+++ b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Network-Extensible Kana-to-Kanji Conversion System
 EAPI=6
 HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
 IUSE=ipv6 uum
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= uum? ( sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/freewnn/63271/FreeWnn-1.1.1-a023.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b220e263872c5c862b1ff04162545a8
+_md5_=c433cf8b7a2f3f4afc7f0b4b4141648c
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
index 1a769b0e2a33..9e87d02a1117 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.4
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/p
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/64158/nkf-2.1.4.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/000915e115acac57a1fdbceb1e6361788af83a3d.tar.gz -> python-nkf-0.2.0_p20141211.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=9f79a3b3afa0d82206f5e44adfe0aa90
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.5 b/metadata/md5-cache/app-i18n/nkf-2.1.5
index 8e7218592b20..6ad19a6b6ee5 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.5
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.5
@@ -5,11 +5,11 @@ DESCRIPTION=Network Kanji code conversion Filter with UTF-8/16 support
 EAPI=7
 HOMEPAGE=https://osdn.net/projects/nkf/
 IUSE=perl python l10n_ja python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=ZLIB python? ( BSD )
 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(-)?] ) dev-lang/perl:=
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/70406/nkf-2.1.5.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/c2c6724714b66f295137c8818dae4c09fc09e0a3.tar.gz -> python-nkf-0.2.0_p20191121.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=4a335cf759f0f129c41e1ef2b1d829ae
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=bccc10240f3d0d2738e83fb42dcee861
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.14.2-r1 b/metadata/md5-cache/app-i18n/transifex-client-0.14.2-r1
index 459241b0eead..1a60a996a2fb 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.14.2-r1
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.14.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.14.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=918de55a1bb5befb93d68100bc9c92b4
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.14.3 b/metadata/md5-cache/app-i18n/transifex-client-0.14.3
index e4d2bb4061ea..15f6af91164a 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.14.3
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.14.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=adaccca1c8f570791b9b91bbe613f063
diff --git a/metadata/md5-cache/app-i18n/unicode-data-14.0.0 b/metadata/md5-cache/app-i18n/unicode-data-14.0.0
new file mode 100644
index 000000000000..4c50cae08b91
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/unicode-data-14.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Unicode data from unicode.org
+EAPI=8
+HOMEPAGE=https://unicode.org/ucd/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=unicode
+SLOT=0
+SRC_URI=https://unicode.org/Public/zipped/14.0.0/UCD.zip -> unicode-data-14.0.0-UCD.zip https://unicode.org/Public/zipped/14.0.0/Unihan.zip -> unicode-data-14.0.0-Unihan.zip
+_md5_=8d01e40bfcbec443e4de7e992683fd31
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0135241f5285..69cdb2aca358 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/abduco-0.6 b/metadata/md5-cache/app-misc/abduco-0.6
index 45b8d266ce9c..70acf7a7bcee 100644
--- a/metadata/md5-cache/app-misc/abduco-0.6
+++ b/metadata/md5-cache/app-misc/abduco-0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://www.brain-dump.org/projects/abduco/abduco-0.6.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a1fb3798996b45f55cb8dbb1865698c
diff --git a/metadata/md5-cache/app-misc/asciinema-2.0.2-r1 b/metadata/md5-cache/app-misc/asciinema-2.0.2-r1
index 9198816f94df..bfe0faaff2e0 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.2-r1
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.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=https://github.com/asciinema/asciinema/archive/v2.0.2.tar.gz -> asciinema-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56ee094b92264bb5d59ed7a63f426bb2
diff --git a/metadata/md5-cache/app-misc/binwalk-2.2.0 b/metadata/md5-cache/app-misc/binwalk-2.2.0
index e2a184129eab..8baa6fe3f7f6 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.2.0
+++ b/metadata/md5-cache/app-misc/binwalk-2.2.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/ReFirmLabs/binwalk/archive/v2.2.0.tar.gz -> binwalk-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c00952ab7d63b10445017180b2f83bbc
diff --git a/metadata/md5-cache/app-misc/binwalk-2.3.1 b/metadata/md5-cache/app-misc/binwalk-2.3.1
index b356bdd35cf5..51984e5b2016 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.3.1
+++ b/metadata/md5-cache/app-misc/binwalk-2.3.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/ReFirmLabs/binwalk/archive/v2.3.1.tar.gz -> binwalk-2.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a2b01632b5e1d6fee5d5f7ef2958cfd
diff --git a/metadata/md5-cache/app-misc/binwalk-9999 b/metadata/md5-cache/app-misc/binwalk-9999
index 243bc650578b..64fac2586212 100644
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5d12e9960da7be74c41418a6d18e511
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.70 b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.70
new file mode 100644
index 000000000000..d8a5e60520f5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.70
@@ -0,0 +1,13 @@
+BDEPEND=app-misc/c_rehash sys-apps/debianutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=7
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_70_RTM/src/nss-3.70.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3e452193392fdaa6aca4213cf648738e
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7 b/metadata/md5-cache/app-misc/chkcrontab-1.7
index 7c76a3dfd730..96a9689c62de 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8e0fc2274c97aac5cb29637b9565913b
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7-r1 b/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
index f6105615b383..673044b64b79 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7-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/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3434b5cc2adbb23f4f741ed0df72898
diff --git a/metadata/md5-cache/app-misc/ckb-0.4.3-r2 b/metadata/md5-cache/app-misc/ckb-0.4.3-r2
deleted file mode 100644
index 667134d98ec8..000000000000
--- a/metadata/md5-cache/app-misc/ckb-0.4.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Corsair K65/K70/K95 Driver
-EAPI=7
-HOMEPAGE=https://github.com/ckb-next/ckb-next
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
-SLOT=0
-SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.4.3.tar.gz -> ckb-0.4.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f632ad38ca27f872eb9cb9c5cb5a388
diff --git a/metadata/md5-cache/app-misc/ckb-0.4.4 b/metadata/md5-cache/app-misc/ckb-0.4.4
deleted file mode 100644
index c8fa902abdfd..000000000000
--- a/metadata/md5-cache/app-misc/ckb-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Corsair K65/K70/K95 Driver
-EAPI=7
-HOMEPAGE=https://github.com/ckb-next/ckb-next
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
-SLOT=0
-SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.4.4.tar.gz -> ckb-0.4.4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f632ad38ca27f872eb9cb9c5cb5a388
diff --git a/metadata/md5-cache/app-misc/ckb-0.4.4-r2 b/metadata/md5-cache/app-misc/ckb-0.4.4-r2
new file mode 100644
index 000000000000..4a9f92902a2b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckb-0.4.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Corsair K65/K70/K95 Driver
+EAPI=7
+HOMEPAGE=https://github.com/ckb-next/ckb-next
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
+SLOT=0
+SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.4.4.tar.gz -> ckb-0.4.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ced410df49a63e0cdbcd58c104c1462e
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r4 b/metadata/md5-cache/app-misc/dvtm-0.15-r4
index 036893684e7e..9c4a09d41946 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r4
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)] !>=sys-libs/ncurses-6.1
 SLOT=0
 SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0621bbfb520c0ff28e7dcde666cd60fd
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r5 b/metadata/md5-cache/app-misc/dvtm-0.15-r5
index f64baf3b08d1..56609fdf7ed8 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r5
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)]
 SLOT=0
 SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cce2954a42ffb0162831e6433c29f54
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index d5e566295656..f733f6cbe6b2 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-6.1:=[unicode(+)]
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6c262745affc976bff29c4ece958f96
diff --git a/metadata/md5-cache/app-misc/filebus-0.3.2 b/metadata/md5-cache/app-misc/filebus-0.3.2
index 0d7455bc8ff7..19e306279ebd 100644
--- a/metadata/md5-cache/app-misc/filebus-0.3.2
+++ b/metadata/md5-cache/app-misc/filebus-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/filebus/filebus-0.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=971202d1a6d30c1b00d6612c1e7f0f45
diff --git a/metadata/md5-cache/app-misc/freewvs-0.1.1 b/metadata/md5-cache/app-misc/freewvs-0.1.1
index 92b37f25e9cc..8f1f62014815 100644
--- a/metadata/md5-cache/app-misc/freewvs-0.1.1
+++ b/metadata/md5-cache/app-misc/freewvs-0.1.1
@@ -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://pypi/f/freewvs/freewvs-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d057e45d13906950b3481941a42c882
diff --git a/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1 b/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1
index 96d86cb8c91b..36541e826062 100644
--- a/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1
+++ b/metadata/md5-cache/app-misc/gcalcli-4.2.0-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/insanum/gcalcli/archive/v4.2.0.tar.gz -> gcalcli-4.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecfdbcd6456aa31c877178c3f6d1514d
diff --git a/metadata/md5-cache/app-misc/goobook-3.5.1-r2 b/metadata/md5-cache/app-misc/goobook-3.5.1-r2
index 09e95f33253e..8a1ec97998cf 100644
--- a/metadata/md5-cache/app-misc/goobook-3.5.1-r2
+++ b/metadata/md5-cache/app-misc/goobook-3.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/google-api-python-client-1.7.12[python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/goobook/goobook-3.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f05da2ed35347fa71438edee3057ea9
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.4 b/metadata/md5-cache/app-misc/gramps-5.1.4
index 3b683bca621a..d8d32adf7c1a 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.4
+++ b/metadata/md5-cache/app-misc/gramps-5.1.4
@@ -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/gramps-project/gramps/archive/v5.1.4.tar.gz -> gramps-5.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=da360b9c7072aa7fbfee8cd76fdfe0ca
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.5 b/metadata/md5-cache/app-misc/icdiff-1.9.5
index 0c89123635bc..0b295e5343ca 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.9.5
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.5.tar.gz -> icdiff-1.9.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=062256a368489e55c95ad32c3b9e9aa1
diff --git a/metadata/md5-cache/app-misc/jp-0.2.1 b/metadata/md5-cache/app-misc/jp-0.2.1
new file mode 100644
index 000000000000..912c1d211dd6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jp-0.2.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Command line interface to JMESPath
+EAPI=7
+HOMEPAGE=https://github.com/jmespath/jp http://jmespath.org
+IUSE=jpp
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=!app-misc/jpipe[jp-symlink]
+REQUIRED_USE=!jpp
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/jmespath/jp/archive/refs/tags/0.2.1.tar.gz -> jp-0.2.1.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/codegangsta/cli/@v/v1.4.2-0.20150131031259-6086d7927ec3.mod -> github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.4.2-0.20150131031259-6086d7927ec3.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.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//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=cb42bd7fedbb292e6cddd50cbc06cb3f
diff --git a/metadata/md5-cache/app-misc/jpipe-0.1.3.9 b/metadata/md5-cache/app-misc/jpipe-0.1.3.9
index 607c5f0c5a11..24b64a48b4f0 100644
--- a/metadata/md5-cache/app-misc/jpipe-0.1.3.9
+++ b/metadata/md5-cache/app-misc/jpipe-0.1.3.9
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/pipebus/jpipe https://github.com/jmespath/jmespath.p
 IUSE=jpp-symlink jp-symlink test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=jpp-symlink? ( !app-misc/jp[jpp] ) jp-symlink? ( !app-misc/jp[jp] ) dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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=jpp-symlink? ( !app-misc/jp[jpp(-)] ) jp-symlink? ( !app-misc/jp[jp(+)] ) dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/jpipe/jpipe-0.1.3.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7805eaaaf93561530a8e9c8bd318e6fd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a201a8b8ef329c794877311ba62cc0ef
diff --git a/metadata/md5-cache/app-misc/jpipe-0.2.0 b/metadata/md5-cache/app-misc/jpipe-0.2.0
new file mode 100644
index 000000000000..37966932ae3b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jpipe-0.2.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Command line interface to JMESPath
+EAPI=7
+HOMEPAGE=https://github.com/pipebus/jpipe https://github.com/jmespath/jp/pull/30 http://jmespath.org
+IUSE=jpp-symlink jp-symlink python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=jpp-symlink? ( !app-misc/jp[jpp(-)] ) jp-symlink? ( !app-misc/jp[jp(+)] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[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 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jpipe/jpipe-0.2.0.tar.gz !python? ( mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/codegangsta/cli/@v/v1.4.2-0.20150131031259-6086d7927ec3.mod -> github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.4.2-0.20150131031259-6086d7927ec3.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.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/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.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/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/safehtml/@v/v0.0.2.mod -> github.com%2Fgoogle%2Fsafehtml%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jba/templatecheck/@v/v0.6.0.mod -> github.com%2Fjba%2Ftemplatecheck%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/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/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/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/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-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-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-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.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/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/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-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.3-0.20210608163600-9ed039809d4c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3-0.20210608163600-9ed039809d4c.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.3-0.20210608163600-9ed039809d4c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3-0.20210608163600-9ed039809d4c.mod mirror://goproxy//golang.org/x/tools/gopls/@v/v0.7.0.zip -> golang.org%2Fx%2Ftools%2Fgopls%2F@v%2Fv0.7.0.zip mirror://goproxy//golang.org/x/tools/gopls/@v/v0.7.0.mod -> golang.org%2Fx%2Ftools%2Fgopls%2F@v%2Fv0.7.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.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/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.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.2.0.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.2.0.zip mirror://goproxy//honnef.co/go/tools/@v/v0.2.0.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.2.0.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//mvdan.cc/xurls/v2/@v/v2.2.0.zip -> mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//mvdan.cc/xurls/v2/@v/v2.2.0.mod -> mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=39ebbfbef0d25dbfa11b920ac4dc962d
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r3 b/metadata/md5-cache/app-misc/khal-0.10.1-r3
index 772250109621..36aade8efa75 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.1-r3
+++ b/metadata/md5-cache/app-misc/khal-0.10.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_8(-)?] >=dev-python/click-
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=22b815da349ffb4659d07a62a5fdd24e
diff --git a/metadata/md5-cache/app-misc/khal-0.10.2-r2 b/metadata/md5-cache/app-misc/khal-0.10.2-r2
index ceec9c068e25..5e23b5026e8d 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.2-r2
+++ b/metadata/md5-cache/app-misc/khal-0.10.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6484cd89f19323a5329edef346ca3a2
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0-r1 b/metadata/md5-cache/app-misc/khard-0.13.0-r1
index d0b5d7a8f349..dcc9397c85ae 100644
--- a/metadata/md5-cache/app-misc/khard-0.13.0-r1
+++ b/metadata/md5-cache/app-misc/khard-0.13.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa355425c2faf974137ea534b6822b60
diff --git a/metadata/md5-cache/app-misc/khard-0.17.0-r1 b/metadata/md5-cache/app-misc/khard-0.17.0-r1
index 469443e5f241..8c0070b496f9 100644
--- a/metadata/md5-cache/app-misc/khard-0.17.0-r1
+++ b/metadata/md5-cache/app-misc/khard-0.17.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/k/khard/khard-0.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcc1f0a909f65dd9928f0ba21a6576be
diff --git a/metadata/md5-cache/app-misc/lfm-3.1 b/metadata/md5-cache/app-misc/lfm-3.1
index e985d4fd605e..6499f85cbdf2 100644
--- a/metadata/md5-cache/app-misc/lfm-3.1
+++ b/metadata/md5-cache/app-misc/lfm-3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65f301dcbbf58c0eb05bcc3fcc656e9a
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r4 b/metadata/md5-cache/app-misc/mc-4.8.26-r4
deleted file mode 100644
index ab964e621669..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.26-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=7
-HOMEPAGE=https://midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.26.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=29f35914eb499490b7e7210c35188cb8
diff --git a/metadata/md5-cache/app-misc/mc-4.8.26-r5 b/metadata/md5-cache/app-misc/mc-4.8.26-r5
deleted file mode 100644
index 378798bfbd72..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.26-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=8
-HOMEPAGE=https://midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.26.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b2e008360dd7349921aa4c899a18d8e0
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.1 b/metadata/md5-cache/app-misc/pax-utils-1.3.1
index 2f73b99db9b5..17b3ab25fd85 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.1
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.1
@@ -10,6 +10,6 @@ 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.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.1.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.1.tar.xz
+SRC_URI=mirror://gentoo/pax-utils-1.3.1.tar.xz https://dev.gentoo.org/~sam/distfiles/pax-utils-1.3.1.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7092b23906b196f5b0d3fef6a565ce6d
+_md5_=be7c3a43c7a7901408b61b26daa14433
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 97de156e639b..81d81ff8d3d0 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.2
@@ -10,6 +10,6 @@ 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
+SRC_URI=mirror://gentoo/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~sam/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	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a9d823da4fedfdc08247b9333429b99
+_md5_=5f0002332be6638f5fdb291c7feaa950
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.3 b/metadata/md5-cache/app-misc/pax-utils-1.3.3
index 8593552a5d3f..17b634be7878 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.3
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.3
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.3.tar.xz
+SRC_URI=mirror://gentoo/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~sam/distfiles/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c074f10f83efe0fa0d40390cc919c19
+_md5_=087cd0128a8e007671917b98c77bcc71
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.2 b/metadata/md5-cache/app-misc/ranger-1.9.2
index 2ca27626b8ae..0eacaf41f27d 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.2
+++ b/metadata/md5-cache/app-misc/ranger-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.2.tar.gz -> ranger-1.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fe39d723dcec3cb74170f15bb683fadf
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.3 b/metadata/md5-cache/app-misc/ranger-1.9.3
index 6d6691cb1f71..6fbe5181234c 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.3
+++ b/metadata/md5-cache/app-misc/ranger-1.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/ranger/ranger/archive/v1.9.3.tar.gz -> ranger-1.9.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c3b9903044ffdb91fd2d90f80ba3592f
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index 54e729b8cd8d..fe9e1d1c5c86 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -11,5 +11,5 @@ RDEPEND=virtual/pager python_targets_python3_8? ( dev-lang/python:3.8[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2e30fc7c3f0a2e7707ff1a0c27ac4fcb
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
index 2b67a73c241b..54d21965564d 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.4.tar.gz -> resolve-march-native-0.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=355f216be11ec94f4512af879f9cf3a8
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0 b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
index f1a256fb4245..e10ff16b8ad5 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/1.0.0.tar.gz -> resolve-march-native-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=def171c73495667836bd551bc921432c
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0-r1 b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0-r1
index d2f75b802a3d..1feeee1416bc 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0-r1
+++ b/metadata/md5-cache/app-misc/resolve-march-native-1.0.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=https://github.com/hartwork/resolve-march-native/archive/1.0.0.tar.gz -> resolve-march-native-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09c65707702fd2a357f2861341edb576
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.5-r2 b/metadata/md5-cache/app-misc/solaar-1.0.5-r2
index 41d7304d8595..01a3e4164781 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.5-r2
+++ b/metadata/md5-cache/app-misc/solaar-1.0.5-r2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev python_single_target_python3_8? ( dev-python/psutil[p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.5.tar.gz -> solaar-1.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=113e242bcf90e836761cc8dbcf048c11
diff --git a/metadata/md5-cache/app-misc/solaar-9999 b/metadata/md5-cache/app-misc/solaar-9999
index 5f82738020aa..2e272280a750 100644
--- a/metadata/md5-cache/app-misc/solaar-9999
+++ b/metadata/md5-cache/app-misc/solaar-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-group/plugdev python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] >=dev-python/pyudev-0.13[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3[introspection] ) libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d175e13818ce820f1eea2fd84ea1e585
diff --git a/metadata/md5-cache/app-misc/tmux2html-0.1.11 b/metadata/md5-cache/app-misc/tmux2html-0.1.11
index 17aa43d22429..c2cd078081d4 100644
--- a/metadata/md5-cache/app-misc/tmux2html-0.1.11
+++ b/metadata/md5-cache/app-misc/tmux2html-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=app-misc/tmux python_targets_python3_8? ( dev-lang/python:3.8 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tweekmonster/tmux2html/archive/0.1.11.tar.gz -> tmux2html-0.1.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84e91ac62af2c6af076a4504fd51d3bd
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.4 b/metadata/md5-cache/app-misc/tmuxp-1.5.4
index 8a8f9cb6b5b1..29aa8b42d0b7 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.4
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.5.4.tar.gz -> tmuxp-1.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6bb6782dedb14b1fd52ab5b6b790920
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.6.5 b/metadata/md5-cache/app-misc/tmuxp-1.6.5
index cd5226170e9c..263f094c8017 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.6.5
+++ b/metadata/md5-cache/app-misc/tmuxp-1.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.6.5.tar.gz -> tmuxp-1.6.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cb3675a75aa82c393975de29177e6cc
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1 b/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
index 558acd86c35b..d9531d750606 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
+++ b/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.7.2.tar.gz -> tmuxp-1.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bce58de0d5f0333c5150f2ac7555d127
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.8.2 b/metadata/md5-cache/app-misc/tmuxp-1.8.2
index 7f4e944a84cd..c84c2ba947e9 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.8.2
+++ b/metadata/md5-cache/app-misc/tmuxp-1.8.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/tmux-python/tmuxp/archive/v1.8.2.tar.gz -> tmuxp-1.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8185af6b1cd9a8dc29a7ad1076bb7e91
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.9.2 b/metadata/md5-cache/app-misc/tmuxp-1.9.2
index 6506931ff3c1..ccd909a833c7 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.9.2
+++ b/metadata/md5-cache/app-misc/tmuxp-1.9.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/tmux-python/tmuxp/archive/v1.9.2.tar.gz -> tmuxp-1.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cbf94a4e821484d313254b390410002
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.20.12.26-r1 b/metadata/md5-cache/app-misc/trash-cli-0.20.12.26-r1
index e6ebf8b48284..6b5debd605e4 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.20.12.26-r1
+++ b/metadata/md5-cache/app-misc/trash-cli-0.20.12.26-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/andreafrancia/trash-cli/archive/0.20.12.26.tar.gz -> trash-cli-0.20.12.26.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e740296e24b9507c7cf18033200b16ed
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.21.5.25 b/metadata/md5-cache/app-misc/trash-cli-0.21.5.25
index 1c8892164479..b048c3144145 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.21.5.25
+++ b/metadata/md5-cache/app-misc/trash-cli-0.21.5.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/0.21.5.25.tar.gz -> trash-cli-0.21.5.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8171312a771a3bdda328450aea5e2839
diff --git a/metadata/md5-cache/app-misc/wildq-1.1.10 b/metadata/md5-cache/app-misc/wildq-1.1.10
index b0a8d8f02fc8..9ea4779cb0d7 100644
--- a/metadata/md5-cache/app-misc/wildq-1.1.10
+++ b/metadata/md5-cache/app-misc/wildq-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jq[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wildq/wildq-1.1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=127db662745e3ee2c0ef7583a8a1c250
diff --git a/metadata/md5-cache/app-misc/yq-2.11.1 b/metadata/md5-cache/app-misc/yq-2.11.1
index 1e6b64eb1d57..1cdc0a01cadf 100644
--- a/metadata/md5-cache/app-misc/yq-2.11.1
+++ b/metadata/md5-cache/app-misc/yq-2.11.1
@@ -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/y/yq/yq-2.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ab6a0c67646d3d31b9622da4ce668bf
diff --git a/metadata/md5-cache/app-misc/yq-2.12.0 b/metadata/md5-cache/app-misc/yq-2.12.0
index 1b4ffea8ebdb..d70a631dd403 100644
--- a/metadata/md5-cache/app-misc/yq-2.12.0
+++ b/metadata/md5-cache/app-misc/yq-2.12.0
@@ -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/y/yq/yq-2.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fdc2397adff7030b573bd754c8ddf39
diff --git a/metadata/md5-cache/app-misc/yq-2.9.2-r1 b/metadata/md5-cache/app-misc/yq-2.9.2-r1
index bb25274e0b51..6b0e4c6a4fb5 100644
--- a/metadata/md5-cache/app-misc/yq-2.9.2-r1
+++ b/metadata/md5-cache/app-misc/yq-2.9.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74f3f4ac1982925138bd64cef9e9aeca
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index d61a760946a9..e6a76d59dd24 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/texstudio-4.0.0-r1 b/metadata/md5-cache/app-office/texstudio-4.0.0-r1
new file mode 100644
index 000000000000..6630e9996964
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-4.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
+EAPI=7
+HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+IUSE=video
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/texstudio-org/texstudio/archive/4.0.0.tar.gz -> texstudio-4.0.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=15a7668f0fbfb1bf50dbe8d0953b49a3
diff --git a/metadata/md5-cache/app-office/texstudio-9999 b/metadata/md5-cache/app-office/texstudio-9999
index ac8c84c7cd09..a22806330b5b 100644
--- a/metadata/md5-cache/app-office/texstudio-9999
+++ b/metadata/md5-cache/app-office/texstudio-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-1.0:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-1.0:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
 EAPI=7
 HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
 IUSE=video
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-1.0:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+RDEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-1.0:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2378fe4ad98ed5e201b7588f86d0ac75
+_md5_=f0f228874770af8e172ccb2484fe4311
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index cc4c446a8ce4..229f5e44ba6e 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/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
index 4f9955e1559d..12d93f242881 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8704990890ce1daf0bad1aac5f729b78
diff --git a/metadata/md5-cache/app-portage/diffmask-9999 b/metadata/md5-cache/app-portage/diffmask-9999
index 59ba5318d018..d18e47f35646 100644
--- a/metadata/md5-cache/app-portage/diffmask-9999
+++ b/metadata/md5-cache/app-portage/diffmask-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0273a2f95f94ec1d652651941242f9f4
diff --git a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2 b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
index 931b763e1182..1a4083ad5256 100644
--- a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
+++ b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-util/diffball-1.0.1 dev-python/snakeoil[python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c00d543e68a8adc333d0660c79200a84
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.2 b/metadata/md5-cache/app-portage/elicense-1.0.2
index 225b0526544d..1a525d894412 100644
--- a/metadata/md5-cache/app-portage/elicense-1.0.2
+++ b/metadata/md5-cache/app-portage/elicense-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.2.tar.gz -> elicense-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8dc2912f5badf1549ca82528877c43b8
diff --git a/metadata/md5-cache/app-portage/elicense-9999 b/metadata/md5-cache/app-portage/elicense-9999
index fd0a4564010d..c01811d4dcfa 100644
--- a/metadata/md5-cache/app-portage/elicense-9999
+++ b/metadata/md5-cache/app-portage/elicense-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b68acb724ada16cf9f69bc486a67e77c
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.8-r3 b/metadata/md5-cache/app-portage/elogv-0.7.8-r3
index 1d50add10610..52d9fa9054ae 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.8-r3
+++ b/metadata/md5-cache/app-portage/elogv-0.7.8-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8038b10690ae88a3e2d410d34acbe730
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.9 b/metadata/md5-cache/app-portage/elogv-0.7.9
index 1f2a069884df..bedcc44e919d 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.9
+++ b/metadata/md5-cache/app-portage/elogv-0.7.9
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.9.tar.gz -> elogv-0.7.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8038b10690ae88a3e2d410d34acbe730
diff --git a/metadata/md5-cache/app-portage/esearch-1.3-r3 b/metadata/md5-cache/app-portage/esearch-1.3-r3
index 775d7d16366c..22a1acb585c7 100644
--- a/metadata/md5-cache/app-portage/esearch-1.3-r3
+++ b/metadata/md5-cache/app-portage/esearch-1.3-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage python_targets_python3_8? ( dev-lang/python:3.8[readlin
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/downloads/fuzzyray/esearch/esearch-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d45cbb1c8ff74a4b7ada770769104a4
diff --git a/metadata/md5-cache/app-portage/esearch-9999 b/metadata/md5-cache/app-portage/esearch-9999
index bddae1fb386b..10c68a76b4af 100644
--- a/metadata/md5-cache/app-portage/esearch-9999
+++ b/metadata/md5-cache/app-portage/esearch-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c334b1bc898e3130ba043f0b5f8d410
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
index d93f261491c9..e5bd7f04c4e4 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_8? ( dev
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4420b609b53b0de00ca14ef2e3bf5e3e
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
index 94d095009c8c..c1bc59faa837 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_8? ( dev
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11d1b9e3521f8fc5d5545a5c8eae1367
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
index bfa1f75f4932..ee38ba893505 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10681e8480705db1ff9331574920dcae
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index 15ec22744472..3fa857407f21 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fef1badad4b28ad91c7c1a7ba316ff54
diff --git a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7 b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
index feabc68ca718..09d416f11d00 100644
--- a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
+++ b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage python_targets_python3_8? ( dev-lang/python:3.8 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/downloads/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/archive/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed.tar.gz -> g-octave-db-bdf02cb.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/g-octave-patches-0.4.1-r7.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7a7c79a7a17c5040fab45061c493004
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
index f4290eef3f6b..46da8e0acf8f 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=893736a017c5946ab80748d7f9a742c1
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.2 b/metadata/md5-cache/app-portage/g-sorcery-0.2.2
index ac4d73735ebb..b7163a08278a 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.2
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/g-sorcery.git/snapshot/g-sorcery-0.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a3ebe940bab2d3f1d510bcd6f78161f
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1 b/metadata/md5-cache/app-portage/gander-0.0.1
index 922ddf019775..5dbaa725c4ff 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1
+++ b/metadata/md5-cache/app-portage/gander-0.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b1e4e1e6e2e61287dae3acf801236d9
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1-r1 b/metadata/md5-cache/app-portage/gander-0.0.1-r1
index 3cd032a474f1..9c8029b972ee 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1-r1
+++ b/metadata/md5-cache/app-portage/gander-0.0.1-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/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cade19949f0ed6ee6cb3885dcb76b81b
diff --git a/metadata/md5-cache/app-portage/gemato-16.2 b/metadata/md5-cache/app-portage/gemato-16.2
index 8a1392b4d840..5271109d88d2 100644
--- a/metadata/md5-cache/app-portage/gemato-16.2
+++ b/metadata/md5-cache/app-portage/gemato-16.2
@@ -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/g/gemato/gemato-16.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9dcab41c8ecf63e6f527add0e8d6f58
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index d422e2274893..363de309bc8b 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -10,5 +10,5 @@ RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07028f8a81b674813068a4dfaa7d5064
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r3 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r3
index b47da895725a..69ab5f4c2e5e 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c00238f83fa38899cae99e3b45120a4a
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.1-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.5.1-r1
index c8371f2cbb61..32db9b2fd49a 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.1-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.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=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78ba17317adcb99f007700fa359947a8
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index d5a953d5c8e6..47171073ed27 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=beb5b241658ba96fe0dfaae48d2ddee7
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.3 b/metadata/md5-cache/app-portage/gentoopm-0.3.3
index aaaca21d5107..d332148ce8dc 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.3
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.3
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.3.tar.gz -> gentoopm-0.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cde0ff8296a0e84f28baefbc96419a07
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index 8c21822dcb7d..1e182a17c253 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/portage-2.1.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=802f90d2e7d05b28eeffb580bcbeacd7
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.6.1 b/metadata/md5-cache/app-portage/gpyutils-0.6.1
index d8d268cc74b5..149b13f8f68c 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.6.1
+++ b/metadata/md5-cache/app-portage/gpyutils-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets
 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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9558d862cd3726691b810829304eae01
diff --git a/metadata/md5-cache/app-portage/gpyutils-9999 b/metadata/md5-cache/app-portage/gpyutils-9999
index c2f972a4ce9d..32f4c4197540 100644
--- a/metadata/md5-cache/app-portage/gpyutils-9999
+++ b/metadata/md5-cache/app-portage/gpyutils-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3912998886d46e3e9693610c4c600ac
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 192d2deb2b63..d41bc9337e8d 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-cryp
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd5bf0eba419b7f8367001464aae144f
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index f5004f520fe9..4bc4781a3ac6 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-cryp
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d19513638f1155a27ab46720fd87b7e
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
index d4361540e358..831cb90abf21 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python3_8(-)?] dev-python/sexpdata[
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c47b727b15d9d1083d3f6d5ed6416b16
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.2.1 b/metadata/md5-cache/app-portage/gs-elpa-0.2.1
index 474f259a387c..9ac015f8284b 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.2.1
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/gs-elpa-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2671fef02bb1750cee29c1bdb100a83
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.5.3 b/metadata/md5-cache/app-portage/iwdevtools-0.5.3
deleted file mode 100644
index 4b8e00488236..000000000000
--- a/metadata/md5-cache/app-portage/iwdevtools-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/help2man test? ( app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
-EAPI=8
-HOMEPAGE=https://github.com/ionenwks/iwdevtools
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.5.3.tar.gz -> iwdevtools-0.5.3.tar.gz
-_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1a0e2ad8c1c58cd638e5a356d7aa319
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.6.0 b/metadata/md5-cache/app-portage/iwdevtools-0.6.0
deleted file mode 100644
index 4d21fdf27aa0..000000000000
--- a/metadata/md5-cache/app-portage/iwdevtools-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/help2man test? ( app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
-EAPI=8
-HOMEPAGE=https://github.com/ionenwks/iwdevtools
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.6.0.tar.gz -> iwdevtools-0.6.0.tar.gz
-_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1a0e2ad8c1c58cd638e5a356d7aa319
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.8.0 b/metadata/md5-cache/app-portage/iwdevtools-0.8.0
new file mode 100644
index 000000000000..b1016d0abf5b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/help2man test? ( app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps/file sys-apps/portage sys-apps/util-linux
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.8.0.tar.gz -> iwdevtools-0.8.0.tar.gz
+_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da6e760cf8b953c5f419ac35c63dc4f7
diff --git a/metadata/md5-cache/app-portage/iwdevtools-9999 b/metadata/md5-cache/app-portage/iwdevtools-9999
index 5ca148901ad9..402b6ac6c6f5 100644
--- a/metadata/md5-cache/app-portage/iwdevtools-9999
+++ b/metadata/md5-cache/app-portage/iwdevtools-9999
@@ -10,4 +10,4 @@ RDEPEND=app-misc/pax-utils app-portage/portage-utils sys-apps/diffutils sys-apps
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a98b344a2c6c529daba360a08e8b79ff
+_md5_=221e51848b7ef6b1ca8996842ea1c804
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.0 b/metadata/md5-cache/app-portage/kuroneko-0.1.0
index 19115c188788..5c193de86064 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.0
+++ b/metadata/md5-cache/app-portage/kuroneko-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/kuroneko/archive/v0.1.0.tar.gz -> kuroneko-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ec7619c11e7ca093f990a0dda9e827d1
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.1 b/metadata/md5-cache/app-portage/kuroneko-0.1.1
index 747d3a0f6040..7720fe398bdd 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.1
+++ b/metadata/md5-cache/app-portage/kuroneko-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/kuroneko/archive/v0.1.1.tar.gz -> kuroneko-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.2 b/metadata/md5-cache/app-portage/kuroneko-0.1.2
index c412164ccb55..04570a3b0e7e 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.2
+++ b/metadata/md5-cache/app-portage/kuroneko-0.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/mgorny/kuroneko/archive/v0.1.2.tar.gz -> kuroneko-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.3 b/metadata/md5-cache/app-portage/kuroneko-0.1.3
index 791c02159058..b9edb222ed3a 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.3
+++ b/metadata/md5-cache/app-portage/kuroneko-0.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/mgorny/kuroneko/archive/v0.1.3.tar.gz -> kuroneko-0.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index c29f2a3782bd..2dc713ffe3d2 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.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://sourceforge/layman/layman-2.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a22746a2707e677b360e3e099e73038a
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 08bc7da63da9..8a1bd0cb3d06 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -11,5 +11,5 @@ RDEPEND=cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercu
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7197b456d11e930f6f7037e9510382f6
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.2 b/metadata/md5-cache/app-portage/metagen-0.7.2
index b978c15fc15a..4550ab5af4fb 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.2
+++ b/metadata/md5-cache/app-portage/metagen-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cbe84d7be42b318aedcf2c25c2171c0
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.2-r1 b/metadata/md5-cache/app-portage/metagen-0.7.2-r1
index c703d415dfe1..5c808283d6fe 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.2-r1
+++ b/metadata/md5-cache/app-portage/metagen-0.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b08069cc1d320fe99a5ec45e6cc1dfc
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.2-r2 b/metadata/md5-cache/app-portage/metagen-0.7.2-r2
new file mode 100644
index 000000000000..05d129ef8a81
--- /dev/null
+++ b/metadata/md5-cache/app-portage/metagen-0.7.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=7
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/m/metagen/metagen-0.7.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c16515added79bf2b8eff96774f04dd4
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index ba7e751170c8..5446c7fda272 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fecbca2d0dc964669ad9f17c296e03f
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
index f873601aa318..7821f22f65c5 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0963ce559e60411f8846c7aa0cd113c9
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 013b1376e472..02ed1edc759e 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] ~dev-python/ssl-fetch-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9eafe0b5eab2fcb9039aa28800aa4da
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.19 b/metadata/md5-cache/app-portage/nattka-0.2.19
index 55a8b5a5c0e1..47be1a9f7078 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.19
+++ b/metadata/md5-cache/app-portage/nattka-0.2.19
@@ -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/mgorny/nattka/archive/v0.2.19.tar.gz -> nattka-0.2.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=593ac242a20a9485bbe6d9d5d038cfb7
diff --git a/metadata/md5-cache/app-portage/nattka-9999 b/metadata/md5-cache/app-portage/nattka-9999
index aa15abbfaa5a..9b82f96466b1 100644
--- a/metadata/md5-cache/app-portage/nattka-9999
+++ b/metadata/md5-cache/app-portage/nattka-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17a5ce7332422d251f2986ec58cec4c9
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3-r2 b/metadata/md5-cache/app-portage/overlint-0.5.3-r2
index 1b1edc57948f..c92bdd88e600 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3-r2
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.hartwork.org/public/overlint-0.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51dde1e62b494c57b78f793c680663bb
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
index b42b96e15292..dc08b3a38f5e 100644
--- a/metadata/md5-cache/app-portage/pfl-3.1-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7bb5881fcf01172fae768f79f7187a5
diff --git a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0 b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
index a8b96b837e6f..dabbe312774b 100644
--- a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
+++ b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/pkg-testing-tools/archive/refs/tags/v0.1.0.tar.gz -> pkg-testing-tools-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa34a6231a5a2645e62947b7a2a95ff4
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.2 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.2
deleted file mode 100644
index 6813a5cd4720..000000000000
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
-EAPI=7
-HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-LICENSE=GPL-2
-RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.2.tar.gz -> recover-broken-vdb-0.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87820636fc49af0c91684e1d4cf9423b
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.3 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.3
deleted file mode 100644
index e81c8f4c546b..000000000000
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
-EAPI=7
-HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.3.tar.gz -> recover-broken-vdb-0.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=faf9efe4ab6fe10281f4875d75bfec06
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.4 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.4
deleted file mode 100644
index e71a28a3fc9c..000000000000
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
-EAPI=7
-HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-LICENSE=GPL-2
-RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.4.tar.gz -> recover-broken-vdb-0.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87820636fc49af0c91684e1d4cf9423b
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.5 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.5
new file mode 100644
index 000000000000..7dc3728bc01a
--- /dev/null
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.5
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
+EAPI=7
+HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
+IUSE=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
+LICENSE=GPL-2
+RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.5.tar.gz -> recover-broken-vdb-0.0.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8edc7077c79684c83217cf7c949f6250
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.7 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.7
new file mode 100644
index 000000000000..54bae6f533bd
--- /dev/null
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.7
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
+EAPI=7
+HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
+IUSE=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
+LICENSE=GPL-2
+RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.7.tar.gz -> recover-broken-vdb-0.0.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8edc7077c79684c83217cf7c949f6250
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.8 b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.8
new file mode 100644
index 000000000000..49d4947f0098
--- /dev/null
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-0.0.8
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
+EAPI=7
+HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
+IUSE=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
+LICENSE=GPL-2
+RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/0.0.8.tar.gz -> recover-broken-vdb-0.0.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2237c831728511b32d761d2427624740
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-9999 b/metadata/md5-cache/app-portage/recover-broken-vdb-9999
index 1f1303303e9c..5c191cb84cff 100644
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-9999
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[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] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=faf9efe4ab6fe10281f4875d75bfec06
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2237c831728511b32d761d2427624740
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.23 b/metadata/md5-cache/app-portage/repoman-2.3.23
index 8d3359f4a2a7..5a16920453d0 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.23
+++ b/metadata/md5-cache/app-portage/repoman-2.3.23
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_8(-)?] >=dev-python/lxm
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.23.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=438db3f5d156ea8df429db7348337494
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.2 b/metadata/md5-cache/app-portage/repoman-3.0.2
index 804c859a1fb9..c7a23f749353 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.2
+++ b/metadata/md5-cache/app-portage/repoman-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.2.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3ec5bd19b409d73757ea0dffb1a3153
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.3-r1 b/metadata/md5-cache/app-portage/repoman-3.0.3-r1
index 178747b0578a..964b34beea7d 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.3-r1
+++ b/metadata/md5-cache/app-portage/repoman-3.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.3.tar.bz2 https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> repoman-3.0.3-unit-test-bug-779055.patch https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> repoman-3.0.3-version-bug-779508.patch https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> repoman-3.0.3-unit-test-bug-779967.patch
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=711ffa917086143dec2a97fe1a33c433
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index f5a8a9e3fe75..6d6219bd17c1 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[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=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+)] ) >=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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7844e6bdcb2ea516658e92b55ba9df01
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
index f588570e350f..71eb6b2fdfcc 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/smart-live-rebuild/archive/v1.3.7.tar.gz -> smart-live-rebuild-1.3.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df0376ecb98dcd82b9b869418b254dad
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 0eb1ad377c93..362fc13a421a 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ea481b8719a64d539748dda4c2ad2cc
diff --git a/metadata/md5-cache/app-portage/tatt-0.8 b/metadata/md5-cache/app-portage/tatt-0.8
index 0c5e6a715885..52a6f4677448 100644
--- a/metadata/md5-cache/app-portage/tatt-0.8
+++ b/metadata/md5-cache/app-portage/tatt-0.8
@@ -10,5 +10,5 @@ RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_8(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/tatt/archive/v0.8.tar.gz -> tatt-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f906ae6244bdc683b6cc5396ef685ed9
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 22441982488b..4923a0666d26 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-portage/nattka[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-client/pybugz python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f8027c68dd234819878bac38ae3512e
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 6f9d2cd22001..e19177d47f21 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.3-r1 b/metadata/md5-cache/app-shells/autojump-22.5.3-r1
index 123de143de7b..fed2c86a4abd 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3-r1
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=ipython? ( ^^ ( python_single_target_python3_8 python_single_target
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=3a1b52bf845c7515d714e0298fa8544a
diff --git a/metadata/md5-cache/app-shells/fzy-1.0-r1 b/metadata/md5-cache/app-shells/fzy-1.0-r1
index 42a46dfadf19..3a1799d22d02 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	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=104f6d7a584a6191ef7015f3ab31aaac
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 3e6efee784be..0e09ff815643 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	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=582df4bef5f7f052901fbfd57a1435ee
diff --git a/metadata/md5-cache/app-shells/powerline-2.7-r2 b/metadata/md5-cache/app-shells/powerline-2.7-r2
index 0fc98ef8bb83..f1eb6a58b3fa 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7-r2
+++ b/metadata/md5-cache/app-shells/powerline-2.7-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e292218040392021f0fecab29d80127d
diff --git a/metadata/md5-cache/app-shells/powerline-9999 b/metadata/md5-cache/app-shells/powerline-9999
index 77cd62e8b24b..c712c9327931 100644
--- a/metadata/md5-cache/app-shells/powerline-9999
+++ b/metadata/md5-cache/app-shells/powerline-9999
@@ -9,5 +9,5 @@ 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 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30938c92f597c974855eb26d825e9fec
diff --git a/metadata/md5-cache/app-shells/thefuck-3.28 b/metadata/md5-cache/app-shells/thefuck-3.28
index f79b3c8f1ee5..9b2596c75f8e 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.28
+++ b/metadata/md5-cache/app-shells/thefuck-3.28
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.28.tar.gz -> thefuck-3.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=291b51a68a3d258f1524eaa8bbae2cc7
diff --git a/metadata/md5-cache/app-shells/thefuck-3.30 b/metadata/md5-cache/app-shells/thefuck-3.30
index 198af07e5258..76e4ee66bd7f 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.30
+++ b/metadata/md5-cache/app-shells/thefuck-3.30
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.30.tar.gz -> thefuck-3.30.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eafd4ca103a6c192088438b247910262
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 71ecfc4be888..3ae4c9b5ca73 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/bibutils-7.1 b/metadata/md5-cache/app-text/bibutils-7.1
new file mode 100644
index 000000000000..5645c0fa41ee
--- /dev/null
+++ b/metadata/md5-cache/app-text/bibutils-7.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure prepare test
+DESCRIPTION=Interconverts between various bibliography formats using common XML intermediate
+EAPI=7
+HOMEPAGE=https://sourceforge.net/p/bibutils/home/Bibutils/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/bibutils/bibutils_7.1_src.tgz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e480e045d4f2b6e8d875a744023e2a6c
diff --git a/metadata/md5-cache/app-text/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index f22ff5a5c77d..4bd73588294f 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a94f3838aa5e8a782b7a5d50507c4f9e
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index 04b58f891f1e..c3db12a5a70f 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Japanese Morphological Analysis System, ChaSen
 EAPI=5
 HOMEPAGE=http://chasen-legacy.sourceforge.jp/
 IUSE=perl static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86 ~sparc-solaris
+KEYWORDS=amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris
 LICENSE=BSD
 PDEPEND=>=app-dicts/ipadic-2.7.0
 RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71c26239131915c24cb01462ad341ba2
+_md5_=449c66fba4d94572f58b1f072a6aa674
diff --git a/metadata/md5-cache/app-text/cmark-0.30.1 b/metadata/md5-cache/app-text/cmark-0.30.1
deleted file mode 100644
index 7fef1ca0f896..000000000000
--- a/metadata/md5-cache/app-text/cmark-0.30.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=CommonMark parsing and rendering library and program in C
-EAPI=7
-HOMEPAGE=https://github.com/commonmark/cmark
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0/0.30.1
-SRC_URI=https://github.com/commonmark/cmark/archive/0.30.1.tar.gz -> cmark-0.30.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcd172f70331dc5e5265d078335920a4
diff --git a/metadata/md5-cache/app-text/cmark-0.30.2 b/metadata/md5-cache/app-text/cmark-0.30.2
new file mode 100644
index 000000000000..87ec71b90cf7
--- /dev/null
+++ b/metadata/md5-cache/app-text/cmark-0.30.2
@@ -0,0 +1,13 @@
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CommonMark parsing and rendering library and program in C
+EAPI=8
+HOMEPAGE=https://github.com/commonmark/cmark
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/0.30.2
+SRC_URI=https://github.com/commonmark/cmark/archive/0.30.2.tar.gz -> cmark-0.30.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6ab56a45f731415cf14aff103db98aa2
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.11-r1 b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
index 4d89e38e304f..4d8a7020afc2 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f839b42b78055db142ca1b66483a2ca6
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index a958adca06ef..add33ee790d5 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a563165cd41fcf27506e02e1cd293a19
diff --git a/metadata/md5-cache/app-text/dictd-1.13.0-r3 b/metadata/md5-cache/app-text/dictd-1.13.0-r3
index 700027f4b1a5..0d24e4defec1 100644
--- a/metadata/md5-cache/app-text/dictd-1.13.0-r3
+++ b/metadata/md5-cache/app-text/dictd-1.13.0-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Dictionary Client/Server for the DICT protocol
 EAPI=7
 HOMEPAGE=http://www.dict.org/ https://sourceforge.net/projects/dict/
 IUSE=dbi judy minimal test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-1+ GPL-2+
 RDEPEND=acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 dev-libs/libmaa sys-libs/zlib dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/dictd-1.13.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69d4ae3772dab74fd3559f943c032ee0
+_md5_=bf9fa45c0752f57f82e627c24e4e2914
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
index 2760f1d7f5f7..053a6d5f82a2 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=7
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk +jpeg2k l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.54
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.54-patchset-01.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e1197394c1897840abb3053718d9f5a
+_md5_=fae01edc18f979de87861261c7c3b522
diff --git a/metadata/md5-cache/app-text/grip-4.5.2-r2 b/metadata/md5-cache/app-text/grip-4.5.2-r2
index 555c96360477..b604f851360b 100644
--- a/metadata/md5-cache/app-text/grip-4.5.2-r2
+++ b/metadata/md5-cache/app-text/grip-4.5.2-r2
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0[python_targets_pypy3(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d0bd10da86301101c2b55002010f1f3
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index 8602b9c4d90b..65774e836196 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-4.1.tar.bz2
 _eclasses_=lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fb27388c6f263b3d1df773c6b3d2c69
+_md5_=5ee12949b3c11e4baeb3b0ba0eadbbf0
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 72b563d7afa4..19a21c75e541 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=160d6718c316280eecd37a9cb376c4cf
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index cd668bb85ea7..24ec5955ed5c 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -4,10 +4,10 @@ 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( 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	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d2dc003c874245fb2c1ce26d40f5071
+_md5_=169cbefc81c9147e98dbead586bc4017
diff --git a/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6
new file mode 100644
index 000000000000..a3cb3ca0b7a8
--- /dev/null
+++ b/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.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? ( 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=An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser
+EAPI=8
+HOMEPAGE=https://github.com/cabo/kramdown-rfc2629
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.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 )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.5.6.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7bcac690b7881a0e195c4a3c750f85ac
diff --git a/metadata/md5-cache/app-text/krop-0.6.0-r1 b/metadata/md5-cache/app-text/krop-0.6.0-r1
index f6925e256480..28f0d66aacac 100644
--- a/metadata/md5-cache/app-text/krop-0.6.0-r1
+++ b/metadata/md5-cache/app-text/krop-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=72ef59a64abbdc3f1a9e404e1b403a04
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 1e28977aadd1..a7d13cf05c0f 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets] python_targets_python3_8? ( dev-lang/python:3.8 ) 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
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d0d8824c802680073f7efabbc19eecdd
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.6 b/metadata/md5-cache/app-text/mandoc-1.14.6
new file mode 100644
index 000000000000..cf21dc655cdd
--- /dev/null
+++ b/metadata/md5-cache/app-text/mandoc-1.14.6
@@ -0,0 +1,14 @@
+BDEPEND=cgi? ( app-text/highlight )
+DEFINED_PHASES=compile install postinst prepare pretend
+DEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) cgi? ( sys-libs/zlib[static-libs] )
+DESCRIPTION=Suite of tools compiling mdoc and man
+EAPI=7
+HOMEPAGE=https://mdocml.bsd.lv/
+IUSE=cgi system-man
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=ISC
+RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db )
+SLOT=0
+SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.6.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f8ccb1696f3c9fcfa9520df928d1d49
diff --git a/metadata/md5-cache/app-text/nfoview-1.27.1 b/metadata/md5-cache/app-text/nfoview-1.27.1
index f8534e708df0..cd688229016f 100644
--- a/metadata/md5-cache/app-text/nfoview-1.27.1
+++ b/metadata/md5-cache/app-text/nfoview-1.27.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?] media-fonts/terminu
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.27.1.tar.gz -> nfoview-1.27.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b644e56745a8fc4c2f0b686cd74215c1
diff --git a/metadata/md5-cache/app-text/nfoview-1.28-r1 b/metadata/md5-cache/app-text/nfoview-1.28-r1
index 89917d1d0bac..22e67317bd16 100644
--- a/metadata/md5-cache/app-text/nfoview-1.28-r1
+++ b/metadata/md5-cache/app-text/nfoview-1.28-r1
@@ -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/otsaloma/nfoview/archive/1.28.tar.gz -> nfoview-1.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=51cac78e25c1d3c57e1b3180baabfac1
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 57efcd73f9f8..ec01852b7905 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-fonts/cascadia-code python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b78f50b1f2797f3fce9c183a187607a9
diff --git a/metadata/md5-cache/app-text/openpaperwork-core-2.0.2 b/metadata/md5-cache/app-text/openpaperwork-core-2.0.2
index 281fe410ab0d..c56a9d4c8cc7 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.0.2
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-core/openpaperwork-core-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc659b687aace7df0c561f058ce4081a
diff --git a/metadata/md5-cache/app-text/openpaperwork-core-2.0.3 b/metadata/md5-cache/app-text/openpaperwork-core-2.0.3
index 163fb0f53a61..280601513ba3 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.0.3
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-core/openpaperwork-core-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc659b687aace7df0c561f058ce4081a
diff --git a/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.2 b/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.2
index 8c007e51e993..e8b4b2172856 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.2
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-gtk/openpaperwork-gtk-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=464e161475bc47525d98c3e263ef7911
diff --git a/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.3 b/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.3
index 9dee9b821d1f..f1e1bd640c69 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.3
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-gtk/openpaperwork-gtk-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=464e161475bc47525d98c3e263ef7911
diff --git a/metadata/md5-cache/app-text/paperwork-2.0.2 b/metadata/md5-cache/app-text/paperwork-2.0.2
index 529c8456bc03..6eca22ad3b61 100644
--- a/metadata/md5-cache/app-text/paperwork-2.0.2
+++ b/metadata/md5-cache/app-text/paperwork-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=~app-text/openpaperwork-core-2.0.2[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=997b5258186cfa456bf14264da311713
diff --git a/metadata/md5-cache/app-text/paperwork-2.0.3 b/metadata/md5-cache/app-text/paperwork-2.0.3
index 13934149ae9f..9feb22e6f2f1 100644
--- a/metadata/md5-cache/app-text/paperwork-2.0.3
+++ b/metadata/md5-cache/app-text/paperwork-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=~app-text/openpaperwork-core-2.0.3[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7fff2c81ccd27cd75fd48c4fd71953fc
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.0.2-r1 b/metadata/md5-cache/app-text/paperwork-backend-2.0.2-r1
index 44ccb2c80d58..a396fad9cdba 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.0.2-r1
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f63d5e9b20a792fa8c0e6ff2b34cc0f
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.0.3 b/metadata/md5-cache/app-text/paperwork-backend-2.0.3
index b30583f4bf58..f28c9b452d7e 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.0.3
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39a7530ac23ce3e5df58f7ed7e38eaa7
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.6.2 b/metadata/md5-cache/app-text/pdfarranger-1.6.2
index 8ee9d6fe45b8..971dcb461ca6 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 3307016aa872..99f6a6e8bcfb 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 2e4064a4f05a..4cd5ae0a9a57 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d4cb739aa46e42b68d4c05b7332335d2
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index c7aef0be1f5e..bca1e49d4b39 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3020a98f2d85353ea61c3a08c43d2c3
diff --git a/metadata/md5-cache/app-text/pelican-4.5.3 b/metadata/md5-cache/app-text/pelican-4.5.3
index 1e5bed351f4c..cae712ea8765 100644
--- a/metadata/md5-cache/app-text/pelican-4.5.3
+++ b/metadata/md5-cache/app-text/pelican-4.5.3
@@ -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/getpelican/pelican/archive/4.5.3.tar.gz -> pelican-4.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=651cf8e5c7d25d2a3ebf5c4cc259c529
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index 7da390bb1ba5..33fb39042f90 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/feedgenerator-1.9[python_targets_python3_8(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b0ce035e749a5d503c52c6598e8e2b4
diff --git a/metadata/md5-cache/app-text/po4a-0.63-r1 b/metadata/md5-cache/app-text/po4a-0.63-r1
index ff878344ae1b..dcee25cb8c3f 100644
--- a/metadata/md5-cache/app-text/po4a-0.63-r1
+++ b/metadata/md5-cache/app-text/po4a-0.63-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to ease the translation of documentation
 EAPI=7
 HOMEPAGE=https://po4a.org/
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=b443fbd259442811c649c8632dac8cdd
+_md5_=c1a711253038dd35621b4b6b11ae3970
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.1 b/metadata/md5-cache/app-text/pytextile-4.0.1
index fb65049b1856..4251300425f7 100644
--- a/metadata/md5-cache/app-text/pytextile-4.0.1
+++ b/metadata/md5-cache/app-text/pytextile-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/4.0.1.tar.gz -> pytextile-4.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c00219132b7f3e1cae5c0c293aebd0ad
diff --git a/metadata/md5-cache/app-text/rarian-0.8.1-r3 b/metadata/md5-cache/app-text/rarian-0.8.1-r3
index 5ec3f4817188..7b84b188813c 100644
--- a/metadata/md5-cache/app-text/rarian-0.8.1-r3
+++ b/metadata/md5-cache/app-text/rarian-0.8.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A documentation metadata library
 EAPI=6
 HOMEPAGE=https://rarian.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://rarian.freedesktop.org/Releases/rarian-0.8.1.tar.gz https://dev.gentoo.org/~eva/distfiles/rarian/rarian-0.8.1-r3-patches.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4fd197b93c5f2d7d13837e3119472447
+_md5_=9791f08724fab54fef59c6815db35bd7
diff --git a/metadata/md5-cache/app-text/recode-3.7.9 b/metadata/md5-cache/app-text/recode-3.7.9
index e8d0fd3cbc46..cc75b210553a 100644
--- a/metadata/md5-cache/app-text/recode-3.7.9
+++ b/metadata/md5-cache/app-text/recode-3.7.9
@@ -5,11 +5,11 @@ DESCRIPTION=Convert files between various character sets
 EAPI=7
 HOMEPAGE=https://github.com/rrthomas/recode
 IUSE=nls 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 ~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=GPL-3+
 RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.9/recode-3.7.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f9a8ef379957bc788f7d8ef011a9eb6
+_md5_=96eb3daa6d94ac1d908baedb5eb7abad
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index cdce2a532897..6ce21e9e20de 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bca5ca38e357fa044ad21c8bbee06069
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.4 b/metadata/md5-cache/app-text/rnc2rng-2.6.4
index 691565a26ce6..76a4da90c4b0 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.4
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d98c6c4eb10a441b05fffdc78396ab8
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1 b/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
index b324c4b241d6..32e370dd1fd9 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f0aa747ed4f0572a571e3a38f39ec0f
diff --git a/metadata/md5-cache/app-text/rpl-1.6.7 b/metadata/md5-cache/app-text/rpl-1.6.7
index b9badd4610ab..39ac43d6be6e 100644
--- a/metadata/md5-cache/app-text/rpl-1.6.7
+++ b/metadata/md5-cache/app-text/rpl-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/r/rpl/rpl_1.6.7.orig.tar.gz -> rpl-1.6.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c943653ab2939339643e1987efe71506
diff --git a/metadata/md5-cache/app-text/rpl-1.9.1 b/metadata/md5-cache/app-text/rpl-1.9.1
index f93438a1b6bd..8cf9b3cf4e2f 100644
--- a/metadata/md5-cache/app-text/rpl-1.9.1
+++ b/metadata/md5-cache/app-text/rpl-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/rrthomas/rpl/archive/v1.9.1.tar.gz -> rpl-1.9.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b68ef2a2e27f3ae9ad095f864c6863f
diff --git a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1 b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
index d0ada80d0a1e..04e84296b567 100644
--- a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
+++ b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/ https://github.com/huzheng001/stardict-3
 IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3] sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango espeak? ( >=app-accessibility/espeak-1.29 ) flite? ( app-accessibility/flite ) gucharmap? ( gnome-extra/gucharmap:2.90= ) spell? ( >=app-text/enchant-1.2:0 ) tools? ( dev-db/mysql-connector-c dev-libs/expat dev-libs/libpcre:= dev-libs/libxml2:= ) info? ( sys-apps/texinfo ) fortune? ( games-misc/fortune-mod ) perl? ( dev-lang/perl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/stardict-4.0.0_pre20170304.tar.xz pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad25014fd30ea0a5175f2ad7cb88fbff
+_md5_=7f66a981167101ab61ba625328475b6a
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index f7980122b0dc..138c9aedc7a8 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14b8e6d136fa818e94774c570e3a3849
diff --git a/metadata/md5-cache/app-text/xapers-0.9.0 b/metadata/md5-cache/app-text/xapers-0.9.0
index f99c0bf5159f..c5fe381f2550 100644
--- a/metadata/md5-cache/app-text/xapers-0.9.0
+++ b/metadata/md5-cache/app-text/xapers-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/jrollins/xapers/-/archive/0.9.0/xapers-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54794b0e74a83b167a8c623b73bebbc8
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index a7e6bf3d44a2..0269b75410e5 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8187074496484056344c326120026e2d
diff --git a/metadata/md5-cache/app-text/xmldiff-2.4 b/metadata/md5-cache/app-text/xmldiff-2.4
index aa70797eec56..3478018e5949 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.4
+++ b/metadata/md5-cache/app-text/xmldiff-2.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/Shoobx/xmldiff/archive/2.4.tar.gz -> xmldiff-2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e2c1fa32b534fb3fc8b02552027236c
diff --git a/metadata/md5-cache/app-text/yelp-tools-40.0 b/metadata/md5-cache/app-text/yelp-tools-40.0
index 8e9f55646f43..41439be1a707 100644
--- a/metadata/md5-cache/app-text/yelp-tools-40.0
+++ b/metadata/md5-cache/app-text/yelp-tools-40.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=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_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38 dev-util/desktop-file-utils x11-misc/shared-mime-info
+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] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of tools for building and converting documentation
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) 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/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/40/yelp-tools-40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c01a05af4cc1c5c9651dd0edbd6a120b
+_md5_=6db9d7ca974e70247975fcec9201ad6c
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 9b4f84304478..9cec2c76655f 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/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index 447134ca1e0b..3a83fd65771f 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cdbd4ab10c2b8efaebe34e3f1809d459
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 1ff2efb1ba21..47c873ca170f 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.17 b/metadata/md5-cache/app-xemacs/xemacs-eterm-1.17
deleted file mode 100644
index 5061a77e2539..000000000000
--- a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Terminal emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/eterm-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=061e608091db1b5251fc72843e3c78bb
diff --git a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.18-r1 b/metadata/md5-cache/app-xemacs/xemacs-eterm-1.18-r1
deleted file mode 100644
index a8106461200b..000000000000
--- a/metadata/md5-cache/app-xemacs/xemacs-eterm-1.18-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Terminal emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/eterm-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=39927775e3319d051cc7ad19ff2f57dd
diff --git a/metadata/md5-cache/app-xemacs/xemacs-ispell-1.32 b/metadata/md5-cache/app-xemacs/xemacs-ispell-1.32
deleted file mode 100644
index 96a11a745936..000000000000
--- a/metadata/md5-cache/app-xemacs/xemacs-ispell-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Spell-checking with GNU ispell
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/ispell-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=90dd4823863443d4b9f05bb287284fc2
diff --git a/metadata/md5-cache/app-xemacs/xlib-1.14 b/metadata/md5-cache/app-xemacs/xlib-1.14
deleted file mode 100644
index 45e0124ca681..000000000000
--- a/metadata/md5-cache/app-xemacs/xlib-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs interface to X server
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xlib-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=88e30c170b3c85ec1b0f6cbcd4953dbd
diff --git a/metadata/md5-cache/app-xemacs/xslide-1.09 b/metadata/md5-cache/app-xemacs/xslide-1.09
deleted file mode 100644
index cbfac25eabe4..000000000000
--- a/metadata/md5-cache/app-xemacs/xslide-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XSL editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xslide-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=49e6a20f046caa063876a09f882b4cb4
diff --git a/metadata/md5-cache/app-xemacs/xwem-1.22 b/metadata/md5-cache/app-xemacs/xwem-1.22
deleted file mode 100644
index b77cf880b803..000000000000
--- a/metadata/md5-cache/app-xemacs/xwem-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=X Emacs Window Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=24847621a36a9af342e849ef65fb2a08
diff --git a/metadata/md5-cache/app-xemacs/xwem-1.23 b/metadata/md5-cache/app-xemacs/xwem-1.23
deleted file mode 100644
index 1603cb47bbd6..000000000000
--- a/metadata/md5-cache/app-xemacs/xwem-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=X Emacs Window Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=24847621a36a9af342e849ef65fb2a08
diff --git a/metadata/md5-cache/app-xemacs/zenirc-1.16 b/metadata/md5-cache/app-xemacs/zenirc-1.16
deleted file mode 100644
index c2b701f5f274..000000000000
--- a/metadata/md5-cache/app-xemacs/zenirc-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=ZENIRC IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/zenirc-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=63f40f0add41d1c56d6d7f8ba8d0fdef
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e542d1c314ca..5449859c94ea 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/cpp-taskflow-3.2.0 b/metadata/md5-cache/dev-cpp/cpp-taskflow-3.2.0
new file mode 100644
index 000000000000..cd02cd407a59
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/cpp-taskflow-3.2.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Modern C++ Parallel Task Programming
+EAPI=8
+HOMEPAGE=https://cpp-taskflow.github.io
+IUSE=examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cpp-taskflow/cpp-taskflow/archive/v3.2.0.tar.gz -> cpp-taskflow-3.2.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6aafdb748c942661c2f987cf57143c0b
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.3.18 b/metadata/md5-cache/dev-cpp/notcurses-2.3.18
deleted file mode 100644
index 18dcd3d199f2..000000000000
--- a/metadata/md5-cache/dev-cpp/notcurses-2.3.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
-DESCRIPTION=Blingful TUIs and character graphics
-EAPI=7
-HOMEPAGE=https://notcurses.com
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.3.18.tar.gz -> notcurses-2.3.18.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.3.18/notcurses-doc-2.3.18.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d58c45c55d0ebd9c8ce80465c2e581a6
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.4.3 b/metadata/md5-cache/dev-cpp/notcurses-2.4.3
new file mode 100644
index 000000000000..a6d8d6be8ff4
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/notcurses-2.4.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
+DESCRIPTION=Blingful TUIs and character graphics
+EAPI=8
+HOMEPAGE=https://notcurses.com
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.4.3.tar.gz -> notcurses-2.4.3.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.4.3/notcurses-doc-2.4.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a15e91e92241388094a3e94577e39437
diff --git a/metadata/md5-cache/dev-cpp/random123-1.13.2 b/metadata/md5-cache/dev-cpp/random123-1.13.2
deleted file mode 100644
index 0f7fb8040cb6..000000000000
--- a/metadata/md5-cache/dev-cpp/random123-1.13.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=library of counter-based random number generators (CBRNGs)
-EAPI=7
-HOMEPAGE=https://www.deshawresearch.com/resources_random123.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://www.deshawresearch.com/downloads/download_random123.cgi/Random123-1.13.2.tar.gz
-_md5_=2b1aea3b57894eb89acd75c866b34bf9
diff --git a/metadata/md5-cache/dev-cpp/random123-1.14.0 b/metadata/md5-cache/dev-cpp/random123-1.14.0
new file mode 100644
index 000000000000..701909457d19
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/random123-1.14.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=library of counter-based random number generators (CBRNGs)
+EAPI=8
+HOMEPAGE=https://www.deshawresearch.com/resources_random123.html
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/DEShawResearch/random123/archive/refs/tags/v1.14.0.tar.gz -> random123-1.14.0.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9d736d6a05050acb04d5d42186ecb357
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 0b7439d8d4ef..30c32025f1a3 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/barman-2.12 b/metadata/md5-cache/dev-db/barman-2.12
index e00d21b0f5be..368ed1f7aa84 100644
--- a/metadata/md5-cache/dev-db/barman-2.12
+++ b/metadata/md5-cache/dev-db/barman-2.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/2ndquadrant-it/barman/archive/release/2.12.tar.gz -> barman-2.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13f0f75ad5e388006627d3028ebdbc43
diff --git a/metadata/md5-cache/dev-db/citus-10.0.5 b/metadata/md5-cache/dev-db/citus-10.0.5
index b1094dd1786e..6b4053ad01fa 100644
--- a/metadata/md5-cache/dev-db/citus-10.0.5
+++ b/metadata/md5-cache/dev-db/citus-10.0.5
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/citusdata/citus/archive/v10.0.5.tar.gz -> citus-10.0.5.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/citus-10.1.3 b/metadata/md5-cache/dev-db/citus-10.1.3
index a36ee58dd950..c72406d7a36c 100644
--- a/metadata/md5-cache/dev-db/citus-10.1.3
+++ b/metadata/md5-cache/dev-db/citus-10.1.3
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/citusdata/citus/archive/v10.1.3.tar.gz -> citus-10.1.3.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=c31462be49577232c82d4f0766921cbe
diff --git a/metadata/md5-cache/dev-db/citus-10.2.0 b/metadata/md5-cache/dev-db/citus-10.2.0
index 61cfd5d8ba65..c7bec100353a 100644
--- a/metadata/md5-cache/dev-db/citus-10.2.0
+++ b/metadata/md5-cache/dev-db/citus-10.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
 DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
 EAPI=7
 HOMEPAGE=https://www.citusdata.com/
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12
+IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12
 KEYWORDS=~amd64
 LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/citusdata/citus/archive/v10.2.0.tar.gz -> citus-10.2.0.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=c31462be49577232c82d4f0766921cbe
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=bb3c10d4563059847796409761ef9756
diff --git a/metadata/md5-cache/dev-db/citus-10.2.1 b/metadata/md5-cache/dev-db/citus-10.2.1
new file mode 100644
index 000000000000..c8d7ba96c706
--- /dev/null
+++ b/metadata/md5-cache/dev-db/citus-10.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
+EAPI=7
+HOMEPAGE=https://www.citusdata.com/
+IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL AGPL-3
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/citusdata/citus/archive/v10.2.1.tar.gz -> citus-10.2.1.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=bb3c10d4563059847796409761ef9756
diff --git a/metadata/md5-cache/dev-db/citus-9.5.8 b/metadata/md5-cache/dev-db/citus-9.5.8
index 38f233970c26..3e3571945130 100644
--- a/metadata/md5-cache/dev-db/citus-9.5.8
+++ b/metadata/md5-cache/dev-db/citus-9.5.8
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/citusdata/citus/archive/v9.5.8.tar.gz -> citus-9.5.8.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.10 b/metadata/md5-cache/dev-db/etcd-3.4.10
deleted file mode 100644
index 45415ab357db..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.4.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=server? ( acct-group/etcd acct-user/etcd )
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=7
-HOMEPAGE=https://github.com/etcd-io/etcd
-IUSE=doc +server
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=server? ( acct-group/etcd acct-user/etcd ) !dev-db/etcdctl virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.10.tar.gz -> etcd-3.4.10.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88dd8e5ac92f23b039314bc481ee4d00
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.11 b/metadata/md5-cache/dev-db/etcd-3.4.11
deleted file mode 100644
index 4bd803a50c58..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=server? ( acct-group/etcd acct-user/etcd )
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=7
-HOMEPAGE=https://github.com/etcd-io/etcd
-IUSE=doc +server
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=server? ( acct-group/etcd acct-user/etcd ) !dev-db/etcdctl virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.11.tar.gz -> etcd-3.4.11.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e36cacb75456f4070bb4904b64164932
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.14 b/metadata/md5-cache/dev-db/etcd-3.4.14
index 2b68ef27d378..666124f21ee2 100644
--- a/metadata/md5-cache/dev-db/etcd-3.4.14
+++ b/metadata/md5-cache/dev-db/etcd-3.4.14
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.14.tar.gz -> etcd-3.4.14.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//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/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 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/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 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.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip 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/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/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.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip 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/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/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/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip 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.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 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/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip 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-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 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/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip 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/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 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//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
 _eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e4d5fc22afd1ac6e0b25c8209a1f1da0
+_md5_=e78f607dddf37882c68b3e62a8d9ae8e
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.16 b/metadata/md5-cache/dev-db/etcd-3.4.16
new file mode 100644
index 000000000000..64f3bed5e3e0
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.4.16
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=server? ( acct-group/etcd acct-user/etcd )
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=7
+HOMEPAGE=https://github.com/etcd-io/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=server? ( acct-group/etcd acct-user/etcd ) !dev-db/etcdctl virtual/tmpfiles
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.16.tar.gz -> etcd-3.4.16.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 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/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 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.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip 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/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/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.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip 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/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/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/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 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/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20201021035429-f5854403a974.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/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-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210119212857-b64e53b001e4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.zip 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/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 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/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.zip 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//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip 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/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 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//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4306517555e65f864ceb08e23df28545
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12 b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12
index 97611e8e49db..1e823f2ac763 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12
+++ b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12
@@ -5,10 +5,10 @@ DESCRIPTION=MariaDB Connector/ODBC
 EAPI=7
 HOMEPAGE=https://downloads.mariadb.org/connector-odbc/
 IUSE=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
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND==dev-db/mariadb-connector-c-3.1*[ssl?] dev-db/unixODBC
 SLOT=0/3.1
 SRC_URI=https://downloads.mariadb.org/interstitial/connector-odbc-3.1.12/mariadb-connector-odbc-3.1.12-src.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b0320e3fb50a18b129180095ddb67277
+_md5_=08aba68e274418c53d701e1a6d3c80d3
diff --git a/metadata/md5-cache/dev-db/mycli-1.22.2_p20201026 b/metadata/md5-cache/dev-db/mycli-1.22.2_p20201026
index 02c2ce30411b..82188ea81e06 100644
--- a/metadata/md5-cache/dev-db/mycli-1.22.2_p20201026
+++ b/metadata/md5-cache/dev-db/mycli-1.22.2_p20201026
@@ -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/dbcli/mycli/archive/v1.22.2.tar.gz -> mycli-1.22.2_p20201026.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dfc6106f043690c0ed8230fcef25ad6
diff --git a/metadata/md5-cache/dev-db/mycli-1.24.1 b/metadata/md5-cache/dev-db/mycli-1.24.1
index 10fbbbf9c232..e3fa6c7a8a9f 100644
--- a/metadata/md5-cache/dev-db/mycli-1.24.1
+++ b/metadata/md5-cache/dev-db/mycli-1.24.1
@@ -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/dbcli/mycli/archive/v1.24.1.tar.gz -> mycli-1.24.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7eb5abf78b28c7a4354ac2afacfc62f
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index 27a50e7581c1..857cc58f1b1f 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-python/cli_helpers-2.0.1[python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99151dbdfc2e37d2df821932f20b5a6f
diff --git a/metadata/md5-cache/dev-db/mydumper-0.10.7.2 b/metadata/md5-cache/dev-db/mydumper-0.10.7.2
index 40cf3770eacd..164ae01bc703 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.10.7.2
+++ b/metadata/md5-cache/dev-db/mydumper-0.10.7.2
@@ -5,10 +5,10 @@ DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for M
 EAPI=7
 HOMEPAGE=https://github.com/maxbube/mydumper
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-arch/zstd:= dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.10.7-2.tar.gz -> mydumper-0.10.7-2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bf0dd041476d55673cf785afd36c9e19
+_md5_=231c10920290673f85d11226c41df07b
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
new file mode 100644
index 000000000000..1ba6b716d88e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle 18c Instant Client with SDK
+EAPI=7
+HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
+IUSE=jdbc odbc precomp +sdk +sqlplus tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=OTN
+RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/oracle-instantclient-basic-12 !<dev-db/oracle-instantclient-odbc-12 !<dev-db/oracle-instantclient-jdbc-12 !<dev-db/oracle-instantclient-sqlplus-12 odbc? ( dev-db/unixODBC )
+REQUIRED_USE=precomp? ( sdk )
+RESTRICT=mirror splitdebug test
+SLOT=0/21.1
+SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux-21.3.0.0.0.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux-21.3.0.0.0.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-basic-linux.x64-21.3.0.0.0.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-jdbc-linux.x64-21.3.0.0.0.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-odbc-linux.x64-21.3.0.0.0.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-precomp-linux.x64-21.3.0.0.0.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sdk-linux.x64-21.3.0.0.0.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-sqlplus-linux.x64-21.3.0.0.0.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/213000/instantclient-tools-linux.x64-21.3.0.0.0.zip ) )
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f9163927f5dc09c59190148f5803706a
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
deleted file mode 100644
index f173e6592a1c..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.20/source/tarball/percona-xtrabackup-2.4.20.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=82767cb2f368769028bdd589d19cbab8
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.21 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.21
deleted file mode 100644
index 67f3d7de57cd..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.21
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.21/source/tarball/percona-xtrabackup-2.4.21.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d2a79038c8b9f18b62fccd1055be5f1
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.22 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.22
deleted file mode 100644
index 9264722859b0..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.22
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.22/source/tarball/percona-xtrabackup-2.4.22.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d2a79038c8b9f18b62fccd1055be5f1
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
new file mode 100644
index 000000000000..806e1eb601cd
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:=
+DESCRIPTION=Hot backup utility for MySQL based servers
+EAPI=8
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.24/source/tarball/percona-xtrabackup-2.4.24.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=448378ea49504fde965e050775a7d0ea
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
deleted file mode 100644
index 755bb7190177..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0.13/source/tarball/percona-xtrabackup-8.0.13.tar.gz mirror://sourceforge/boost/boost_1_70_0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d78450df305981b48ec54729193126a
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.22.15 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.22.15
deleted file mode 100644
index a759caecd0b3..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.22.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.22-15/source/tarball/percona-xtrabackup-8.0.22-15.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e65822e0ab5be9e98c4f5b45c7e9f8ab
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.23.16 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.23.16
deleted file mode 100644
index 850dfc25306d..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.23.16
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
-DESCRIPTION=Hot backup utility for MySQL based servers
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
-SLOT=0
-SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.23-16/source/tarball/percona-xtrabackup-8.0.23-16.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8062eb2e7c39061753dcdcfe1d457e7c
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.26.18 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.26.18
new file mode 100644
index 000000000000..9909503b7098
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.26.18
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
+DESCRIPTION=Hot backup utility for MySQL based servers
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.26-18/source/tarball/percona-xtrabackup-8.0.26-18.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b885635d8060d8a90a331fa0cb1d9c3
diff --git a/metadata/md5-cache/dev-db/pgFormatter-5.1 b/metadata/md5-cache/dev-db/pgFormatter-5.1
new file mode 100644
index 000000000000..f9b7dd4e908e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgFormatter-5.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=PostgreSQL SQL syntax beautifier
+EAPI=7
+HOMEPAGE=https://github.com/darold/pgFormatter
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/darold/pgFormatter/archive/v5.1.tar.gz -> pgFormatter-5.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
+_md5_=6346c8cf097217b62bc807ec5ac1c996
diff --git a/metadata/md5-cache/dev-db/pg_activity-2.2.1 b/metadata/md5-cache/dev-db/pg_activity-2.2.1
index b38fe85ae98a..e69912ea9eb7 100644
--- a/metadata/md5-cache/dev-db/pg_activity-2.2.1
+++ b/metadata/md5-cache/dev-db/pg_activity-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dalibo/pg_activity/archive/v2.2.1.tar.gz -> pg_activity-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=191ea9c27f2149f3c07b923b41fdb45f
diff --git a/metadata/md5-cache/dev-db/pgbadger-11.6 b/metadata/md5-cache/dev-db/pgbadger-11.6
new file mode 100644
index 000000000000..abeaebffddf2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgbadger-11.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl
+DESCRIPTION=pgBadger is a PostgreSQL log analyzer.
+EAPI=7
+HOMEPAGE=https://pgbadger.darold.net/
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/darold/pgbadger/archive/v11.6.tar.gz -> pgbadger-11.6.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
+_md5_=38496c5516f8f8ce3b2171f18af42269
diff --git a/metadata/md5-cache/dev-db/pgcli-3.1.0 b/metadata/md5-cache/dev-db/pgcli-3.1.0
index fedf49eabaed..89f4034b2032 100644
--- a/metadata/md5-cache/dev-db/pgcli-3.1.0
+++ b/metadata/md5-cache/dev-db/pgcli-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v3.1.0.tar.gz -> pgcli-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23dca7f47ceb278b3f330221ca40f2c7
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.2 b/metadata/md5-cache/dev-db/pgmodeler-0.9.2
index 3a80f9eb12f8..d36946fbe9dc 100644
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.2
+++ b/metadata/md5-cache/dev-db/pgmodeler-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/pgmodeler/pgmodeler/archive/v0.9.2.tar.gz -> pgmodeler-0.9.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=d096763961d17379262d560c1010c664
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1 b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
index b7458868d4b2..56c407bfae02 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.1.tar.gz -> pgpool-II-4.2.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=82b7e92439d6ca645d50efc88bdc8748
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1 b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
index 7586eaf81792..2a1fc57a7a7b 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.2.tar.gz -> pgpool-II-4.2.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=218906f2e0dba94453c129e5b7fd9127
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index 8bad95e97175..367977ebcea2 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=c7946bdaa214c9080cdbf76fa9c3f2a8
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.1 b/metadata/md5-cache/dev-db/pgrouting-3.1.1
index 9f99631dd5a1..219591cfd5c4 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.1.tar.gz -> pgrouting-3.1.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e6f9060986af5fc4c21c7f8dacfc1f4c
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.2 b/metadata/md5-cache/dev-db/pgrouting-3.1.2
index 472dde765776..eaaa99d45019 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.2
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.2
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.2.tar.gz -> pgrouting-3.1.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a9c48c0908c3d36bb0811c7633729ce4
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.3 b/metadata/md5-cache/dev-db/pgrouting-3.1.3
index b7a96a7c2ddb..7dc2ae7c8442 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.3
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.3
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.3.tar.gz -> pgrouting-3.1.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=203298af9c819b08122974c68a03a459
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.2.1 b/metadata/md5-cache/dev-db/pgrouting-3.2.1
new file mode 100644
index 000000000000..70e94f88fd8d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgrouting-3.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
+EAPI=7
+HOMEPAGE=https://pgrouting.org/
+IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT Boost-1.0
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.2.1.tar.gz -> pgrouting-3.2.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2ba8d90395fd7225614dab8575749daf
diff --git a/metadata/md5-cache/dev-db/pgtap-0.99.0 b/metadata/md5-cache/dev-db/pgtap-0.99.0
index 3bdba267d48e..a7c729c56c3a 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.99.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.99.0
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/0.99.0/pgtap-0.99.0.zip
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=80792af4c3106cb10d4beae0a16c8e1e
diff --git a/metadata/md5-cache/dev-db/pgtap-1.1.0 b/metadata/md5-cache/dev-db/pgtap-1.1.0
index 30d1a685c39c..a33f11693ea3 100644
--- a/metadata/md5-cache/dev-db/pgtap-1.1.0
+++ b/metadata/md5-cache/dev-db/pgtap-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/1.1.0/pgtap-1.1.0.zip
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=4709d1a2b0e0f35737b4794a414c95be
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3-r2 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
index c4726b30715d..b95ac9f9116e 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8138aa73848b51f025bffb88e1ba7c1
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3.1 b/metadata/md5-cache/dev-db/pgxnclient-1.3.1
index d96f7eb6d114..9ef101137284 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3.1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=80c9cf3234501cf9d584b4ae676bc28d
diff --git a/metadata/md5-cache/dev-db/plr-8.3.0.17 b/metadata/md5-cache/dev-db/plr-8.3.0.17
index e23eefe783b3..a6ca34086573 100644
--- a/metadata/md5-cache/dev-db/plr-8.3.0.17
+++ b/metadata/md5-cache/dev-db/plr-8.3.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server]
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_3_0_17.tar.gz -> plr-8.3.0.17.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=f751532e8451660f2c792eaaaa3b522d
diff --git a/metadata/md5-cache/dev-db/plr-8.4.1 b/metadata/md5-cache/dev-db/plr-8.4.1
index 4b96631f5d45..a347fe055670 100644
--- a/metadata/md5-cache/dev-db/plr-8.4.1
+++ b/metadata/md5-cache/dev-db/plr-8.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server]
 REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_4_1.tar.gz -> plr-8.4.1.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=1c520e39b36cb2482655924033bbfdd8
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.3-r2 b/metadata/md5-cache/dev-db/postgis-3.0.3-r2
index 0ceff239bec8..a245ceea14f0 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.3-r2
+++ b/metadata/md5-cache/dev-db/postgis-3.0.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres13 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=8203e2c0786155e8872841c5d9342600
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.4 b/metadata/md5-cache/dev-db/postgis-3.0.4
index 96d7d4188a55..ba957d6c7b01 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.4
+++ b/metadata/md5-cache/dev-db/postgis-3.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres13 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=ae1f5c48ca8013ca15f284f0bff8f286
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.0 b/metadata/md5-cache/dev-db/postgis-3.1.0
index 2d98fe5de31d..6a509ced1560 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.0
+++ b/metadata/md5-cache/dev-db/postgis-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgr
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=cf844613daf020a647d34ec7c8fe7289
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.1 b/metadata/md5-cache/dev-db/postgis-3.1.1
index 43f4885dc499..8b7f22f7dbb7 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.1
+++ b/metadata/md5-cache/dev-db/postgis-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgr
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=0c8bb2ab0c2520220f72551e262c8b97
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.2 b/metadata/md5-cache/dev-db/postgis-3.1.2
index bea5dcf14945..77413936404c 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.2
+++ b/metadata/md5-cache/dev-db/postgis-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgr
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=0c8bb2ab0c2520220f72551e262c8b97
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.3 b/metadata/md5-cache/dev-db/postgis-3.1.3
index 0815e147ec7f..71f8f4d7d458 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.3
+++ b/metadata/md5-cache/dev-db/postgis-3.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgr
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=0c8bb2ab0c2520220f72551e262c8b97
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.4 b/metadata/md5-cache/dev-db/postgis-3.1.4
index 7d13adb38348..a7142845759f 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.4
+++ b/metadata/md5-cache/dev-db/postgis-3.1.4
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] )
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt virtual/imagemagick-tools[png] )
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=7
 HOMEPAGE=https://postgis.net
-IUSE=address-standardizer doc gtk static-libs topology postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
+IUSE=address-standardizer doc gtk static-libs topology postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
-REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/protobuf-c:= >=sci-libs/geos-3.9.0 >=sci-libs/proj-4.9.0:= >=sci-libs/gdal-1.10.0:= address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=|| ( postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=0c8bb2ab0c2520220f72551e262c8b97
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=88a3e4691e1e971755e5fdc0ad8007e5
diff --git a/metadata/md5-cache/dev-db/postgis-9999 b/metadata/md5-cache/dev-db/postgis-9999
index 39a35636ff10..49ff64fe6074 100644
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_
 REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5073cbfcd8e7b733656954b30c02cacb
diff --git a/metadata/md5-cache/dev-db/postgresql-14.0 b/metadata/md5-cache/dev-db/postgresql-14.0
new file mode 100644
index 000000000000..c594ab1e7c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-14.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=14
+SRC_URI=https://ftp.postgresql.org/pub/source/v14.0/postgresql-14.0.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=563ea613611691ec96a5d0fe79988857
diff --git a/metadata/md5-cache/dev-db/postgresql-14_beta3 b/metadata/md5-cache/dev-db/postgresql-14_beta3
deleted file mode 100644
index 2af0303e811d..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-14_beta3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14beta3/postgresql-14beta3.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e8819fa25d7c86a4cdc996146738fe2
diff --git a/metadata/md5-cache/dev-db/postgresql-14_rc1 b/metadata/md5-cache/dev-db/postgresql-14_rc1
deleted file mode 100644
index 725e4ece9d9c..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-14_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14rc1/postgresql-14rc1.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=efe033b419d5ec47d3a8b55b74e73e15
diff --git a/metadata/md5-cache/dev-db/sadisplay-0.4.9 b/metadata/md5-cache/dev-db/sadisplay-0.4.9
index 7bfc620fb3d7..06d19144e847 100644
--- a/metadata/md5-cache/dev-db/sadisplay-0.4.9
+++ b/metadata/md5-cache/dev-db/sadisplay-0.4.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sadisplay/sadisplay-0.4.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24b840b7a62db38021eec53977a1ba5f
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.10 b/metadata/md5-cache/dev-db/slony1-2.2.10
index 0ad394e083ce..b4a0fafe0b7a 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.10
+++ b/metadata/md5-cache/dev-db/slony1-2.2.10
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server,threads] ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://slony.info/downloads/2.2/source/slony1-2.2.10.tar.bz2 doc? ( https://slony.info/downloads/2.2/source/slony1-2.2.10-docs.tar.bz2 )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=48121439eec755a6ab660255c5418de5
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.0.1-r2 b/metadata/md5-cache/dev-db/timescaledb-2.0.1-r2
index 9d9c655eefb0..9f76f6242cd1 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.0.1-r2
+++ b/metadata/md5-cache/dev-db/timescaledb-2.0.1-r2
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.0.1.tar.gz -> timescaledb-2.0.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c2c80c19298d796bd1ec610e1a30a79
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.0.2-r1 b/metadata/md5-cache/dev-db/timescaledb-2.0.2-r1
index 0b7aaf9a9cc9..924e3037bac4 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.0.2-r1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.0.2.tar.gz -> timescaledb-2.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c2c80c19298d796bd1ec610e1a30a79
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.1.0-r1 b/metadata/md5-cache/dev-db/timescaledb-2.1.0-r1
index 8b2bc0cfe1f6..eb8a1644e43d 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.1.0-r1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.1.0.tar.gz -> timescaledb-2.1.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=928507c206e81ced71c7dc0849ddb7c8
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.1.1-r1 b/metadata/md5-cache/dev-db/timescaledb-2.1.1-r1
index 45c89646e5a3..878a679e5b33 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.1.1-r1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.1.1.tar.gz -> timescaledb-2.1.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=928507c206e81ced71c7dc0849ddb7c8
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.2.1-r1 b/metadata/md5-cache/dev-db/timescaledb-2.2.1-r1
index 4fcf9bac2498..3de80935b523 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.2.1-r1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.2.1.tar.gz -> timescaledb-2.2.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c476f05da96c359fbf99c138573da8f8
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.3.1 b/metadata/md5-cache/dev-db/timescaledb-2.3.1
index 16b3a8853369..5e4901e1d2df 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.3.1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.3.1.tar.gz -> timescaledb-2.3.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c476f05da96c359fbf99c138573da8f8
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.4.1 b/metadata/md5-cache/dev-db/timescaledb-2.4.1
index ac79f344cb9a..1d3e092e5a74 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.4.1
+++ b/metadata/md5-cache/dev-db/timescaledb-2.4.1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.4.1.tar.gz -> timescaledb-2.4.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c476f05da96c359fbf99c138573da8f8
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.4.2 b/metadata/md5-cache/dev-db/timescaledb-2.4.2
new file mode 100644
index 000000000000..d1a493c56f56
--- /dev/null
+++ b/metadata/md5-cache/dev-db/timescaledb-2.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) dev-libs/openssl:=
+DESCRIPTION=Open-source time-series SQL database
+EAPI=7
+HOMEPAGE=https://www.timescale.com/
+IUSE=proprietary-extensions postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) dev-libs/openssl:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/timescale/timescaledb/archive/2.4.2.tar.gz -> timescaledb-2.4.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c476f05da96c359fbf99c138573da8f8
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 3d859c7e8964..af21a4758dd7 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.0 b/metadata/md5-cache/dev-embedded/esptool-3.0
index ceb615a1fc71..0766ffdd9f35 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.0
+++ b/metadata/md5-cache/dev-embedded/esptool-3.0
@@ -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/espressif/esptool/archive/v3.0.tar.gz -> esptool-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d6b675d6a4927e10d8697aeacc8f1f1
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.1 b/metadata/md5-cache/dev-embedded/esptool-3.1
index 9f1f46d7c227..b01b7edbd320 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.1
+++ b/metadata/md5-cache/dev-embedded/esptool-3.1
@@ -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/espressif/esptool/archive/v3.1.tar.gz -> esptool-3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34cfd6c30cb946565f06cf99d6f01bdf
diff --git a/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0 b/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
index 00779804dfdc..e707ed825d6c 100644
--- a/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
+++ b/metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kmpm/nodemcu-uploader/archive/v1.0.0.tar.gz -> nodemcu-uploader-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31356f33a9c2a6c13dd3e15af2316c64
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.1.1 b/metadata/md5-cache/dev-embedded/platformio-5.1.1
index e91b2ffc61b0..4c1f42bff62e 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.1.1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( <dev-python/bottle-0.13[python_targets
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/platformio/platformio-5.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d168f1c8ac263ad5f94260fe58435b4
diff --git a/metadata/md5-cache/dev-embedded/stm32flash-0.5 b/metadata/md5-cache/dev-embedded/stm32flash-0.5
deleted file mode 100644
index d6d318e7413a..000000000000
--- a/metadata/md5-cache/dev-embedded/stm32flash-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/stm32flash/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.5.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0962d41d8f5491dca02e485d88c091bf
diff --git a/metadata/md5-cache/dev-embedded/stm32flash-0.6 b/metadata/md5-cache/dev-embedded/stm32flash-0.6
new file mode 100644
index 000000000000..8fa9ad1e983d
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/stm32flash-0.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/stm32flash/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.6.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b14fabcedfaabdfb3ac2d40ac4b75ab
diff --git a/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828 b/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828
deleted file mode 100644
index 896351a7e84b..000000000000
--- a/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 ) sys-libs/ncurses:= sys-libs/readline:= virtual/libusb:1
-DESCRIPTION=flashtool for the multi purpose programming adapter usbprog
-EAPI=7
-HOMEPAGE=http://bwalle.de/website/usbprog.html https://bitbucket.org/bwalle/usbprog-tools/src/master/
-IUSE=qt5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 ) sys-libs/ncurses:= sys-libs/readline:= virtual/libusb:1
-SLOT=0
-SRC_URI=https://bitbucket.org/bwalle/usbprog-tools/get/293d559bac55.tar.bz2 -> usbprog-0.3.0_p20140828.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c987fb9dbf51273ec9bd5e883bb22de6
diff --git a/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1 b/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
new file mode 100644
index 000000000000..c3d07d6feb1e
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=!minimal? ( gui? ( dev-qt/qtwidgets:5 ) dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 sys-libs/ncurses:= sys-libs/readline:= ) virtual/libusb:1
+DESCRIPTION=flashtool for the multi purpose programming adapter usbprog
+EAPI=7
+HOMEPAGE=http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php https://bitbucket.org/bwalle/usbprog-tools/src/master/
+IUSE=+gui minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=!minimal? ( gui? ( dev-qt/qtwidgets:5 ) dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 sys-libs/ncurses:= sys-libs/readline:= ) virtual/libusb:1
+SLOT=0
+SRC_URI=https://bitbucket.org/bwalle/usbprog-tools/get/293d559bac55.tar.bz2 -> usbprog-0.3.0_p20140828.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4741c9d98e5b642116479c5152fdb64f
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index a649306972fe..15e0fc9f5b4a 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/edisoncore-1.3.2.1-r1 b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
index 372efe16cdf6..0c17ad123a39 100644
--- a/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.2.1
-SRC_URI=https://hackage.haskell.org/package/EdisonCore-1.3.2.1/EdisonCore-1.3.2.1.tar.gz https://dev.gentoo.org/~slyfox/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
+SRC_URI=https://hackage.haskell.org/package/EdisonCore-1.3.2.1/EdisonCore-1.3.2.1.tar.gz https://dev.gentoo.org/~sam/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	45a8f7d7c2ff5551cbe5eb57c264861d	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73b5f632c1a1cc6d435d52b203754afa
+_md5_=f458ba24a9da47a7c0472d4781dd09d4
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a0ba28ac4741..e9bcf40a0449 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/java-config-2.3.1 b/metadata/md5-cache/dev-java/java-config-2.3.1
index 5312cd330453..a93d0d3915bf 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0182b4723fd32b111e4b6d2110e2cc39
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 50bbb7cf74fc..0b3709537bb1 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d31fe9fa08713c44daf1ec7f9f06e9ac
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index f94d24422265..d07440013533 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d93ce5ba68a58cb642197df026bb2b8
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 94d4bb5f3d3f..6c0bc2d372f2 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
@@ -4,11 +4,11 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr 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
 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	c7052b276346587968d52ea8eaf5aca1	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	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	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
+_md5_=b901420f5e1c37b31786e5dd717a120c
diff --git a/metadata/md5-cache/dev-java/openjdk-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-8.302_p08
index d7ed64ad0389..a1be240beeb8 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-8.302_p08
@@ -4,11 +4,11 @@ DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
 IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 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	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	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
+_md5_=f5a42beb8c3c0e932e2ddd6a24c42a2a
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.12_p7
index 683ac326a264..29a27f6d23b0 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.12_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.12_p7
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
 EAPI=6
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs splitdebug
 SLOT=11
-SRC_URI=arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz )
+SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.12_7.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12+7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz )
 _eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67da2688e2ffeb11bbb6c0063cf8d214
+_md5_=83406d6810e79245b3c0540b23506d17
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-bin-8.302_p08
index 120158688593..93bee3cb0d0b 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.302_p08
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
 EAPI=6
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs strip
 SLOT=8
-SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz )
+SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u302b08.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz )
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f4e4f703f3e5dcab102fd1df49eab0e3
+_md5_=9061375b4b25c265d6dd2d24ea8a8ea7
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.302_p08
index e8355f06303a..142623df793c 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.302_p08
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
 EAPI=6
 HOMEPAGE=https://adoptium.net
 IUSE=alsa cups headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz )
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=13efc06f7aa1c7beac7f5d7d90ee9c14
+_md5_=86dc0d4c387eecbbdfa037f083f9a5b6
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9af42f2d4be5..f6fb6a4d2f2e 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/hy-0.20.0 b/metadata/md5-cache/dev-lang/hy-0.20.0
index a070a1742050..9a8b6fd5e54d 100644
--- a/metadata/md5-cache/dev-lang/hy-0.20.0
+++ b/metadata/md5-cache/dev-lang/hy-0.20.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/hylang/hy/archive/0.20.0.tar.gz -> hy-0.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8047eddd24d6a5038a4db6edecdd80e
diff --git a/metadata/md5-cache/dev-lang/icon-9.5.20i b/metadata/md5-cache/dev-lang/icon-9.5.20i
index 1f0f0a3d72a9..b774d9eda284 100644
--- a/metadata/md5-cache/dev-lang/icon-9.5.20i
+++ b/metadata/md5-cache/dev-lang/icon-9.5.20i
@@ -4,10 +4,10 @@ DESCRIPTION=Very high level language
 EAPI=7
 HOMEPAGE=http://www.cs.arizona.edu/icon/
 IUSE=X
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain HPND
 RDEPEND=X? ( x11-libs/libX11:= )
 SLOT=0
 SRC_URI=https://github.com/gtownsend/icon/archive/v9.5.20i.tar.gz -> icon-9.5.20i.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67122d3294ca9d427e8a33302a4c6288
+_md5_=48a6ac913a939ffea3c9c312010c9f1a
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.15.0 b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
index 13071aa1f2dd..a2f8e7986df5 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.15.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.15.0.tar.gz -> jsonnet-0.15.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d888209c4ca6c6738024fe3adcf51e2
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0
index 228a611c4831..7ae281166eb6 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f12798410b07f490a229195390583b4a
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
index 77b0b2b7edaa..99714c8093e1 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d10d7c3f5aa6af8ddbdddd23555c4d94
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
index 9da87b5c4aca..419689bf8f0b 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.17.0.tar.gz -> jsonnet-0.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49b4420882f2a56b83b28dd28d92dc95
diff --git a/metadata/md5-cache/dev-lang/php-7.3.31 b/metadata/md5-cache/dev-lang/php-7.3.31
new file mode 100644
index 000000000000..bf2772abe8a8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.31
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode:0= ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode:0= ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) oci8-instant-client? ( !ldap ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+RESTRICT=!test? ( test )
+SLOT=7.3
+SRC_URI=https://www.php.net/distributions/php-7.3.31.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c8bff88106510772a335c643612f125
diff --git a/metadata/md5-cache/dev-lang/php-7.4.24 b/metadata/md5-cache/dev-lang/php-7.4.24
new file mode 100644
index 000000000000..9fa1df799676
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.24
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=7.4
+SRC_URI=https://www.php.net/distributions/php-7.4.24.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f30ba42f59d9436ca0553ae9dfe0f83a
diff --git a/metadata/md5-cache/dev-lang/php-8.0.11 b/metadata/md5-cache/dev-lang/php-8.0.11
new file mode 100644
index 000000000000..5cb9b1ee265f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.11
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.11.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=01cf1cc241d1ed7ce5127d16b563bb32
diff --git a/metadata/md5-cache/dev-lang/php-8.1.0_rc2 b/metadata/md5-cache/dev-lang/php-8.1.0_rc2
new file mode 100644
index 000000000000..a6ccc185bf2f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://downloads.php.net/~patrickallaert/php-8.1.0RC2.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2d746df984ba17e19d4b9794cbc5dd84
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.14.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.14.0
index d190f9a7212c..2d8da78fae3a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.14.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.14.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.14.0esr/source/firefox-78.14.0esr.source.tar.xz -> firefox-78.14.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-17.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-17.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-17.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	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f4567f53ae2854d092f5343036be7df8
+_md5_=b0bff9919213cc90132627d216ee54cc
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2
deleted file mode 100644
index 16d023449a02..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.25-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.25.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e849473245a76c4df864634c6e1a3d31
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1
deleted file mode 100644
index bfce6495366a..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
-DESCRIPTION=Versatile implementation of the Prolog programming language
-EAPI=7
-HOMEPAGE=https://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.26.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e849473245a76c4df864634c6e1a3d31
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.29 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.29
new file mode 100644
index 000000000000..480b198a3739
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.29
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.29.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.3.29-gentoo-patchset-0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=adb581845534c0c2e71d733053ba4efe
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a5c03ae4c76e..e8e38dbe9cd7 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/apr-1.6.3-r5 b/metadata/md5-cache/dev-libs/apr-1.6.3-r5
deleted file mode 100644
index 38f3ee0bef3f..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.6.3-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 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=Apache Portable Runtime Library
-EAPI=6
-HOMEPAGE=https://apr.apache.org/
-IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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=Apache-2.0
-RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.6
-SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f44ba2e6f551ead5143de2ea414f9cb5
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3-r6 b/metadata/md5-cache/dev-libs/apr-1.6.3-r6
new file mode 100644
index 000000000000..aa39f31d48a9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.6.3-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 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=Apache Portable Runtime Library
+EAPI=6
+HOMEPAGE=https://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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=Apache-2.0
+RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
+SLOT=1/1.6
+SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ecd16b8c717ceed549f68d80b12eebd7
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.5-r2 b/metadata/md5-cache/dev-libs/apr-1.6.5-r2
deleted file mode 100644
index e18e85544863..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.6.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 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=Apache Portable Runtime Library
-EAPI=6
-HOMEPAGE=https://apr.apache.org/
-IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
-RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.6
-SRC_URI=mirror://apache/apr/apr-1.6.5.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3976848b12b39383cb59a33a1005c822
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.5-r3 b/metadata/md5-cache/dev-libs/apr-1.6.5-r3
new file mode 100644
index 000000000000..22f27e1df242
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.6.5-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 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=Apache Portable Runtime Library
+EAPI=6
+HOMEPAGE=https://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
+RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
+SLOT=1/1.6
+SRC_URI=mirror://apache/apr/apr-1.6.5.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b6d3b4229a93402b0586b508a5d87148
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r2 b/metadata/md5-cache/dev-libs/apr-1.7.0-r2
deleted file mode 100644
index 2a5b146bd057..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.7.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
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Apache Portable Runtime Library
-EAPI=7
-HOMEPAGE=https://apr.apache.org/
-IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-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=Apache-2.0
-RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.7
-SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=afde4a43daca4f6c73b6626e85e20233
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r3 b/metadata/md5-cache/dev-libs/apr-1.7.0-r3
new file mode 100644
index 000000000000..3bfa5d099718
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=7
+HOMEPAGE=https://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
+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=Apache-2.0
+RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
+SLOT=1/1.7
+SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9cf09cf987c081ac17dfbb35fb494aac
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1 b/metadata/md5-cache/dev-libs/avro-c-1.9.1
deleted file mode 100644
index 5c514e805589..000000000000
--- a/metadata/md5-cache/dev-libs/avro-c-1.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/snappy >=dev-libs/jansson-2.3 sys-libs/zlib
-DESCRIPTION=c library for the apache avro data serialization system
-EAPI=7
-HOMEPAGE=https://avro.apache.org/
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/snappy >=dev-libs/jansson-2.3 sys-libs/zlib
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0beaed2f43cfea7c54b23263ad075ecd
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1 b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
new file mode 100644
index 000000000000..bacd4807475f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/snappy >=dev-libs/jansson-2.3:= sys-libs/zlib
+DESCRIPTION=c library for the apache avro data serialization system
+EAPI=7
+HOMEPAGE=https://avro.apache.org/
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=app-arch/snappy >=dev-libs/jansson-2.3:= sys-libs/zlib
+SLOT=0
+SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=72718e54a1c1acb6cb9ce9d50884e4d2
diff --git a/metadata/md5-cache/dev-libs/bitset-2.8.4-r1 b/metadata/md5-cache/dev-libs/bitset-2.8.4-r1
deleted file mode 100644
index a9b70d506a14..000000000000
--- a/metadata/md5-cache/dev-libs/bitset-2.8.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
-DESCRIPTION=A compressed bitset with supporting data structures and algorithms
-EAPI=7
-HOMEPAGE=https://github.com/chriso/bitset
-IUSE=jemalloc static-libs tcmalloc
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
-REQUIRED_USE=?? ( jemalloc tcmalloc )
-SLOT=0
-SRC_URI=https://github.com/chriso/bitset/archive/2.8.4.tar.gz -> bitset-2.8.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=915ed145381e9323aa473c03d4dd62f3
diff --git a/metadata/md5-cache/dev-libs/bitset-2.8.4-r2 b/metadata/md5-cache/dev-libs/bitset-2.8.4-r2
new file mode 100644
index 000000000000..506e4cc4797d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/bitset-2.8.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
+DESCRIPTION=A compressed bitset with supporting data structures and algorithms
+EAPI=7
+HOMEPAGE=https://github.com/chriso/bitset
+IUSE=jemalloc static-libs tcmalloc
+KEYWORDS=amd64 ~arm x86
+LICENSE=LGPL-2.1
+RDEPEND=tcmalloc? ( dev-util/google-perftools:= ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
+REQUIRED_USE=?? ( jemalloc tcmalloc )
+SLOT=0
+SRC_URI=https://github.com/chriso/bitset/archive/2.8.4.tar.gz -> bitset-2.8.4.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37274893639d7d798d38960fb6e6288e
diff --git a/metadata/md5-cache/dev-libs/boost-1.77.0-r2 b/metadata/md5-cache/dev-libs/boost-1.77.0-r2
index e13d6ac9d2a4..c995fff7e77f 100644
--- a/metadata/md5-cache/dev-libs/boost-1.77.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.77.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=8
 HOMEPAGE=https://www.boost.org/
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.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(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) 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(-)?] numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.77.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/boost/boost-1.77.0-patches-1.tar.xz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c6c44080cb5c0170c57530245d77140
+_md5_=a2b36f520ceb3bcbd88b8c6094a92110
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index d5d256f5c2d9..f0d7b0369c01 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=068c0da4a90fd0f95275dce48b9b41ff
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.15 b/metadata/md5-cache/dev-libs/clhpp-2.0.15
index 685908d4561e..d69a6da6a4b8 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.15
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.15
@@ -4,10 +4,10 @@ DEPEND=virtual/opencl
 DESCRIPTION=Khronos OpenCL C++ bindings
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-CLHPP/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Khronos-CLHPP
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.15.tar.gz -> clhpp-2.0.15.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7ce6cf529f69c2890a0ed0b43775e30
+_md5_=f291edcff7dc0034c3b8e07aa8e9e299
diff --git a/metadata/md5-cache/dev-libs/distorm3-3.5.2 b/metadata/md5-cache/dev-libs/distorm3-3.5.2
index 5e109a28959e..8208dbcaad36 100644
--- a/metadata/md5-cache/dev-libs/distorm3-3.5.2
+++ b/metadata/md5-cache/dev-libs/distorm3-3.5.2
@@ -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=mirror://pypi/d/distorm3/distorm3-3.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72b3478c3d684e1dde2c3f36fd8cbd9c
diff --git a/metadata/md5-cache/dev-libs/eb-4.4.1-r1 b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
index e9e505711531..d8451ee8ce02 100644
--- a/metadata/md5-cache/dev-libs/eb-4.4.1-r1
+++ b/metadata/md5-cache/dev-libs/eb-4.4.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=EB is a C library and utilities for accessing CD-ROM books
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20120330123930/http://www.sra.co.jp/people/m-kasahr/eb/
 IUSE=ipv6 nls threads
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=715081613a1b4697c2546049b5c8d4de
+_md5_=412befa5d45048e0f2625fbdb6915a3b
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index 5b60fdff8589..211075896514 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -4,9 +4,9 @@ DESCRIPTION=FastCGI Developer's Kit
 EAPI=7
 HOMEPAGE=http://www.fastcgi.com/
 IUSE=html
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad5058eef214de0bf6e66caf6bb47872
+_md5_=ac5bf4e646107922f5180b29e92f54c4
diff --git a/metadata/md5-cache/dev-libs/gjs-1.68.4 b/metadata/md5-cache/dev-libs/gjs-1.68.4
index 252194434959..f8591a180d31 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.68.4
+++ b/metadata/md5-cache/dev-libs/gjs-1.68.4
@@ -5,11 +5,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline sysprof test test
-KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm ~arm64 ppc64 ~riscv ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= dev-lang/spidermonkey:78 cairo? ( x11-libs/cairo[X,svg] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.68/gjs-1.68.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=cc7c578492dabaf54d439f0afb1c5445
+_md5_=c5cafb72084631d1750f79985b3e333d
diff --git a/metadata/md5-cache/dev-libs/intel-neo-21.38.21026 b/metadata/md5-cache/dev-libs/intel-neo-21.38.21026
new file mode 100644
index 000000000000..f799ded0895a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-neo-21.38.21026
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8708 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8708 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.38.21026.tar.gz -> intel-neo-21.38.21026.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=31b5526b0b7069c96c94bfeef8448db8
diff --git a/metadata/md5-cache/dev-libs/jansson-2.14 b/metadata/md5-cache/dev-libs/jansson-2.14
new file mode 100644
index 000000000000..d3903c1e53f3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jansson-2.14
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( dev-python/sphinx )
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=C library for encoding, decoding and manipulating JSON data
+EAPI=8
+HOMEPAGE=https://www.digip.org/jansson/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+SLOT=0/4
+SRC_URI=https://github.com/akheron/jansson/releases/download/v2.14/jansson-2.14.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2dbd0a9c03cfc5ca728cb88df5ff0f04
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index 7ddafc371825..2f3db0f4f643 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=758eeabfb1175bb0886296cfd9f670b0
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2 b/metadata/md5-cache/dev-libs/keystone-0.9.2
index 791b928fd2c9..c5bd55491e19 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-13:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_target
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=216a7566e166b28c292c27c7b04817f6
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index cfe5ac6b4ee9..c8ec4b88eb31 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=<sys-devel/llvm-13:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] 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=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=216a7566e166b28c292c27c7b04817f6
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.40.0 b/metadata/md5-cache/dev-libs/libdazzle-3.40.0
index 80164ad70802..9b35b1ae5e61 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.40.0
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.40.0
@@ -5,7 +5,7 @@ DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
 IUSE=gtk-doc +introspection test +vala test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.40/libdazzle-3.40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fcb6176fd271cd8999b655aa11549561
+_md5_=69e8fc5f91b0c4d1bdff1e5b4cd62d28
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r2 b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
index 70ba65abc4ca..7f78c1f1a7ff 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r2
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r2
@@ -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/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0570d2c72a41982ae0fd3c737279ee8
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.3.0 b/metadata/md5-cache/dev-libs/libgit2-1.3.0
new file mode 100644
index 000000000000..3b37fa584123
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.3
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.3.0.tar.gz -> libgit2-1.3.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=605104d09a06b3373b7408005eec61b0
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
index 1c7b8a91e4db..af6f0b6b115b 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Library to raise flags on DBus for other components of the desktop
 EAPI=6
 HOMEPAGE=https://launchpad.net/libindicate
 IUSE=gtk +introspection
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libdbusmenu[introspection?] dev-libs/libxml2 gtk? ( dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3 ) introspection? ( >=dev-libs/gobject-introspection-1 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99976421f98ed18fd781d084b648f0b1
+_md5_=e14799d039c13c396bbd1d8266ca5ca7
diff --git a/metadata/md5-cache/dev-libs/libinput-1.19.1 b/metadata/md5-cache/dev-libs/libinput-1.19.1
new file mode 100644
index 000000000000..878d9f858314
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.19.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.58.2-r1 >=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.19.1.tar.xz
+_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=08418e000c7abb246a01cdbfefd3413e
diff --git a/metadata/md5-cache/dev-libs/liblinear-243 b/metadata/md5-cache/dev-libs/liblinear-243
index 6f91f0e7c966..101fdda17396 100644
--- a/metadata/md5-cache/dev-libs/liblinear-243
+++ b/metadata/md5-cache/dev-libs/liblinear-243
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Library for Large Linear Classification
 EAPI=7
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 SLOT=0/4
 SRC_URI=https://github.com/cjlin1/liblinear/archive/v243.tar.gz -> liblinear-243.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f237703fb74cceec1f4aed46a43db44
+_md5_=44e7804cdb74dc1535094208b2633e3b
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 07a6f297fdf1..34724ced887a 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12e0060b2008125d9adb2a7553f5b243
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.17.0 b/metadata/md5-cache/dev-libs/liblouis-3.17.0
index ba662d3517c7..ae613bf30f35 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.17.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.17.0/liblouis-3.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e1a91473229ce995bfa85f3b2cd3b96
diff --git a/metadata/md5-cache/dev-libs/libmaa-1.3.2 b/metadata/md5-cache/dev-libs/libmaa-1.3.2
index ed52006d8b54..31cbe5fe007d 100644
--- a/metadata/md5-cache/dev-libs/libmaa-1.3.2
+++ b/metadata/md5-cache/dev-libs/libmaa-1.3.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Library with low-level data structures which are helpful for writing compilers
 EAPI=7
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/libmaa-1.3.2.tar.gz
-_md5_=af351b9f02458d1dd6873d410f012d39
+_md5_=cc7b531c938564c4dff88da3d06c3c51
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index 60982095784d..325cf4232d4c 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ac2a7049de8a5af9a13c6604970b801
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index bd7dbd1d6684..f0d753f60c56 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=3
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=688907076cc3f52696028a143e29da67
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.3 b/metadata/md5-cache/dev-libs/libofx-0.10.3
new file mode 100644
index 000000000000..c23e89b2032e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg ) sys-devel/gnuconfig >=app-portage/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=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+DESCRIPTION=Library to support the Open Financial eXchange XML format
+EAPI=7
+HOMEPAGE=https://github.com/libofx/libofx
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://github.com/libofx/libofx/archive/0.10.3.tar.gz -> libofx-0.10.3.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0afe041a3c5b8d9993fb5b2a9e4741c1
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
index 36f015300a52..0e2ff11ead46 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) 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
+BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) 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(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) 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=compile configure install prepare setup
-DEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
+DEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) 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(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
 DESCRIPTION=Prelude-SIEM Framework Library
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
-IUSE=lua perl python ruby python_targets_python3_8 lua_single_target_lua5-1 lua_single_target_lua5-3
+IUSE=lua perl python ruby python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 lua_single_target_lua5-1 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_8 ) )
+RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) 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(-)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45aca8915c200145c863bf5e7b4a173b
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=19bef3f89c5255e2e1e5d83f3d2dc2d1
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
index b0d06a270537..5daa6217f59d 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_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
+BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc 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(-)?] ) sys-devel/gnuconfig >=app-portage/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/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) 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(-)?] ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Framework to easy access to the Prelude database
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
-IUSE=mysql postgres python sqlite python_targets_python3_8
+IUSE=mysql postgres python sqlite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
+RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) 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(-)?] ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63246f81a55bd2c2aed84c63f80f29fd
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b03e91216a0f53136c7b12565569224f
diff --git a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1 b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
index 08896932fa4e..a6f2f87de0d8 100644
--- a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sparsehash ) || ( python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quantopian/libpy/archive/0.2.5.tar.gz -> libpy-0.2.5.tar.gz test? ( https://github.com/google/googletest/archive/23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz -> gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4085a82745c364031c4e955841d6d88
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.6.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.6.0
deleted file mode 100644
index dc8bb37dbc82..000000000000
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils test? ( dev-qt/qttest:5 )
-DESCRIPTION=Qt Implementation of XDG Standards
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-IUSE=test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.6.0/libqtxdg-3.6.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28a9d4861f307ae5c5e5c7f99cde6d6d
diff --git a/metadata/md5-cache/dev-libs/libreport-2.15.1 b/metadata/md5-cache/dev-libs/libreport-2.15.1
deleted file mode 100644
index 8a4c09faf63b..000000000000
--- a/metadata/md5-cache/dev-libs/libreport-2.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-admin/augeas app-arch/libarchive:0= >=dev-libs/glib-2.43.4:2 dev-libs/satyr:0= dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/nettle:= dev-libs/newt:= dev-libs/xmlrpc-c:= net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus sys-apps/systemd gtk? ( >=x11-libs/gtk+-3.3.12:3 ) 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(-)?] ) x11-misc/xdg-utils
-DESCRIPTION=Generic library for reporting software bugs
-EAPI=7
-HOMEPAGE=https://github.com/abrt/libreport
-IUSE=gtk +python python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~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(-)?] app-admin/augeas app-arch/libarchive:0= >=dev-libs/glib-2.43.4:2 dev-libs/satyr:0= dev-libs/json-c:= dev-libs/libxml2:2 dev-libs/nettle:= dev-libs/newt:= dev-libs/xmlrpc-c:= net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus sys-apps/systemd gtk? ( >=x11-libs/gtk+-3.3.12:3 ) 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(-)?] ) x11-misc/xdg-utils acct-user/abrt acct-group/abrt
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0/1
-SRC_URI=https://github.com/abrt/libreport/archive/2.15.1.tar.gz -> libreport-2.15.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=13e98c7fdf1611e31f92f89103865e0f
diff --git a/metadata/md5-cache/dev-libs/libserdes-5.4.0 b/metadata/md5-cache/dev-libs/libserdes-5.4.0
deleted file mode 100644
index bf9cdd517636..000000000000
--- a/metadata/md5-cache/dev-libs/libserdes-5.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/jansson net-misc/curl dev-libs/avro-c
-DESCRIPTION=Avro SerializationDeserialization w/ Confluent schema-registry support
-EAPI=7
-HOMEPAGE=https://github.com/confluentinc/libserdes
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/jansson net-misc/curl dev-libs/avro-c
-SLOT=0
-SRC_URI=https://github.com/confluentinc/libserdes/archive/v5.4.0.tar.gz -> libserdes-5.4.0.tar.gz
-_md5_=bc69aea6322d9be8896fbe6e9898cf5c
diff --git a/metadata/md5-cache/dev-libs/libserdes-5.4.0-r1 b/metadata/md5-cache/dev-libs/libserdes-5.4.0-r1
new file mode 100644
index 000000000000..eed241cb1ea6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libserdes-5.4.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/jansson:= net-misc/curl dev-libs/avro-c
+DESCRIPTION=Avro SerializationDeserialization w/ Confluent schema-registry support
+EAPI=7
+HOMEPAGE=https://github.com/confluentinc/libserdes
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/jansson:= net-misc/curl dev-libs/avro-c
+SLOT=0
+SRC_URI=https://github.com/confluentinc/libserdes/archive/v5.4.0.tar.gz -> libserdes-5.4.0.tar.gz
+_md5_=336e7cd712ad3c6691573269ff784bce
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
index e1617ced2ed0..bb564799ee8b 100644
--- a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=LibTomCrypt is a comprehensive, modular and portable cryptographic t
 EAPI=7
 HOMEPAGE=https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt
 IUSE=+gmp +libtommath tomsfastmath
-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 ~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=|| ( WTFPL-2 public-domain )
 RDEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
 REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
 SLOT=0/1
 SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c4d53cb3401449b28acc7444cce3003
+_md5_=51c0b1cd099eca401baf7c8e15146747
diff --git a/metadata/md5-cache/dev-libs/libzia-4.28 b/metadata/md5-cache/dev-libs/libzia-4.28
deleted file mode 100644
index 818bc5765a96..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.28
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-DESCRIPTION=Platform abstraction code for tucnak package
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.28.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5327aeab6d6afc7e7a0159c7d673e2f9
diff --git a/metadata/md5-cache/dev-libs/libzia-4.29 b/metadata/md5-cache/dev-libs/libzia-4.29
deleted file mode 100644
index f1f5877c0b42..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.29
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-DESCRIPTION=Platform abstraction code for tucnak package
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.29.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2da53c9a22042bae2f3ad696676d643e
diff --git a/metadata/md5-cache/dev-libs/libzia-4.30 b/metadata/md5-cache/dev-libs/libzia-4.30
index 3835d89f7ad5..ffdcf11470cf 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.30
+++ b/metadata/md5-cache/dev-libs/libzia-4.30
@@ -5,10 +5,10 @@ DESCRIPTION=Platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 IUSE=ftdi
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.30.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=abfed23f9108677a99c515abd1f7cc14
+_md5_=5327aeab6d6afc7e7a0159c7d673e2f9
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
index cec221a03528..e4101e6f314d 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.5
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c35b890a583ed7b127a18e669957d827
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.6 b/metadata/md5-cache/dev-libs/marisa-0.2.6
index dc57cbdb5694..f15f48ee4a86 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.6
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.6
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz -> marisa-0.2.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88f694c1fd0a5631f4262e40d5f3d920
diff --git a/metadata/md5-cache/dev-libs/marisa-9999 b/metadata/md5-cache/dev-libs/marisa-9999
index 6b970260e67e..09f444fcf2c0 100644
--- a/metadata/md5-cache/dev-libs/marisa-9999
+++ b/metadata/md5-cache/dev-libs/marisa-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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 ) )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77b6ae521e5134a8420679ec199fb8b7
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.8 b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
index ac0dbf4fc801..10fcb8c8cbd2 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.8
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=PEM file reader for Network Security Services (NSS)
 EAPI=7
 HOMEPAGE=https://github.com/kdudka/nss-pem
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.8/nss-pem-1.0.8.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=886101a80f4ea1c4e9fda60980b86d79
+_md5_=6691bb14e6c1a4ac1f14f617fb91e82b
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
index b92b18c28a97..e0780a493147 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2021.06.30
@@ -5,11 +5,11 @@ DESCRIPTION=Official Khronos OpenCL ICD Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
 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 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-util/opencl-headers-2021.06.30 !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2021.06.30.tar.gz -> opencl-icd-loader-2021.06.30.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=754cb6529466564133d5684ae58378d4
+_md5_=8b12faaf037c6a3487b195a073dfa784
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.0 b/metadata/md5-cache/dev-libs/pegtl-3.2.0
deleted file mode 100644
index a0f5470cab38..000000000000
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
-EAPI=7
-HOMEPAGE=https://github.com/taocpp/PEGTL
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.0.tar.gz -> pegtl-3.2.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08c9487f167a7c70647706f8385dff5f
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.1 b/metadata/md5-cache/dev-libs/pegtl-3.2.1
new file mode 100644
index 000000000000..47a6329acd65
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.1
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
+EAPI=8
+HOMEPAGE=https://github.com/taocpp/PEGTL
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.1.tar.gz -> pegtl-3.2.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ec13f6e7ea956c89f49396ca9e82af4f
diff --git a/metadata/md5-cache/dev-libs/pigpio-79 b/metadata/md5-cache/dev-libs/pigpio-79
index 23af001c7dee..91b8ef6ae42a 100644
--- a/metadata/md5-cache/dev-libs/pigpio-79
+++ b/metadata/md5-cache/dev-libs/pigpio-79
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v79.tar.gz -> pigpio-79.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5b5ef7879679890bfcdbc7e08f5fac1
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
index 86449cdf47df..74c31273ca04 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
@@ -4,9 +4,9 @@ DESCRIPTION=Simple and small C++ XML parser
 EAPI=7
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
 IUSE=debug doc static-libs +stl
-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=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3305578b2480be15edb7b948795a8cea
+_md5_=73e3408263cff26c7dd47be729eff73d
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
index d205e1e273ee..e2f45f6b84a1 100644
--- a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Fast public domain large integer arithmetic library
 EAPI=7
 HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=Unlicense
 SLOT=0/1
 SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=39ffe327a2ca075f5ae816f4cf2aa638
+_md5_=6d76a010d9bd0645328cd5285c5359a3
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.4 b/metadata/md5-cache/dev-libs/voikko-fi-2.4
index 4e2d272b9905..7edcb5f83749 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.4
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-libs/libvoikko verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) dev-libs/libvoikko verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile install setup unpack
 DEPEND=dev-libs/foma dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=b3edca38932a240bfb8db2988069d267
+_md5_=1cf2377ef073cb742b83a3e0bd8e94d0
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
index c83a5e11c6a1..e798251e89fa 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
@@ -5,11 +5,11 @@ DESCRIPTION=Bit Operations Library for the Lua Programming Language
 EAPI=7
 HOMEPAGE=http://bitop.luajit.org
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbf09cbef7d090031869bc41704a2099
+_md5_=60a09cd6567c3bb2dcf675de52043eb1
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index d1e79c8fdd51..d7ca1d6fc2d4 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.1 b/metadata/md5-cache/dev-lua/luaposix-35.1
new file mode 100644
index 000000000000..ce64a89e6f39
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaposix-35.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) virtual/libcrypt:=
+DESCRIPTION=Bindings for POSIX APIs
+EAPI=7
+HOMEPAGE=https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix
+IUSE=doc lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) virtual/libcrypt:= lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/luaposix/luaposix/archive/v35.1.tar.gz -> luaposix-35.1.tar.gz
+_eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3d638075b24aba9fd90baab66de3aa5
diff --git a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100 b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
index 2f5158cd7aa5..73210fb61ada 100644
--- a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
+++ b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/LuaDist/toluapp/archive/b34075b76835b778bb6b2ce0aa224afd9d182887.tar.gz -> toluapp-1.0.93_p20190513.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=090a112957ced11f9d0aaa56164595bc
+_md5_=06461c2f73cb27ba79288b2cd9742da3
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 4012e64c7331..0979c2156c0a 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/async_kernel-0.14.0 b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
index e5691e5ba148..73ec4f290545 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] d
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.14.0.tar.gz -> async_kernel-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=65b38a4798f76dcd42a2ff97c6586035
+_md5_=c08a6f66c1cb34af1e4b366143359962
diff --git a/metadata/md5-cache/dev-ml/async_unix-0.14.0 b/metadata/md5-cache/dev-ml/async_unix-0.14.0
index 8aa5eb27ec58..3d7183e8ba4c 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/async_kernel:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_unix/archive/v0.14.0.tar.gz -> async_unix-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=a78f977b7dfcd26f442878a6291e9a6b
+_md5_=95df6408b5466cadc51f4e19df6d44fa
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
index 0bda6999dfa5..ae9ecc2519a4 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.0
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 >=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Standard library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 >=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.0.tar.gz -> base-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=6128f07880b62ac1e51d68afcb723ca8
+_md5_=dc5c1395c4367c14c64b09bf385617da
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r3 b/metadata/md5-cache/dev-ml/core-0.14.0-r3
index f54b2cb7f2d5..ecd010e61d18 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=2e0ab8acde9a464b624508e79902d39a
+_md5_=3d54637cd0895fea6c71f8af200dce93
diff --git a/metadata/md5-cache/dev-ml/core-0.14.1 b/metadata/md5-cache/dev-ml/core-0.14.1
new file mode 100644
index 000000000000..1c7c61145e51
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Jane Street's alternative to the standard library
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/core
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/core/archive/v0.14.1.tar.gz -> core-0.14.1.tar.gz
+_eclasses_=dune	eefe841059d4f6d649fc9a121683e311
+_md5_=c2d04fb645fb2a67802ef4f47ce6ba55
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.14.0 b/metadata/md5-cache/dev-ml/core_bench-0.14.0
index cebf14e12e18..152dc1c1648b 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-ml/core-0.14.0:= >=dev-ml/core_kernel-0.14.0:= >=dev-ml/ppx_jane-0
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.14.0.tar.gz -> core_bench-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=9b6a44dc871f8a8690a1709df31b4bc0
+_md5_=b43302ab3a79c5eb501fda923edbfc10
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index fc0425929d7e..acb09e293f33 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=bd18ffcba3e130203c43457c322db736
+_md5_=8b8dd673ab86d68019d02cfd5f978cb7
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0
new file mode 100644
index 000000000000..89944e8493a3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0
@@ -0,0 +1,16 @@
+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-3.20.5
+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:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[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
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[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
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=99d7824b767bb182e30becd6720c7749
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2
deleted file mode 100644
index 106157cc74cb..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[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_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[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_rc2
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3
deleted file mode 100644
index 16e240259d9f..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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_rc3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[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_rc3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[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_rc3
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4
deleted file mode 100644
index 8b3738721fad..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[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_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[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_rc4
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
diff --git a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1 b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
index 525d73a11a64..38bd7a3e50b4 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-
 SLOT=0/5.3.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.3.0.tar.gz -> lwt-5.3.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ffd2eb61f120553d5b477a671eca0f5d
+_md5_=34b6c89dc9788dfd601a3cf14ab2e311
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r2 b/metadata/md5-cache/dev-ml/merlin-4.1-r2
index 2168b9310046..523e85b80eda 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.1-r2
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r2
@@ -1,14 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
-IUSE=emacs +ocamlopt
+IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
 SLOT=0/4.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=42650b7fa356be02227e94302017646e
+_md5_=bfa96ef2a29c4ff4e8ce6325f58e3699
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
index bb019ab94cb8..7fd32ccf2603 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=e5014d9e9429ede0929734664e1addea
+_md5_=cec5825c634b44d4cf837278cba43823
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
index ae9bf6d27a8d..b632df2235c7 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
@@ -11,4 +11,4 @@ RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ee08593fce3c6ed9455f9ad6b6727f58
+_md5_=93176cbb44dd7e787659288919518340
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.9 b/metadata/md5-cache/dev-ml/opam-format-2.0.9
index 5fa45dde59d1..19964123be51 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.9
@@ -11,4 +11,4 @@ RDEPEND=~dev-ml/opam-core-2.0.9:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ee08593fce3c6ed9455f9ad6b6727f58
+_md5_=93176cbb44dd7e787659288919518340
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
index c4cd12a05dd8..26396f59302e 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=b88efcf4100ed5d8d94152d1b13b87b5
+_md5_=301d3671640350b85f9b8bb0c2a475fa
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
index 6021fd9f4156..f4b765089a71 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=76585f94f8da84e5871145c067c6e4cd
+_md5_=c924724823e0770d06c104da6176e10a
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.9 b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
index 8c524e72b4d6..246affd16d02 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=76585f94f8da84e5871145c067c6e4cd
+_md5_=c924724823e0770d06c104da6176e10a
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
index 03580651acdb..ae491e7f1d8b 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=081a9f2af39a1b60e3fb03eb6cbb370e
+_md5_=7fef03536387efc3c158722f7a354eb8
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.9 b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
index 1b2301ce288c..9b88c71f966e 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=081a9f2af39a1b60e3fb03eb6cbb370e
+_md5_=7fef03536387efc3c158722f7a354eb8
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8 b/metadata/md5-cache/dev-ml/opam-state-2.0.8
index 78556de165b7..cf0f6ecaa315 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=6d360d2c249e0367bca6f14d4ebebee7
+_md5_=7499169612c073ee21e16029df4c3a2b
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
index 1b1618fdb298..950b0051d3f7 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=2a491625c05b35c106fda78889172612
+_md5_=cc1638f368982f85d7769fec9e549f23
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.9 b/metadata/md5-cache/dev-ml/opam-state-2.0.9
index 514f2c7cbce5..79cc5ca3ac5a 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=2a491625c05b35c106fda78889172612
+_md5_=cc1638f368982f85d7769fec9e549f23
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.1 b/metadata/md5-cache/dev-ml/parmap-1.2.1
index c4bcf29f7703..c20c88e6237c 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.1
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-m
 SLOT=0/1.2.1
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.1.tar.gz -> parmap-1.2.1.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=7a4a9adfd367aee2ff7fd50edd87b7ab
+_md5_=9ec91fa22a232f000f27ec433dc9f765
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.3 b/metadata/md5-cache/dev-ml/parmap-1.2.3
index 3015bef2bf3d..49748999edae 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.3
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-m
 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_=84ed9018d91e515c4a0f1b624d330e0a
+_md5_=6bd8bc896e937529c79b87dcb6baadc2
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.14.0 b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
index b5d7b7933248..e6facd42ed6a 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.14.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:
 SLOT=0/0.14
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.14.0.tar.gz -> patience_diff-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=f1f5c00286b366bd86a6b4ef500a1362
+_md5_=037defe92e24269b09c45b92f24b5601
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
index 1eb3070454e0..9aaaba89c361 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=65accfdb7b16140f146ebe74444f0986
+_md5_=591a2d86252872948d9eeca4182d4b00
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
index b0b08d963d88..3f38ec55f632 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.660.0
@@ -5,11 +5,11 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-SQLite
 IUSE=test system-sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.32.3[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=dbbfacc707de362f25b02b25364224a1
+_md5_=77040c0723459e56f521dbeeecd7bf20
diff --git a/metadata/md5-cache/dev-perl/EV-4.330.0 b/metadata/md5-cache/dev-perl/EV-4.330.0
index 0632a30f4f5f..cb0b127983bb 100644
--- a/metadata/md5-cache/dev-perl/EV-4.330.0
+++ b/metadata/md5-cache/dev-perl/EV-4.330.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl interface to libev, a high performance full-featured event loop
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/EV
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ ) || ( BSD-2 GPL-2+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=9830ca4a422a93902df4f24aad20e0bc
+_md5_=ecfc2337af9f7997067071ef6c574a09
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0 b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
index c42fcc071809..5ccc3f6c6ac8 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check for the presence of a compiler
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/ExtUtils-HasCompiler
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-HasCompiler-0.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0e890129f24efb6853b12aec5561e8f5
+_md5_=75278c88f655d7a1bc4cf22c4b8263de
diff --git a/metadata/md5-cache/dev-perl/GD-2.730.0-r1 b/metadata/md5-cache/dev-perl/GD-2.730.0-r1
index 873040ed8566..615e1158f2be 100644
--- a/metadata/md5-cache/dev-perl/GD-2.730.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.730.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GD
 IUSE=animgif fcgi test truetype xpm examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.73.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=83d5aa21ae0ec5a2de35c5bc03aadd7b
+_md5_=9c480fa672958001180927f7c88181d0
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 06a9d2a2a026..348c7bf470f6 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 ~m68k ~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	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=290c90477086fddc03ff9bf7dc57d3fe
+_md5_=5071cecfbaebdce03c6aa943eb6665a3
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
index 9fdd6673c215..828c16ee5acd 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Perl module for parsing and creating MIME entities
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/MIME-tools
 IUSE=test examples
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-1 >=virtual/perl-File-Spec-0.600.0 >=virtual/perl-File-Temp-0.180.0 virtual/perl-IO >=virtual/perl-MIME-Base64-2.200.0 dev-perl/MailTools dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f549307fc7eb8970dbf804b05834f9cb
+_md5_=71f0a6ff0bd81a7ffc5984febdec24bf
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3364675b9641..a5e9f2b4ea9a 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/Mojolicious-9.190.0 b/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
index 4b0f28f6025c..491b82783822 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-9.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Real-time web framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mojolicious
 IUSE=minimal test examples
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86
 LICENSE=Artistic-2
 RDEPEND=!minimal? ( >=dev-perl/Cpanel-JSON-XS-4.90.0 >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-Scalar-List-Utils-1.410.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=38333dd2282e0e0213d569420046bb85
+_md5_=615159664bcd56cc8e399ef342f4bbaf
diff --git a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.60.0 b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.60.0
index 7f22447d1eec..3757b12b115b 100644
--- a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.60.0
+++ b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.60.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface for the MusicBrainz libdiscid library
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MusicBrainz-DiscID
 IUSE=test examples
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=media-libs/libdiscid-0.2.2 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=273ee92c3baf8fe34146e24595300e40
+_md5_=1f72898c5dd62bd2a9f50fc1f7d330a3
diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
index 48498a2c7764..ebcd2583c012 100644
--- a/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
+++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low-level HTTP connection (client)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-HTTP
 IUSE=minimal test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-2.12.0 ) virtual/perl-Carp !<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib virtual/perl-IO virtual/perl-IO-Compress dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=54c89d695db5fc7fe8cf3568d447971e
+_md5_=a825fd9dc7e65c07155f04e44741915a
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
index 6287305fd278..9e3274f71969 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Package-Stash
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a07d9be6ff01c8b3336dcf43f1577fcf
+_md5_=5c6bdc60ea4560c6bca88ea48eadf79f
diff --git a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0 b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
index e7d285783109..d4aebe8c428e 100644
--- a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=test code which forks
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Fork
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=176f130c59f11a262af15adc3384f7d6
+_md5_=47de9a66feba0641b8a56226599fe719
diff --git a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0 b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
deleted file mode 100644
index 2677693b0f26..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Allows conversion between Roman and Arabic algarisms
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Text-Roman
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07812d7dc6e12f619a96bf96d7482562
diff --git a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0-r1 b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0-r1
new file mode 100644
index 000000000000..d8c46c0bf083
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Roman-3.500.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=Allows conversion between Roman and Arabic algarisms
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Roman
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=2c5a21fad86032bed097f97dea5ea5f9
diff --git a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
deleted file mode 100644
index cdb52d0f7eb6..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Parse text and return a set of tokens using the same rules as the Unix shell
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Text-Shellwords
-KEYWORDS=~alpha amd64 ~ia64 ppc 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/L/LD/LDS/Text-Shellwords-1.08.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3cf4184f3c0311fc7ab60bdee091923f
diff --git a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r2 b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r2
new file mode 100644
index 000000000000..2aa07ab79ef4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.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=Parse text and return a set of tokens using the same rules as the Unix shell
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Shellwords
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc 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/L/LD/LDS/Text-Shellwords-1.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=eda65ac8db287975db262bba7972a0c3
diff --git a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0 b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
deleted file mode 100644
index 874a5bbf7e4d..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Implementation of the soundex algorithm
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Text-Soundex
-IUSE=test minimal
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=cb1c5bb738fd6c908cd13705cd6878e3
diff --git a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0-r1 b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0-r1
new file mode 100644
index 000000000000..e5b000b535b3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Implementation of the soundex algorithm
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Soundex
+IUSE=minimal test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=4682707f44988be4f615e97acec4756f
diff --git a/metadata/md5-cache/dev-perl/Text-Table-1.134.0 b/metadata/md5-cache/dev-perl/Text-Table-1.134.0
new file mode 100644
index 000000000000..e3b6a5edbb9c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Table-1.134.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Text-Aligner >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Organize Data in Tables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Table
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Text-Aligner dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6a953199fc3d843160204d90d44e951c
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.510.0 b/metadata/md5-cache/dev-perl/Text-Template-1.510.0
deleted file mode 100644
index 7a45a8528e6f..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Template-1.510.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Safe virtual/perl-Test-Simple dev-perl/Test-Warnings ) dev-lang/perl
-DESCRIPTION=Expand template text with embedded Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Text-Template
-IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ppc x86
-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/M/MS/MSCHOUT/Text-Template-1.51.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7b6e9f7efc98c5044045bf1213ca1e4b
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.600.0 b/metadata/md5-cache/dev-perl/Text-Template-1.600.0
new file mode 100644
index 000000000000..7b0eb353b98e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.600.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Safe dev-perl/Test-More-UTF8 virtual/perl-Test-Simple dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Expand template text with embedded Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Template
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.60.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d7408885e540e6b8dd87efdedf4e1dfd
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.0 b/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.0
deleted file mode 100644
index 433b0a98a1c9..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Plain ASCII transliterations of Unicode text
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Text-Unidecode
-KEYWORDS=~alpha amd64 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-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=209786a963b898e493d2badc3f7de44c
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.0-r1 b/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.0-r1
new file mode 100644
index 000000000000..956cd6f423e3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Unidecode-1.300.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=Plain ASCII transliterations of Unicode text
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Unidecode
+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 ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=484695e48067af371bfeb5886b2f201c
diff --git a/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1 b/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1
deleted file mode 100644
index 13fcfe4fcbe0..000000000000
--- a/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Test-File-ShareDir >=virtual/perl-Test-Simple-0.880.0 dev-perl/XML-Parser ) dev-lang/perl
-DESCRIPTION=Syntax highlighting using vim
-EAPI=6
-HOMEPAGE=https://github.com/rwstauner/Text-VimColor
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Text-VimColor-0.29.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=cd9068baf8bef40074195d13ded01660
diff --git a/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r2 b/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r2
new file mode 100644
index 000000000000..504b23a30bda
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Test-File-ShareDir >=virtual/perl-Test-Simple-0.880.0 dev-perl/XML-Parser ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Syntax highlighting using vim
+EAPI=8
+HOMEPAGE=https://github.com/rwstauner/Text-VimColor
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Text-VimColor-0.29.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=ce20b0c91f547dd402c75ef891da2186
diff --git a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0 b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
deleted file mode 100644
index 82901cafe6a2..000000000000
--- a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.28 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Translate Wiki formatted text into other formats
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Text-WikiFormat
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01ff31afc80a444ab40502a7d5f4f3da
diff --git a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0-r1 b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0-r1
new file mode 100644
index 000000000000..e7b48d637e5a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.28 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Translate Wiki formatted text into other formats
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-WikiFormat
+IUSE=test
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6b21682e0c69a5dc37460a2ebcd9c27b
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
deleted file mode 100644
index b71cef781143..000000000000
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
-DESCRIPTION=Internationalized substitute of Text::Wrap
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Text-WrapI18N
-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/Text-CharWidth dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e6b0182cef72fbbe65697cde44447ce
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r2 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r2
new file mode 100644
index 000000000000..9767e22abd98
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Text-CharWidth dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Internationalized substitute of Text::Wrap
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-WrapI18N
+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-perl/Text-CharWidth dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=0bbdfb5ac5598f4b34dfd673461f4982
diff --git a/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0 b/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0
deleted file mode 100644
index 209d8e53e067..000000000000
--- a/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( !minimal? ( dev-perl/Test-Differences ) virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Word wrap text by breaking long lines
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Text-Wrapper
-IUSE=test minimal examples
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=9450dbaab9fd0becb23c4a74bbcbaf17
diff --git a/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0-r1 b/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0-r1
new file mode 100644
index 000000000000..66de83f764e8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( !minimal? ( dev-perl/Test-Differences ) virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Word wrap text by breaking long lines
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-Wrapper
+IUSE=minimal test examples
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=87a9409d7cef54399278f8012edfd920
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
deleted file mode 100644
index accf7da69b0c..000000000000
--- a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Accessor-Chained test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl module to parse vFile formatted files into data structures
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Text-vFile-asData
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7dc6db2c2d95e85f3cc57765c83e5d5c
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0-r1 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0-r1
new file mode 100644
index 000000000000..1aae42cda2bc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Accessor-Chained test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl module to parse vFile formatted files into data structures
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-vFile-asData
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=625ff5e4501fd7e8639ef50587973b08
diff --git a/metadata/md5-cache/dev-perl/TheSchwartz-1.160.0 b/metadata/md5-cache/dev-perl/TheSchwartz-1.160.0
new file mode 100644
index 000000000000..fd3d443a8512
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/TheSchwartz-1.160.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Accessor >=dev-perl/Data-ObjectDriver-0.40.0 virtual/perl-Digest-MD5 virtual/perl-Storable >=dev-perl/Module-Build-Tiny-0.35.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Reliable job queue
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/TheSchwartz
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor >=dev-perl/Data-ObjectDriver-0.40.0 virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/TheSchwartz-1.16.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=e34095c52feabe1f6dd622cd584ae2c0
diff --git a/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0 b/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0
deleted file mode 100644
index f7c8321c78c1..000000000000
--- a/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader >=dev-perl/Module-Build-0.360.100 test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Thread specific signal masks
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Thread-SigMask
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Thread-SigMask-0.004.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d0f3d6b6f5ff09654f306176f49a178f
diff --git a/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0-r1 b/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0-r1
new file mode 100644
index 000000000000..4cc11db657a9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader >=dev-perl/Module-Build-0.360.100 test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Thread specific signal masks
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Thread-SigMask
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Thread-SigMask-0.004.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6eb8b58d0cb52dfa477b40d93459a44f
diff --git a/metadata/md5-cache/dev-perl/Throwable-1.0.0 b/metadata/md5-cache/dev-perl/Throwable-1.0.0
new file mode 100644
index 000000000000..bbdb7d1bdd00
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Throwable-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote 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=A role for classes that can be thrown
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Throwable
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=9a58ff95a364759bd28ffea34172f3a8
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
deleted file mode 100644
index 61f5395d8c0a..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=An array which is kept sorted
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-Array-Sorted
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0991a15b13842f238393c3f98b95513d
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r2 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r2
new file mode 100644
index 000000000000..d8f11beeb56a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.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=An array which is kept sorted
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Array-Sorted
+IUSE=test
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=779f9dfe0649a00b4dc5eca4826037f7
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
deleted file mode 100644
index f7a48236f62a..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Case preserving but case insensitive hash table
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-CPHash
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2bc27b74a264ab515be5ffb6e8d230d5
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0-r1
new file mode 100644
index 000000000000..dd26756876d7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Case preserving but case insensitive hash table
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-CPHash
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=9ce40b5da3214a482eb4442bad7c05bf
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0-r1
deleted file mode 100644
index c47a19581625..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=In memory size limited LRU cache
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Tie-Cache
-IUSE=examples
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/Tie-Cache-0.21.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=889ab0fee5b112706d084afa1235e8ee
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0-r2 b/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0-r2
new file mode 100644
index 000000000000..942c6370618e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-0.210.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=In memory size limited LRU cache
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Cache
+IUSE=test examples
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/Tie-Cache-0.21.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=0a24909a40e44b86c6e536c7f62bc353
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
deleted file mode 100644
index 8a446d63135e..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable test? ( >=virtual/perl-Test-Simple-0.82 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A Least-Recently Used cache
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-Cache-LRU
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7613cab61d45583ac61ad9863e1bacce
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0-r1
new file mode 100644
index 000000000000..174a3aa09ee7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable test? ( >=virtual/perl-Test-Simple-0.820.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A Least-Recently Used cache
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Cache-LRU
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=87c1775331dbd18ec175766ba5301874
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
deleted file mode 100644
index 81d0fb30fd81..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=[-build(-)]
-DESCRIPTION=Extends Tie::Cache::LRU with expiring
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-Cache-LRU-Expires
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=Artistic
-RDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e728243602768548412d544ba4d2048a
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r2 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r2
new file mode 100644
index 000000000000..4986b52e2b0d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extends Tie::Cache::LRU with expiring
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Cache-LRU-Expires
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=Artistic
+RDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=3d709da3ac39181fe505d0fb5a04460f
diff --git a/metadata/md5-cache/dev-perl/Tie-Cycle-1.226.0 b/metadata/md5-cache/dev-perl/Tie-Cycle-1.226.0
new file mode 100644
index 000000000000..ef7f9527db7e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Cycle-1.226.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Cycle through a list of values via a scalar
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Cycle
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.226.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=51105e446f3d4f6523053da87aa3f77e
diff --git a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1 b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
deleted file mode 100644
index a600805b0f4b..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=[-build(-)]
-DESCRIPTION=Hashes (and objects based on hashes) with encrypting fields
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-EncryptedHash
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f83453c0a9ed5bf104757e31cd906576
diff --git a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r2 b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r2
new file mode 100644
index 000000000000..10fef78a394d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Hashes (and objects based on hashes) with encrypting fields
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-EncryptedHash
+IUSE=test
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6fe66b7863d27a637ce33fd381698d45
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
deleted file mode 100644
index 0d2123afc96f..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Pod ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Tied hash with specific methods overriden by callbacks
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-Hash-Method
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cd9780395d65b7ff1f68537ade7705a
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0-r1 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0-r1
new file mode 100644
index 000000000000..7812010e8c92
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-perl/Test-Pod ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Tied hash with specific methods overriden by callbacks
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Hash-Method
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=05f4567f4e7da53d54663d07ed26127f
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
deleted file mode 100644
index 0ecd39fcfa41..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.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=Ordered associative arrays for Perl
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-IxHash
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=238af7450c2a0420849c9f96a2de0865
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0-r1
new file mode 100644
index 000000000000..1404afcd12be
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.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=Ordered associative arrays for Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-IxHash
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=130bd82d52851808f66910859679596c
diff --git a/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0 b/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0
deleted file mode 100644
index 0c2d430f82a1..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=Implements an ordered hash-like object
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Tie-LLHash
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAERXESS/Tie-LLHash-1.004.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=c556ddcc4da0f1d6d2cc80ee22f30f5e
diff --git a/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0-r1 b/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0-r1
new file mode 100644
index 000000000000..bbe95c5a1b33
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Implements an ordered hash-like object
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-LLHash
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAERXESS/Tie-LLHash-1.004.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=1e8c2f5f2bb96f4c6b8fb8d3be98855b
diff --git a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
deleted file mode 100644
index c1ae6b35dc7a..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Merge multiple data sources into a hash
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-ShadowHash
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Tie-ShadowHash-1.00.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14d81b664a83df40e45b05aa16991592
diff --git a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r2 b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r2
new file mode 100644
index 000000000000..31b8ffebf2fd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.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=Merge multiple data sources into a hash
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-ShadowHash
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Tie-ShadowHash-1.00.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d4ef723a574174e125b662c5ac11abf3
diff --git a/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0 b/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0
deleted file mode 100644
index 98d1d5b62e48..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Simple-1.40.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=Module for creating easier variable ties
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Tie-Simple
-IUSE=test
-KEYWORDS=amd64 ~hppa x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HANENKAMP/Tie-Simple-1.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0b11d952443a6949f1d31fab41197e90
diff --git a/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0-r1 b/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0-r1
new file mode 100644
index 000000000000..dd1122b47f30
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Simple-1.40.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=Module for creating easier variable ties
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Simple
+IUSE=test
+KEYWORDS=amd64 ~hppa x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HANENKAMP/Tie-Simple-1.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=83aec602cb1821aff1026151c1391306
diff --git a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
deleted file mode 100644
index 3c493fd63873..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A hash with strict-like semantics
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-StrictHash
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KV/KVAIL/Tie-StrictHash-1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7cd8e15928f794a71061c6e1b8f3f64b
diff --git a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r2 b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r2
new file mode 100644
index 000000000000..f3e0540770a5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.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=A hash with strict-like semantics
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-StrictHash
+IUSE=test
+KEYWORDS=amd64 ~ia64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KV/KVAIL/Tie-StrictHash-1.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=2e6520e43acdb321e37bcd2266e5048f
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
deleted file mode 100644
index 63322a6d2368..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Params-Validate test? ( >=dev-perl/Test-Differences-0.600.0 dev-perl/Test-NoWarnings dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Tying a subroutine, function or method to a hash
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-Sub
-IUSE=test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb464d43b0824881f83624a8126fab5f
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r2 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r2
new file mode 100644
index 000000000000..4e58a5371cfd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Params-Validate test? ( >=dev-perl/Test-Differences-0.600.0 dev-perl/Test-NoWarnings dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Tying a subroutine, function or method to a hash
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-Sub
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=b20ad94654e8bdcfef57c79b54babbcb
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
deleted file mode 100644
index 70783f3f55fb..000000000000
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Tie to an existing object
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tie-ToObject
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd9154c9841596788d5acabee1ae96da
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r2 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r2
new file mode 100644
index 000000000000..fcc482a45e71
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Tie to an existing object
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tie-ToObject
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=88d5cf9ad51886afc5376e12a05066b7
diff --git a/metadata/md5-cache/dev-perl/Time-Duration-1.210.0 b/metadata/md5-cache/dev-perl/Time-Duration-1.210.0
new file mode 100644
index 000000000000..82f1a188ef52
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Duration-1.210.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Rounded or exact English expression of durations
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Duration
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=cd9eeb82628ae1cbd20aa4924b92bcce
diff --git a/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.160.0 b/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.160.0
new file mode 100644
index 000000000000..85eee6a32936
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.160.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Time-Duration ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse string that represents time duration
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Duration-Parse
+IUSE=test
+KEYWORDS=~amd64 ~x86
+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/N/NE/NEILB/Time-Duration-Parse-0.16.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=cc9bb0841f29cb26527eb8f008eddcbc
diff --git a/metadata/md5-cache/dev-perl/Time-Format-1.160.0 b/metadata/md5-cache/dev-perl/Time-Format-1.160.0
new file mode 100644
index 000000000000..56341fda3ccd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Format-1.160.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Date-Manip >=virtual/perl-Time-Local-1.70.0 >=dev-perl/Module-Build-0.400.0 test? ( >=virtual/perl-Test-Simple-0.400.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Easy-to-use date/time formatting
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Format
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Time-Format
+RDEPEND=dev-perl/Date-Manip >=virtual/perl-Time-Local-1.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Time-Format-1.16.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=beb9ac3ddba6e6cd8b1e8b19bec48202
diff --git a/metadata/md5-cache/dev-perl/Time-Moment-0.440.0 b/metadata/md5-cache/dev-perl/Time-Moment-0.440.0
new file mode 100644
index 000000000000..d293cefcdb19
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Moment-0.440.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Time-HiRes >=virtual/perl-XSLoader-0.20.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-3.180.0 test? ( >=dev-perl/Test-Fatal-0.6.0 >=dev-perl/Test-Number-Delta-1.60.0 dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Represents a date and time of day with an offset from UTC
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Moment
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Time-HiRes >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.44.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7137e0f443b8571afb4612a58ed2d82e
diff --git a/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8 b/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8
deleted file mode 100644
index 5ef67a6e58b6..000000000000
--- a/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Build-0.360.400 virtual/perl-ExtUtils-CBuilder test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A clock source that only increments and never jumps
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Time-Monotonic
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVID/Time-Monotonic-v0.9.8.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=bb71c6ff0567c6d342da556e7fc54944
diff --git a/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8-r1 b/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8-r1
new file mode 100644
index 000000000000..474070351dc6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-0.360.400 virtual/perl-ExtUtils-CBuilder test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A clock source that only increments and never jumps
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Monotonic
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAVID/Time-Monotonic-v0.9.8.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f5ec75d6ef710fa54d2faff644b518c7
diff --git a/metadata/md5-cache/dev-perl/Time-Out-0.110.0-r1 b/metadata/md5-cache/dev-perl/Time-Out-0.110.0-r1
deleted file mode 100644
index e7c2822ed1da..000000000000
--- a/metadata/md5-cache/dev-perl/Time-Out-0.110.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Easily timeout long running operations
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Time-Out
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=fb8a516ab8b143ed6419e61ac77aead6
diff --git a/metadata/md5-cache/dev-perl/Time-Out-0.110.0-r2 b/metadata/md5-cache/dev-perl/Time-Out-0.110.0-r2
new file mode 100644
index 000000000000..c20d40ef4857
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Out-0.110.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=Easily timeout long running operations
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Out
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=ee60d6ef80398f993077b0933c4acc36
diff --git a/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0 b/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0
deleted file mode 100644
index cec28b923789..000000000000
--- a/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Time-Piece ) dev-lang/perl
-DESCRIPTION=A Date/Time Parsing Perl Module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Time-ParseDate
-IUSE=test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=Time-modules public-domain
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7c508c3de27dac4297c39ae8fa471171
diff --git a/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0-r1 b/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0-r1
new file mode 100644
index 000000000000..836b0855973a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Time-Piece ) dev-lang/perl
+DESCRIPTION=A Date/Time Parsing Perl Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-ParseDate
+IUSE=test
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=Time-modules public-domain
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=c32afa8432daa9bcc2ac47304cf7f20e
diff --git a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1 b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
deleted file mode 100644
index b54ac9b269d1..000000000000
--- a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=[-build(-)]
-DESCRIPTION=MySQL-specific functions for Time::Piece
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Time-Piece-MySQL
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Time-Piece-MySQL-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ae2581723ece021f75efd98cbd083043
diff --git a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r2 b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r2
new file mode 100644
index 000000000000..7a68a178113c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=MySQL-specific functions for Time::Piece
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Piece-MySQL
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Time-Piece-MySQL-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=fb80fabe9b29193917e7ff04bb074339
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
deleted file mode 100644
index e07e501b7888..000000000000
--- a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( virtual/perl-Time-HiRes ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Use tied scalars as timers
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Time-Stopwatch
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17d808bcffd0197e235eab38adeef1e1
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0-r1 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0-r1
new file mode 100644
index 000000000000..a94b28cd325a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Use tied scalars as timers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-Stopwatch
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=dbc665005cac50a95f9f7363f866ab66
diff --git a/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2 b/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2
deleted file mode 100644
index 4c00fa4a8ef0..000000000000
--- a/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl
-DESCRIPTION=Time manipulation in the TAI64* formats
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Time-TAI64
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JO/JOVAL/Time-TAI64-2.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=46497864c218ef2452a7384301856181
diff --git a/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r3 b/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r3
new file mode 100644
index 000000000000..2c2c562c5828
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Time manipulation in the TAI64* formats
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-TAI64
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JO/JOVAL/Time-TAI64-2.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=ceefb6e5d8b962634841f595742ecdf5
diff --git a/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0 b/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
deleted file mode 100644
index 42b513fdb739..000000000000
--- a/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Time-Local >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DESCRIPTION=Show timezone offset strings like +0900
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Time-TZOffset
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Time-Local dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Time-TZOffset-0.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5fef228be0374a355d1e78a30ac5e2ce
diff --git a/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0-r1 b/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0-r1
new file mode 100644
index 000000000000..b62c462448e4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Time-Local >=dev-perl/Module-Build-0.380.0 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=Show timezone offset strings like +0900
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Time-TZOffset
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Time-TZOffset-0.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=545cc17978cc29802e7427d88915856b
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
deleted file mode 100644
index 36350c452070..000000000000
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A Date/Time Parsing Perl Module
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/TimeDate
-KEYWORDS=~alpha amd64 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-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b9060123e2b18f92f52e1f427dc5aefb
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.330.0 b/metadata/md5-cache/dev-perl/TimeDate-2.330.0
deleted file mode 100644
index 7765e40f0718..000000000000
--- a/metadata/md5-cache/dev-perl/TimeDate-2.330.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A Date/Time Parsing Perl Module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/TimeDate
-KEYWORDS=~alpha amd64 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-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f4d321cf0f62a356cbb01c253e3a029b
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.330.0-r1 b/metadata/md5-cache/dev-perl/TimeDate-2.330.0-r1
new file mode 100644
index 000000000000..a6c06b5814f6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.330.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=A Date/Time Parsing Perl Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/TimeDate
+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 ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=a57a6cd095fccaf9a1b33a5a1fbbf1b5
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
deleted file mode 100644
index c43c2ebf3214..000000000000
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
-DESCRIPTION=Manipulate the mouse cursor programmatically
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
-KEYWORDS=amd64 ~ia64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=158212a696da918ff52ffb9b6da1dc7e
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
deleted file mode 100644
index 571c3361d1f5..000000000000
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Tk dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Manipulate the mouse cursor programmatically
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
-IUSE=test
-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	bd9574a79c5f0a347a9ea3db5ad9ca72	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=81039fb3c994505623564f2764518def
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r4 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r4
new file mode 100644
index 000000000000..6c534a8caa0b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Tk dev-lang/perl test? ( virtual/perl-Test-Simple ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Manipulate the mouse cursor programmatically
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
+IUSE=test test
+KEYWORDS=amd64 ~ia64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Tk dev-lang/perl:=
+RESTRICT=!test? ( test ) !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	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=bd4cdfb6b2c962ab6a8513e07dba121a
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
deleted file mode 100644
index baedb6f42833..000000000000
--- a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/jpeg:0 >=dev-perl/Tk-800.15.0 >=virtual/perl-ExtUtils-MakeMaker-6.580.0 dev-perl/Devel-CheckLib dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=lite JPEG loader for Tk::Photo
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Tk-JPEG-Lite
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/jpeg:0 >=dev-perl/Tk-800.15.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.015.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=5c6ffad276b5afb0cc7535d73778d556
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0-r1 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0-r1
new file mode 100644
index 000000000000..8b86d4ecaae7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/jpeg:0 >=dev-perl/Tk-800.15.0 >=virtual/perl-ExtUtils-MakeMaker-6.580.0 dev-perl/Devel-CheckLib dev-lang/perl test? ( virtual/perl-Test-Simple ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=lite JPEG loader for Tk::Photo
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tk-JPEG-Lite
+IUSE=test test
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/jpeg:0 >=dev-perl/Tk-800.15.0 dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.015.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=255cb3a91ac343eb2a83ac401c40434e
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.260.0 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.260.0
new file mode 100644
index 000000000000..fa18c7d63754
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.260.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Tk-800.22.0 >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-lang/perl test? ( virtual/perl-Test-Simple ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Create and manipulate tables in Perl + Tk
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tk-TableMatrix
+IUSE=test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Artistic
+RDEPEND=>=dev-perl/Tk-800.22.0 dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AS/ASB/Tk-TableMatrix-1.26.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=95e77b00f6b4b25d7c9acf64e18e4d73
diff --git a/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.320.0 b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.320.0
new file mode 100644
index 000000000000..b5ae0ed5d9a7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.320.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/File-Slurp-Tiny-0.3.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.1.2 >=virtual/perl-File-Spec-3.400.0 >=virtual/perl-File-Temp-0.190.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=(Super)class for representing nodes in a tree
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tree-DAG_Node
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-Slurp-Tiny-0.3.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.32.tgz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=8218281c71e0ca290cb8eb2dc5b2ece3
diff --git a/metadata/md5-cache/dev-perl/Tree-Simple-1.340.0 b/metadata/md5-cache/dev-perl/Tree-Simple-1.340.0
new file mode 100644
index 000000000000..8250823831e1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Tree-Simple-1.340.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( dev-perl/Test-Memory-Cycle ) >=dev-perl/Test-Exception-0.150.0 >=virtual/perl-Test-Simple-1.1.2 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A simple tree object
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Tree-Simple
+IUSE=minimal test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.34.tgz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=61647b6f0f97bb68dc5e3d63ede90006
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
deleted file mode 100644
index 203d7c42f56d..000000000000
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 >=dev-perl/Capture-Tiny-0.120.0 ) virtual/perl-File-Spec virtual/perl-Test-Simple virtual/perl-if ) dev-lang/perl
-DESCRIPTION=Minimal try/catch with proper localization of $@
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Try-Tiny
-IUSE=test 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=MIT
-RDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f3bbb01027246e043aa036a83f395dcb
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0-r1 b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0-r1
new file mode 100644
index 000000000000..a9b12b7d852d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 >=dev-perl/Capture-Tiny-0.120.0 ) virtual/perl-File-Spec virtual/perl-Test-Simple virtual/perl-if ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Minimal try/catch with proper localization of $@
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Try-Tiny
+IUSE=minimal 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
+LICENSE=MIT
+RDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=86700282be2a1b96520ccd22673a0007
diff --git a/metadata/md5-cache/dev-perl/Type-Tie-0.15.0 b/metadata/md5-cache/dev-perl/Type-Tie-0.15.0
new file mode 100644
index 000000000000..6fb3bdb7f2da
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Type-Tie-0.15.0
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/Hash-FieldHash ) >=dev-perl/Exporter-Tiny-0.26.0 >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( dev-perl/Test-Fatal dev-perl/Test-Requires >=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=Tie a variable to a type constraint
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Type-Tie
+IUSE=minimal test
+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.015.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=355e64753c27e5388cf6ea27fd05e224
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3 b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
index 2634df851cef..ae778cf4167b 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
@@ -5,11 +5,11 @@ DESCRIPTION=tiny, yet Moo(se)-compatible type constraint
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Type-Tiny
 IUSE=test minimal examples
-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=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-1.0.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.16.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=fc48ac02be5e4ba769a2552478925561
+_md5_=a55e73096dfa698a391b68be8f6c5307
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.12.4 b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.4
new file mode 100644
index 000000000000..4d4c811ac346
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.4
@@ -0,0 +1,15 @@
+BDEPEND=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-1.0.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.16.0 ) >=virtual/perl-ExtUtils-MakeMaker-6.170.0 >=virtual/perl-CPAN-Meta-Requirements-2.0.0 test? ( dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=tiny, yet Moo(se)-compatible type constraint
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Type-Tiny
+IUSE=test minimal test examples
+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=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-1.0.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.16.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012004.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=c2787aec547b760486aace4fb88b6d28
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
deleted file mode 100644
index adee207c4f5e..000000000000
--- a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/Type-Tiny ) >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl
-DESCRIPTION=provides an XS boost for some of Type::Tiny's built-in type constraints
-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
-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	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5624addec529b23ca040d0b73b997525
diff --git a/metadata/md5-cache/dev-perl/Types-Serialiser-1.10.0 b/metadata/md5-cache/dev-perl/Types-Serialiser-1.10.0
new file mode 100644
index 000000000000..66e908792063
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Types-Serialiser-1.10.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/common-sense virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=simple data types for common serialisation formats
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Types-Serialiser
+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-perl/common-sense dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=c7d402d08f90703e78839477848d6eaa
diff --git a/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r2 b/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r2
deleted file mode 100644
index f0ca230224a3..000000000000
--- a/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Net-SSLeay-1.350.0 dev-perl/Test-Exception >=dev-perl/RPC-XML-0.640.0 dev-perl/XML-LibXML dev-lang/perl
-DESCRIPTION=Client API for the NeuStar UltraDNS Transaction Protocol
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/UltraDNS
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Net-SSLeay-1.350.0 dev-perl/Test-Exception >=dev-perl/RPC-XML-0.640.0 dev-perl/XML-LibXML virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/UltraDNS-0.06.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5ee657b3f7065fb76a83e896057d217c
diff --git a/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r3 b/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r3
new file mode 100644
index 000000000000..860e3b182bfd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/UltraDNS-0.60.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Net-SSLeay-1.350.0 dev-perl/Test-Exception >=dev-perl/RPC-XML-0.640.0 dev-perl/XML-LibXML virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Client API for the NeuStar UltraDNS Transaction Protocol
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/UltraDNS
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Net-SSLeay-1.350.0 dev-perl/Test-Exception >=dev-perl/RPC-XML-0.640.0 dev-perl/XML-LibXML dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/UltraDNS-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=96e8c5a84b3058a9027c00e6e5922139
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-12.0.0 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-12.0.0
new file mode 100644
index 000000000000..5768c6c7640f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-12.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=East Asian Width properties
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Unicode-EastAsianWidth
+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 ~x64-solaris ~x86-solaris
+LICENSE=CC0-1.0
+RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-12.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f20b6b635bdc0053ba9edd407c247826
diff --git a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1 b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
deleted file mode 100644
index 3c5aabd7ac45..000000000000
--- a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2017.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl
-DESCRIPTION=UAX #14 Unicode Line Breaking Algorithm
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Unicode-LineBreak
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2017.004.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=71764390f32acb0a8527037fc2f91463
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
deleted file mode 100644
index 7842bcfe8f01..000000000000
--- a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Map charsets from and to utf16 code
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Unicode-Map
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a39913d93f8cecc9817c257840a72124
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r2 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r2
new file mode 100644
index 000000000000..c37567374e85
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.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=Map charsets from and to utf16 code
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Unicode-Map
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=43b9f5278724d5ba9f55352c7c6ab8f9
diff --git a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4 b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
index 4e9b1a7b4a90..f85608cda4a4 100644
--- a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
+++ b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Mojolicious-7.130.0 >=dev-perl/Module-Build-0.420.0 dev-lang/p
 DESCRIPTION=Web service API to MusicBrainz database
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/WebService-MusicBrainz
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mojolicious-7.130.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=52df19fd5c39411a07d800e7ffa3a2f7
+_md5_=e778376aa45e0bb5bb208f586d054d89
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.550.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
index fc4620ab2fa2..493119269b6c 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.550.0
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=8
 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 ~m68k ~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.70.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.55.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0d2cac8988e977842e6cf2d7cfbc706d
+_md5_=c851b175322e492c7d6660f4002c69b4
diff --git a/metadata/md5-cache/dev-perl/tkispell-0.200.0 b/metadata/md5-cache/dev-perl/tkispell-0.200.0
new file mode 100644
index 000000000000..e80e658e1a43
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/tkispell-0.200.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/aspell >=dev-perl/Tk-800.4.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl/Tk user interface for ispell
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/App-tkispell
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-text/aspell >=dev-perl/Tk-800.4.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AS/ASB/App-tkispell-0.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=305e57a034415936ca8dee590de94b97
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.53 b/metadata/md5-cache/dev-perl/txt2html-2.53
deleted file mode 100644
index 43dd91a84a23..000000000000
--- a/metadata/md5-cache/dev-perl/txt2html-2.53
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Convert a plain text file to HTML
-EAPI=6
-HOMEPAGE=https://github.com/resurrecting-open-source-projects/txt2html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/txt2html/archive/v2.53.tar.gz -> txt2html-2.53.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=153cf8ff202d8f2b13a54acc9569fa28
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.530.0 b/metadata/md5-cache/dev-perl/txt2html-2.530.0
new file mode 100644
index 000000000000..0517e40d1272
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/txt2html-2.530.0
@@ -0,0 +1,15 @@
+BDEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert a plain text file to HTML
+EAPI=8
+HOMEPAGE=https://github.com/resurrecting-open-source-projects/txt2html
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!dev-perl/TextToHTML dev-perl/YAML-Syck virtual/perl-Getopt-Long dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/resurrecting-open-source-projects/txt2html/archive/v2.53.tar.gz -> txt2html-2.53.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=fbbaff624fe2656c64ed59426b42408d
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index d4b828ebbaf8..547117432e29 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/igbinary-3.1.5 b/metadata/md5-cache/dev-php/igbinary-3.1.5
deleted file mode 100644
index 5d695f199e31..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.1.5
+++ /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 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.1.5.tar.gz -> igbinary-3.1.5.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26f88c5a123e08299abf7b0784f4964d
diff --git a/metadata/md5-cache/dev-php/igbinary-3.1.6-r1 b/metadata/md5-cache/dev-php/igbinary-3.1.6-r1
deleted file mode 100644
index 45ac4ba6f9b8..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.1.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.1.6.tar.gz -> igbinary-3.1.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6895c1233a613b269013b33d26184960
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.1 b/metadata/md5-cache/dev-php/igbinary-3.2.1
deleted file mode 100644
index 06bb21f932a8..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.2.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 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.1.tar.gz -> igbinary-3.2.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f433e8a3f2d44fefb7b88ed43f9aed0
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.2 b/metadata/md5-cache/dev-php/igbinary-3.2.2
deleted file mode 100644
index 31bfee112f05..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.2.2
+++ /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 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.2.tar.gz -> igbinary-3.2.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=142b11a4cd3b74df28ad64e832013326
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.4 b/metadata/md5-cache/dev-php/igbinary-3.2.4
deleted file mode 100644
index 2088d6f249c0..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.2.4
+++ /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 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.4.tar.gz -> igbinary-3.2.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=142b11a4cd3b74df28ad64e832013326
diff --git a/metadata/md5-cache/dev-php/maxmind-db-reader-1.10.1 b/metadata/md5-cache/dev-php/maxmind-db-reader-1.10.1
new file mode 100644
index 000000000000..91b2655f5b92
--- /dev/null
+++ b/metadata/md5-cache/dev-php/maxmind-db-reader-1.10.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+DESCRIPTION=PHP reader for the MaxMind database format
+EAPI=7
+HOMEPAGE=https://github.com/maxmind/MaxMind-DB-Reader-php
+IUSE=extension test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
+REQUIRED_USE=extension? ( || ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.10.1.tar.gz -> MaxMind-DB-Reader-php-1.10.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a76f2c9aa5440634d41266962995d142
diff --git a/metadata/md5-cache/dev-php/pecl-ps-1.4.4 b/metadata/md5-cache/dev-php/pecl-ps-1.4.4
new file mode 100644
index 000000000000..baa67b5cb338
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-ps-1.4.4
@@ -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 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3[gd(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php7-3? ( dev-lang/php:7.3[gd(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] )
+DESCRIPTION=PHP extension for creating PostScript files
+EAPI=7
+HOMEPAGE=https://pecl.php.net/ps
+IUSE=examples gd php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/pslib gd? ( media-libs/gd:2= ) php_targets_php7-3? ( dev-lang/php:7.3[gd(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[gd(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[gd(-)?] )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/ps-1.4.4.tgz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=870c59bed7278bb6cf9df10da1746567
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.1 b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.1
new file mode 100644
index 000000000000..14569ef996ab
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=An extension to track progress of a file upload
+EAPI=7
+HOMEPAGE=https://pecl.php.net/uploadprogress
+IUSE=examples php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/uploadprogress-2.0.1.tgz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=11ac6d1d2ad80b31fc440a5b31916937
diff --git a/metadata/md5-cache/dev-php/swoole-async-4.4.12 b/metadata/md5-cache/dev-php/swoole-async-4.4.12
deleted file mode 100644
index fde071e54773..000000000000
--- a/metadata/md5-cache/dev-php/swoole-async-4.4.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-php/swoole-4.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=An extension of Swoole, including the async callback style API
-EAPI=7
-HOMEPAGE=https://www.swoole.co.uk
-IUSE=debug php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-php/swoole-4.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/swoole/ext-async/archive/v4.4.12.tar.gz -> swoole-async-4.4.12.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1ad47a4648bf08f040b3df96138f417
diff --git a/metadata/md5-cache/dev-php/swoole-async-4.4.12-r1 b/metadata/md5-cache/dev-php/swoole-async-4.4.12-r1
new file mode 100644
index 000000000000..2b3c59217947
--- /dev/null
+++ b/metadata/md5-cache/dev-php/swoole-async-4.4.12-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-php/swoole-4.4.12[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DESCRIPTION=An extension of Swoole, including the async callback style API
+EAPI=7
+HOMEPAGE=https://www.swoole.co.uk
+IUSE=debug php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-php/swoole-4.4.12[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/swoole/ext-async/archive/v4.4.12.tar.gz -> swoole-async-4.4.12.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd449ed3d585d9f8c88494e7999961b7
diff --git a/metadata/md5-cache/dev-php/swoole-async-4.4.16 b/metadata/md5-cache/dev-php/swoole-async-4.4.16
deleted file mode 100644
index 341b26f3ebf3..000000000000
--- a/metadata/md5-cache/dev-php/swoole-async-4.4.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-php/swoole-4.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=An extension of Swoole, including the async callback style API
-EAPI=7
-HOMEPAGE=https://www.swoole.co.uk
-IUSE=debug php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-php/swoole-4.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/swoole/ext-async/archive/v4.4.16.tar.gz -> swoole-async-4.4.16.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10db8ee4c0c43a2a49b92121d215e7ac
diff --git a/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1 b/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1
new file mode 100644
index 000000000000..3d4a10a161ce
--- /dev/null
+++ b/metadata/md5-cache/dev-php/swoole-async-4.4.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-php/swoole-4.4.16[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DESCRIPTION=An extension of Swoole, including the async callback style API
+EAPI=7
+HOMEPAGE=https://www.swoole.co.uk
+IUSE=debug php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-php/swoole-4.4.16[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/swoole/ext-async/archive/v4.4.16.tar.gz -> swoole-async-4.4.16.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd449ed3d585d9f8c88494e7999961b7
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1-r1 b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
index 0807916f485e..61069866fd1b 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92489b4a77f01696a5af3c57d8cc6dd4
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.6.3 b/metadata/md5-cache/dev-python/APScheduler-3.6.3
index fc963c2227eb..8d1c01a242d3 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.6.3
+++ b/metadata/md5-cache/dev-python/APScheduler-3.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1886f7f13e7d93a27d22287d67b7c21e
diff --git a/metadata/md5-cache/dev-python/Babel-2.9.1 b/metadata/md5-cache/dev-python/Babel-2.9.1
index 9393a7bd60e5..2f97b8dc14e4 100644
--- a/metadata/md5-cache/dev-python/Babel-2.9.1
+++ b/metadata/md5-cache/dev-python/Babel-2.9.1
@@ -4,12 +4,12 @@ DESCRIPTION=Collection of tools for internationalizing Python applications
 EAPI=7
 HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a0377f0dbd48f7ea836304e03742e86
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2269298a7165f0a3bb19117bcb67563b
diff --git a/metadata/md5-cache/dev-python/BitVector-3.5.0 b/metadata/md5-cache/dev-python/BitVector-3.5.0
index 17df98660bd1..de24d6b36482 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.5.0
+++ b/metadata/md5-cache/dev-python/BitVector-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f6a4cc7f5835c19bd4bc6dab3a93686
diff --git a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4 b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
index 2f40142119ec..9d2e2e2f1130 100644
--- a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
+++ b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CppHeaderParser/CppHeaderParser-2.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba33eb19e5ec56d0982691ec7af9215a
diff --git a/metadata/md5-cache/dev-python/Faker-8.12.0 b/metadata/md5-cache/dev-python/Faker-8.12.0
index 7bd86f44778f..648c96bf62b8 100644
--- a/metadata/md5-cache/dev-python/Faker-8.12.0
+++ b/metadata/md5-cache/dev-python/Faker-8.12.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/F/Faker/Faker-8.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.12.1 b/metadata/md5-cache/dev-python/Faker-8.12.1
index d554333a0aef..8d89771b5369 100644
--- a/metadata/md5-cache/dev-python/Faker-8.12.1
+++ b/metadata/md5-cache/dev-python/Faker-8.12.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/F/Faker/Faker-8.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.13.2 b/metadata/md5-cache/dev-python/Faker-8.13.2
index e760de200dfe..0c84584e54f1 100644
--- a/metadata/md5-cache/dev-python/Faker-8.13.2
+++ b/metadata/md5-cache/dev-python/Faker-8.13.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/F/Faker/Faker-8.13.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.14.0 b/metadata/md5-cache/dev-python/Faker-8.14.0
index 5bc6b8ab6c86..59bcf75a28a4 100644
--- a/metadata/md5-cache/dev-python/Faker-8.14.0
+++ b/metadata/md5-cache/dev-python/Faker-8.14.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/F/Faker/Faker-8.14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.20 b/metadata/md5-cache/dev-python/GitPython-3.1.20
index a08d1e7f93eb..96f134a777f9 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.20
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.20.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.20.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.7.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-4.0.0.gitbundle )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2378ba872448736401c323d596538390
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.24 b/metadata/md5-cache/dev-python/GitPython-3.1.24
index 2837f8eb1d1f..ba909fc2be97 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.24
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.24.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.24.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.7.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-4.0.0.gitbundle )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff24710ce1c4295e23f1eaa33ce5daed
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.5.0 b/metadata/md5-cache/dev-python/GridDataFormats-0.5.0
index d9a0366f6982..f4af214e9630 100644
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.5.0
+++ b/metadata/md5-cache/dev-python/GridDataFormats-0.5.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/G/GridDataFormats/GridDataFormats-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02f1c40e46afaec2fd2d7494b1920966
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 84b4a297c506..ce6d859ec441 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/MechanicalSoup-1.0.0 b/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
index 5fcf67107248..adcf317fcf9b 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27ab36102a6f95297b11a7197af1a3b3
diff --git a/metadata/md5-cache/dev-python/MechanicalSoup-1.1.0 b/metadata/md5-cache/dev-python/MechanicalSoup-1.1.0
index a01ee83dfe8c..4287fd72e67d 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-1.1.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-1.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=mirror://pypi/M/MechanicalSoup/MechanicalSoup-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13506aa927aba6d006a0db002e6c6818
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1 b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
index 4c52335d6bf7..6783a3646799 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
+++ b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a394a311b046bbb68c0c8f82b0e8c2f7
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0-r1 b/metadata/md5-cache/dev-python/PyECLib-1.6.0-r1
index 5ad6fc01a1d7..b2ddf2337d72 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0-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/pyeclib/pyeclib-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d958bcd9501f3e4a00cd90eea243478
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.55 b/metadata/md5-cache/dev-python/PyGithub-1.55
index d2ff74b3658e..253231440cfe 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.55
+++ b/metadata/md5-cache/dev-python/PyGithub-1.55
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.55.tar.gz -> PyGithub-1.55.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4b24758d41072b3fcee0f26177d8e73
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1 b/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
index 1ec415cd291a..fd665dd87b11 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPDF2/PyPDF2-1.26.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a240f28d5a4c3aec8a258cea9f97bafc
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.10.3 b/metadata/md5-cache/dev-python/PyQt-builder-1.10.3
index 3c8005cfa3a0..e7fc9378f8be 100644
--- a/metadata/md5-cache/dev-python/PyQt-builder-1.10.3
+++ b/metadata/md5-cache/dev-python/PyQt-builder-1.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt-builder/PyQt-builder-1.10.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d6eb947dc686eb8baadf35fe3f39406
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0 b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
index 8fec8ffbee29..533b823f294a 100644
--- a/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
+++ b/metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/12
 SRC_URI=mirror://pypi/P/PyQt5-sip/PyQt5_sip-12.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14fe579a6bffc533f8408cdcc2e3ac60
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
index d7a7b3669ef4..4694afa5a58e 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8e07b0a938f1f650136ae2f65ea0b3e
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.7 b/metadata/md5-cache/dev-python/PySDL2-0.9.7
index a98a162da960..24ee570c7301 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.7
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b51be0e5eec5f6a0fd47f6259b0a4d2
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.8 b/metadata/md5-cache/dev-python/PySDL2-0.9.8
index 7cd1c9702a22..83ee805b42fc 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.8
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.8
@@ -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/P/PySDL2/PySDL2-0.9.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce4b01ab6e378c071ed875a22b3a9a68
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.9 b/metadata/md5-cache/dev-python/PySDL2-0.9.9
index 40675ab176cf..c17d0ca43698 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.9
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.9
@@ -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/P/PySDL2/PySDL2-0.9.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce4b01ab6e378c071ed875a22b3a9a68
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.4 b/metadata/md5-cache/dev-python/PySensors-0.0.4
index b9c7b00bf7ac..68a55428d4f1 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.4
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/lm-sensors-3 python_targets_python3_8? ( dev-lang/python:3.8
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySensors/PySensors-0.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=195466e03f2700777ae8bcb608cc695f
diff --git a/metadata/md5-cache/dev-python/PySocks-1.7.1-r1 b/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
index c601764f2152..787ad78cbc32 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0943357f9d79c9aa312bbe1dc4f36c1
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.7.2 b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
index c36853b0ae24..78391b8fecb6 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-5.7.2
+++ b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/PyUtilib/pyutilib/archive/5.7.2.tar.gz -> PyUtilib-5.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc4b33daa00df6bb94af1a5fa3793ef7
diff --git a/metadata/md5-cache/dev-python/PyUtilib-6.0.0 b/metadata/md5-cache/dev-python/PyUtilib-6.0.0
index f45335cde0fa..8a2b0124b004 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-6.0.0
+++ b/metadata/md5-cache/dev-python/PyUtilib-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyUtilib/pyutilib/archive/6.0.0.tar.gz -> PyUtilib-6.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3650d0c840895e607babf75183ea5bc0
diff --git a/metadata/md5-cache/dev-python/Pyro4-4.80 b/metadata/md5-cache/dev-python/Pyro4-4.80
index 38ea4a06c55c..5cfbba117b67 100644
--- a/metadata/md5-cache/dev-python/Pyro4-4.80
+++ b/metadata/md5-cache/dev-python/Pyro4-4.80
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.80.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f9d49acbf9506f825230b6cd5d0baec
diff --git a/metadata/md5-cache/dev-python/Pyro4-4.81 b/metadata/md5-cache/dev-python/Pyro4-4.81
index 7e1fd983653b..f2ba48cde24d 100644
--- a/metadata/md5-cache/dev-python/Pyro4-4.81
+++ b/metadata/md5-cache/dev-python/Pyro4-4.81
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.81.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3c7c9f8e6f9400c535d1ecbea47f9fe
diff --git a/metadata/md5-cache/dev-python/QtPy-1.10.0 b/metadata/md5-cache/dev-python/QtPy-1.10.0
index 1503fa0c07aa..e0f2ceddbf22 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.10.0
+++ b/metadata/md5-cache/dev-python/QtPy-1.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_10? ( pyqt5 !pyside2 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9d08067ecdf30f48a5adfdfc7b1ec1c8
diff --git a/metadata/md5-cache/dev-python/QtPy-1.11.1 b/metadata/md5-cache/dev-python/QtPy-1.11.1
index f470397df521..efd578c8a576 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.11.1
+++ b/metadata/md5-cache/dev-python/QtPy-1.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_10? ( pyqt5 !pyside2 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=942a3555eff42942d09d348d298ff6b4
diff --git a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5 b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
index 94cb46a18edf..10e9a445d458 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
+++ b/metadata/md5-cache/dev-python/QtPy-1.9.0-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( pyqt5 pyside2 ) python_targets_python3_10? ( pyqt5 !pyside2 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=3960afd8560b56525da3981ac7805680
diff --git a/metadata/md5-cache/dev-python/Rx-3.1.0 b/metadata/md5-cache/dev-python/Rx-3.1.0
index e0814d94a26e..bc64443406df 100644
--- a/metadata/md5-cache/dev-python/Rx-3.1.0
+++ b/metadata/md5-cache/dev-python/Rx-3.1.0
@@ -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/ReactiveX/RxPY/archive/v3.1.0.tar.gz -> Rx-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=c42aa8187f2ad5e44fd3859888426ed8
diff --git a/metadata/md5-cache/dev-python/Rx-3.2.0 b/metadata/md5-cache/dev-python/Rx-3.2.0
index ef44825151b8..85c6e1cbd51b 100644
--- a/metadata/md5-cache/dev-python/Rx-3.2.0
+++ b/metadata/md5-cache/dev-python/Rx-3.2.0
@@ -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/ReactiveX/RxPY/archive/v3.2.0.tar.gz -> RxPY-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=c928f24f8552781996db24552edcbd59
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21 b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
index eddf59b9a6b9..cc679115cd66 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_8(-)?] >=dev-python/requests-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-testing/archive/v2018.9.21.tar.gz -> SaltTesting-2018.9.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d506e9c9de8555050f13b116d2946aaa
diff --git a/metadata/md5-cache/dev-python/absl-py-0.10.0 b/metadata/md5-cache/dev-python/absl-py-0.10.0
index 6b34385bea3d..daa5ad2d7395 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.10.0
+++ b/metadata/md5-cache/dev-python/absl-py-0.10.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[pytho
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.10.0.tar.gz -> absl-py-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c289fa90a582b84b2d29fe5313f0b72
diff --git a/metadata/md5-cache/dev-python/absl-py-0.12.0 b/metadata/md5-cache/dev-python/absl-py-0.12.0
index 3388bca8aca8..63ce45c797cc 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.12.0
+++ b/metadata/md5-cache/dev-python/absl-py-0.12.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.12.0.tar.gz -> absl-py-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21c0477310409c9404c502e50a368777
diff --git a/metadata/md5-cache/dev-python/abydos-0.5.0-r1 b/metadata/md5-cache/dev-python/abydos-0.5.0-r1
index b79ae30ef1a7..09ab6aa06f27 100644
--- a/metadata/md5-cache/dev-python/abydos-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/abydos-0.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chrislit/abydos/archive/v0.5.0.tar.gz -> abydos-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=742871a8ea51d353fa772e087f23423d
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.3 b/metadata/md5-cache/dev-python/aesara-2.1.3
deleted file mode 100644
index c318d923e7c6..000000000000
--- a/metadata/md5-cache/dev-python/aesara-2.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
-EAPI=7
-HOMEPAGE=https://github.com/aesara-devs/aesara
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.3.tar.gz -> aesara-rel-2.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=443e47cac547f95f7f8861a4bb36c0e9
diff --git a/metadata/md5-cache/dev-python/aesara-2.2.1 b/metadata/md5-cache/dev-python/aesara-2.2.1
index 853dae6748d0..62140df2ee40 100644
--- a/metadata/md5-cache/dev-python/aesara-2.2.1
+++ b/metadata/md5-cache/dev-python/aesara-2.2.1
@@ -4,12 +4,12 @@ DESCRIPTION=Library for operating on mathematical expressions with multi-dimensi
 EAPI=8
 HOMEPAGE=https://github.com/aesara-devs/aesara
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.2.1.tar.gz -> aesara-rel-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c25bf36f8974cd8077d9af1b0995dc3f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8d9b78261cb4347e292ef2babc4367a2
diff --git a/metadata/md5-cache/dev-python/aesara-2.2.2 b/metadata/md5-cache/dev-python/aesara-2.2.2
index 144bf61b9a0a..118c6ca7df36 100644
--- a/metadata/md5-cache/dev-python/aesara-2.2.2
+++ b/metadata/md5-cache/dev-python/aesara-2.2.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.2.2.tar.gz -> aesara-rel-2.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c25bf36f8974cd8077d9af1b0995dc3f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=de767c490864cfb51554697260e7d762
diff --git a/metadata/md5-cache/dev-python/agate-1.6.3 b/metadata/md5-cache/dev-python/agate-1.6.3
index da8e8e567fa7..3599abefb071 100644
--- a/metadata/md5-cache/dev-python/agate-1.6.3
+++ b/metadata/md5-cache/dev-python/agate-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=mirror://pypi/a/agate/agate-1.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _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 0338716d8de0..b45fcb48fa86 100644
--- a/metadata/md5-cache/dev-python/agate-dbf-0.2.2
+++ b/metadata/md5-cache/dev-python/agate-dbf-0.2.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/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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 9d1d82489ebb..14b09eda5536 100644
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.3
+++ b/metadata/md5-cache/dev-python/agate-excel-0.2.3
@@ -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/a/agate-excel/agate-excel-0.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5b38615408e284146aec3ff9479d118
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.5 b/metadata/md5-cache/dev-python/agate-excel-0.2.5
index e9c8bc4104fe..f10133d55de2 100644
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.5
+++ b/metadata/md5-cache/dev-python/agate-excel-0.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=mirror://pypi/a/agate-excel/agate-excel-0.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c2460e1b459c566a0cfcb250f7e3042
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 6fd34a6e8af8..439018c3b655 100644
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.7
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.7
@@ -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/a/agate-sql/agate-sql-0.5.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=891caa8dbbf763bfc9f53e659ab189e7
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.8 b/metadata/md5-cache/dev-python/agate-sql-0.5.8
index f655c0f11b49..c7743b32132a 100644
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.8
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.8
@@ -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/a/agate-sql/agate-sql-0.5.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cabfdccab7cef5f2bd1f8029d73a5806
diff --git a/metadata/md5-cache/dev-python/aiodns-3.0.0 b/metadata/md5-cache/dev-python/aiodns-3.0.0
index 15a0a949c49d..4eaaece14069 100644
--- a/metadata/md5-cache/dev-python/aiodns-3.0.0
+++ b/metadata/md5-cache/dev-python/aiodns-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiodns/aiodns-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5008d3a078713cb8f02dbba8e5b7240
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.5.0 b/metadata/md5-cache/dev-python/aiofiles-0.5.0
index dce17f48d085..59353ad94cd7 100644
--- a/metadata/md5-cache/dev-python/aiofiles-0.5.0
+++ b/metadata/md5-cache/dev-python/aiofiles-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.5.0.tar.gz -> aiofiles-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5632e55011c23e047863a1c8f3c11f4
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.6.0 b/metadata/md5-cache/dev-python/aiofiles-0.6.0
index a8a5306d2e10..d1f134f77c4a 100644
--- a/metadata/md5-cache/dev-python/aiofiles-0.6.0
+++ b/metadata/md5-cache/dev-python/aiofiles-0.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/Tinche/aiofiles/archive/v0.6.0.tar.gz -> aiofiles-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=142a139004eb582722c40f30f3fa0e4d
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.7.0 b/metadata/md5-cache/dev-python/aiofiles-0.7.0
index 6c512c330ff4..570ee54b71da 100644
--- a/metadata/md5-cache/dev-python/aiofiles-0.7.0
+++ b/metadata/md5-cache/dev-python/aiofiles-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.7.0.tar.gz -> aiofiles-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7de45477b67aa7cc0c6902312855713b
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 83b9a63cbc10..741d95155071 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
@@ -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/a/aiohttp/aiohttp-3.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de7cddc614785345951e3c18f7ba23e1
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
index 583257ce8a19..089f89e4abb2 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.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=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59c0569e67d8fac7e09dabc13a280e48
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 db4eac88194b..6b292920b6e2 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
@@ -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/a/aiohttp-jinja2/aiohttp-jinja2-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95ff496d4da037f14240fcc61475133c
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
index 8e89f2859e32..bc0e51524d7f 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
@@ -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/a/aiohttp-jinja2/aiohttp-jinja2-1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2c3854346f2a0acdb08dae3c229117d
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 d75795c64d14..9222010109eb 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.6.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/romis2012/aiohttp-socks/archive/v0.6.0.tar.gz -> aiohttp-socks-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=993bf9431852d1eb0939f54fa09aa335
diff --git a/metadata/md5-cache/dev-python/aioredis-2.0.0 b/metadata/md5-cache/dev-python/aioredis-2.0.0
index 24c50ef6c275..bfa5a98710c5 100644
--- a/metadata/md5-cache/dev-python/aioredis-2.0.0
+++ b/metadata/md5-cache/dev-python/aioredis-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aioredis/aioredis-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1ea10c536312777af4f140e6c9dc89b
diff --git a/metadata/md5-cache/dev-python/aioresponses-0.7.2 b/metadata/md5-cache/dev-python/aioresponses-0.7.2
index 15e6af2f732f..ec0d1cad532b 100644
--- a/metadata/md5-cache/dev-python/aioresponses-0.7.2
+++ b/metadata/md5-cache/dev-python/aioresponses-0.7.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/a/aioresponses/aioresponses-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8eed479f95999efe2221efa45401e0b8
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.19.1 b/metadata/md5-cache/dev-python/aiorpcX-0.19.1
index 7dbdc98f7578..7f3d943307e5 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.19.1
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.19.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.19.1.tar.gz -> aiorpcX-0.19.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=951b7bf546d2fdcc73bad4afbbb9637b
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.22.1 b/metadata/md5-cache/dev-python/aiorpcX-0.22.1
index 803890dfd735..4abe7de78312 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.22.1
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.22.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.22.1.tar.gz -> aiorpcX-0.22.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc94702ebaa33514cd3113e081c94928
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.4.2 b/metadata/md5-cache/dev-python/aiosmtpd-1.4.2
index e2ac43a33611..4e29d05acfd9 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.4.2
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08b4d61497d3e200ffd2f457b4760146
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
index 10ea94a530cf..757fd7e8430f 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79efeb4c1f4e7532011ee2b8f06240f9
diff --git a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1 b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
index e3e4b13417db..08077d53950d 100644
--- a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
+++ b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/git-pull/alagitpull/archive/v0.0.23.tar.gz -> alagitpull-0.0.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23b20e945b826fcc2bbef455015f572f
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.5 b/metadata/md5-cache/dev-python/alembic-1.6.5
index 25a61bd6ac58..2ad7c4a9bdaf 100644
--- a/metadata/md5-cache/dev-python/alembic-1.6.5
+++ b/metadata/md5-cache/dev-python/alembic-1.6.5
@@ -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/a/alembic/alembic-1.6.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a92562d5488b3fbc234a309e89dc4855
diff --git a/metadata/md5-cache/dev-python/alembic-1.7.0 b/metadata/md5-cache/dev-python/alembic-1.7.0
index f27435aefe1d..bfdbeba05249 100644
--- a/metadata/md5-cache/dev-python/alembic-1.7.0
+++ b/metadata/md5-cache/dev-python/alembic-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88b08ade796ccbde74dd02d5133f7bb2
diff --git a/metadata/md5-cache/dev-python/alembic-1.7.1 b/metadata/md5-cache/dev-python/alembic-1.7.1
index 8856da7ac24b..d6a905574077 100644
--- a/metadata/md5-cache/dev-python/alembic-1.7.1
+++ b/metadata/md5-cache/dev-python/alembic-1.7.1
@@ -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/a/alembic/alembic-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88b08ade796ccbde74dd02d5133f7bb2
diff --git a/metadata/md5-cache/dev-python/alembic-1.7.3 b/metadata/md5-cache/dev-python/alembic-1.7.3
index 21e5126eff94..200258e1d642 100644
--- a/metadata/md5-cache/dev-python/alembic-1.7.3
+++ b/metadata/md5-cache/dev-python/alembic-1.7.3
@@ -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/a/alembic/alembic-1.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88b08ade796ccbde74dd02d5133f7bb2
diff --git a/metadata/md5-cache/dev-python/ament_package-0.12.0 b/metadata/md5-cache/dev-python/ament_package-0.12.0
index 84f774ee8f40..c1ab1762d6e3 100644
--- a/metadata/md5-cache/dev-python/ament_package-0.12.0
+++ b/metadata/md5-cache/dev-python/ament_package-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_package/archive/0.12.0.tar.gz -> ament_package-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3df71be45a218fff895c79e94ab63dc
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.1-r1 b/metadata/md5-cache/dev-python/amodem-1.15.1-r1
index 115a93765ee0..311e8db1becc 100644
--- a/metadata/md5-cache/dev-python/amodem-1.15.1-r1
+++ b/metadata/md5-cache/dev-python/amodem-1.15.1-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/romanz/amodem/archive/v1.15.1.tar.gz -> amodem-1.15.1.tar.gz mirror://pypi/a/amodem/amodem-1.15.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=874b3c70697750c6799db26a1fbd3a19
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.2 b/metadata/md5-cache/dev-python/amodem-1.15.2
index e1b2b4d62244..72358ee20b94 100644
--- a/metadata/md5-cache/dev-python/amodem-1.15.2
+++ b/metadata/md5-cache/dev-python/amodem-1.15.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/romanz/amodem/archive/v1.15.2.tar.gz -> amodem-1.15.2.tar.gz mirror://pypi/a/amodem/amodem-1.15.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbb90a44e69ca7c4d925dd49a26a9782
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.3 b/metadata/md5-cache/dev-python/amodem-1.15.3
index 5f155d95dfb3..dc2e27080c1c 100644
--- a/metadata/md5-cache/dev-python/amodem-1.15.3
+++ b/metadata/md5-cache/dev-python/amodem-1.15.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/romanz/amodem/archive/v1.15.3.tar.gz -> amodem-1.15.3.tar.gz mirror://pypi/a/amodem/amodem-1.15.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28b5c011f747da5110c318f2f6aa2c9a
diff --git a/metadata/md5-cache/dev-python/aniso8601-9.0.1 b/metadata/md5-cache/dev-python/aniso8601-9.0.1
index 8adf6f877f84..fcad63d2c986 100644
--- a/metadata/md5-cache/dev-python/aniso8601-9.0.1
+++ b/metadata/md5-cache/dev-python/aniso8601-9.0.1
@@ -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/a/aniso8601/aniso8601-9.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1288b83b8e5f9c8f246cc28c938efb62
diff --git a/metadata/md5-cache/dev-python/ansi-0.2.0 b/metadata/md5-cache/dev-python/ansi-0.2.0
index 9cfb91d54ab6..d7cab84c0a54 100644
--- a/metadata/md5-cache/dev-python/ansi-0.2.0
+++ b/metadata/md5-cache/dev-python/ansi-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tehmaze/ansi/archive/ansi-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fbd3bd5e8ccab6bc041fdd514d524c6
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.6.0 b/metadata/md5-cache/dev-python/ansi2html-1.6.0
index 3d67c21e86dc..b280930c51f6 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.6.0
+++ b/metadata/md5-cache/dev-python/ansi2html-1.6.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/a/ansi2html/ansi2html-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1069fa76d3d785a89a35eb752079eda
diff --git a/metadata/md5-cache/dev-python/ansible-pygments-0.1.0 b/metadata/md5-cache/dev-python/ansible-pygments-0.1.0
index 04a172255da1..f4c1abe3bce1 100644
--- a/metadata/md5-cache/dev-python/ansible-pygments-0.1.0
+++ b/metadata/md5-cache/dev-python/ansible-pygments-0.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/a/ansible-pygments/ansible-pygments-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92d04d246294728c94f1ea0d63bd053b
diff --git a/metadata/md5-cache/dev-python/ansible-runner-1.4.7-r1 b/metadata/md5-cache/dev-python/ansible-runner-1.4.7-r1
index dbe62c70da2b..a8707548afcc 100644
--- a/metadata/md5-cache/dev-python/ansible-runner-1.4.7-r1
+++ b/metadata/md5-cache/dev-python/ansible-runner-1.4.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-runner/ansible-runner-1.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=902961153f4abfda7643aa5b4253da88
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.3.2 b/metadata/md5-cache/dev-python/ansicolor-0.3.2
index d37986615468..22f218c440f1 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.3.2
+++ b/metadata/md5-cache/dev-python/ansicolor-0.3.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/numerodix/ansicolor/archive/0.3.2.tar.gz -> ansicolor-0.3.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6281d54ab6aa839db61d8a1f4f06a28
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index eedb6715cb43..0da4752e8fdc 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b44b6837c89677d06ce23bb72e56d0dd
diff --git a/metadata/md5-cache/dev-python/anyio-3.1.0 b/metadata/md5-cache/dev-python/anyio-3.1.0
index 3d1337b6e768..6d6e3246ef38 100644
--- a/metadata/md5-cache/dev-python/anyio-3.1.0
+++ b/metadata/md5-cache/dev-python/anyio-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9047c15c16ad323f54c3d1bd3b1775e9
diff --git a/metadata/md5-cache/dev-python/anyio-3.2.0 b/metadata/md5-cache/dev-python/anyio-3.2.0
index 25878c9c01fc..a7c41cf96a30 100644
--- a/metadata/md5-cache/dev-python/anyio-3.2.0
+++ b/metadata/md5-cache/dev-python/anyio-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79bd2d5c1e3d63f17772f1ef9605dc45
diff --git a/metadata/md5-cache/dev-python/anyio-3.2.1 b/metadata/md5-cache/dev-python/anyio-3.2.1
index 217b3893178f..de83013359f2 100644
--- a/metadata/md5-cache/dev-python/anyio-3.2.1
+++ b/metadata/md5-cache/dev-python/anyio-3.2.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/a/anyio/anyio-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=add5fc56a5eeb67638a884e5cf87f081
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.12 b/metadata/md5-cache/dev-python/anyqt-0.0.12
index ce1672f9f664..8712eff10af5 100644
--- a/metadata/md5-cache/dev-python/anyqt-0.0.12
+++ b/metadata/md5-cache/dev-python/anyqt-0.0.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.12.tar.gz -> anyqt-0.0.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f8b65b0d10b928370a40a5f39438354
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.13 b/metadata/md5-cache/dev-python/anyqt-0.0.13
index 5de855989869..b266b5d2347f 100644
--- a/metadata/md5-cache/dev-python/anyqt-0.0.13
+++ b/metadata/md5-cache/dev-python/anyqt-0.0.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.13.tar.gz -> anyqt-0.0.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f8b65b0d10b928370a40a5f39438354
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1 b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
index 58b9ea753211..ee3094c5b3a0 100644
--- a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
+++ b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.8.tar.gz -> anyqt-0.0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f4182b8ec5e686d169f83fc3dad8db3
diff --git a/metadata/md5-cache/dev-python/apipkg-1.5-r1 b/metadata/md5-cache/dev-python/apipkg-1.5-r1
deleted file mode 100644
index 771913812e11..000000000000
--- a/metadata/md5-cache/dev-python/apipkg-1.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,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_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Namespace control and lazy-import mechanism
-EAPI=7
-HOMEPAGE=https://pypi.org/project/apipkg/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/apipkg/apipkg-1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6d6c8cdce9b19c0af0acb9a7d6211f5
diff --git a/metadata/md5-cache/dev-python/apipkg-2.0.0 b/metadata/md5-cache/dev-python/apipkg-2.0.0
index b867b1d63422..80eaf333112a 100644
--- a/metadata/md5-cache/dev-python/apipkg-2.0.0
+++ b/metadata/md5-cache/dev-python/apipkg-2.0.0
@@ -4,12 +4,12 @@ DESCRIPTION=Namespace control and lazy-import mechanism
 EAPI=8
 HOMEPAGE=https://pypi.org/project/apipkg/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~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 ) 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/pytest-dev/apipkg/archive/v2.0.0.tar.gz -> apipkg-2.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5042f4d90d589292ad14e102039602e3
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d10c0502ce9193e03a9e3216e3b10725
diff --git a/metadata/md5-cache/dev-python/apipkg-2.0.0_rc1 b/metadata/md5-cache/dev-python/apipkg-2.0.0_rc1
deleted file mode 100644
index 6d383109a6e2..000000000000
--- a/metadata/md5-cache/dev-python/apipkg-2.0.0_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/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=Namespace control and lazy-import mechanism
-EAPI=7
-HOMEPAGE=https://pypi.org/project/apipkg/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pytest-dev/apipkg/archive/v2.0.0rc1.tar.gz -> apipkg-2.0.0rc1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=10cb361f01cd81a338ae4ba2146680f5
diff --git a/metadata/md5-cache/dev-python/apispec-4.4.1 b/metadata/md5-cache/dev-python/apispec-4.4.1
deleted file mode 100644
index 5622285c8ed9..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.4.1.tar.gz -> apispec-4.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1d3c50752db551d941a76aadea9f0fc
diff --git a/metadata/md5-cache/dev-python/apispec-4.4.2 b/metadata/md5-cache/dev-python/apispec-4.4.2
deleted file mode 100644
index 3be9273f75a1..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.4.2.tar.gz -> apispec-4.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1d3c50752db551d941a76aadea9f0fc
diff --git a/metadata/md5-cache/dev-python/apispec-4.5.0 b/metadata/md5-cache/dev-python/apispec-4.5.0
deleted file mode 100644
index c84b3c538d3d..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.5.0.tar.gz -> apispec-4.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4deb80134c68bdac216ff82e4a4a792
diff --git a/metadata/md5-cache/dev-python/apispec-4.6.0 b/metadata/md5-cache/dev-python/apispec-4.6.0
deleted file mode 100644
index f18be486f3b8..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.6.0.tar.gz -> apispec-4.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4deb80134c68bdac216ff82e4a4a792
diff --git a/metadata/md5-cache/dev-python/apispec-4.7.0 b/metadata/md5-cache/dev-python/apispec-4.7.0
deleted file mode 100644
index 874bcf06cfc9..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.7.0.tar.gz -> apispec-4.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=196d5f77ced85a9833a59910601be96c
diff --git a/metadata/md5-cache/dev-python/apispec-4.7.1 b/metadata/md5-cache/dev-python/apispec-4.7.1
deleted file mode 100644
index 5945861576ad..000000000000
--- a/metadata/md5-cache/dev-python/apispec-4.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/4.7.1.tar.gz -> apispec-4.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=05f4bb5c707227cfbddc7d73eed25243
diff --git a/metadata/md5-cache/dev-python/apispec-5.0.0 b/metadata/md5-cache/dev-python/apispec-5.0.0
deleted file mode 100644
index 617793384595..000000000000
--- a/metadata/md5-cache/dev-python/apispec-5.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/5.0.0.tar.gz -> apispec-5.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1d52c981f07c90962ac6fbb90b2c919
diff --git a/metadata/md5-cache/dev-python/apispec-5.1.0 b/metadata/md5-cache/dev-python/apispec-5.1.0
index f626540117ed..d1ff58260f74 100644
--- a/metadata/md5-cache/dev-python/apispec-5.1.0
+++ b/metadata/md5-cache/dev-python/apispec-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marshmallow-code/apispec/archive/5.1.0.tar.gz -> apispec-5.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1d52c981f07c90962ac6fbb90b2c919
diff --git a/metadata/md5-cache/dev-python/apispec-5.1.1 b/metadata/md5-cache/dev-python/apispec-5.1.1
new file mode 100644
index 000000000000..945d228517f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apispec-5.1.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[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/marshmallow-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.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/sphinx-issues[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-issues[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-issues[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 pluggable API specification generator.
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/apispec/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pyyaml-3.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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marshmallow-code/apispec/archive/5.1.1.tar.gz -> apispec-5.1.1.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=afc8e796d7e7d8b983249447a7359858
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.4-r1 b/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
index 4bac0395e150..40251db9f69b 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.4.tar.gz -> appdirs-1.4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af1649daf98f427314c6ae9af2cbb598
diff --git a/metadata/md5-cache/dev-python/apsw-3.35.4_p1 b/metadata/md5-cache/dev-python/apsw-3.35.4_p1
index c7a92d3eb072..4b7c465a57ae 100644
--- a/metadata/md5-cache/dev-python/apsw-3.35.4_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.35.4_p1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.35.4 python_targets_python3_8? ( dev-lang/python:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/rogerbinns/apsw/releases/download/3.35.4-r1/apsw-3.35.4-r1.zip -> apsw-3.35.4_p1.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e12f794f15c5023e6f1fdabec3a67634
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.3 b/metadata/md5-cache/dev-python/argcomplete-1.12.3
index 6ef79f30069b..614ac6c3310a 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.3
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.3
@@ -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/a/argcomplete/argcomplete-1.12.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=617ffb63ad394ff97ac8afceb82af5d3
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r2 b/metadata/md5-cache/dev-python/argh-0.26.2-r2
index bd9978b9f135..f230c486cc55 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r2
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r2
@@ -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/a/argh/argh-0.26.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=017ba7a61329c4d1651815a892757b8a
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-20.1.0 b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
index 8a0beab5fa54..43ad01a2b260 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
+++ b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
@@ -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/a/argon2-cffi/argon2-cffi-20.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29a9bad1c8004aeca94aaaddc2cd849a
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-21.1.0 b/metadata/md5-cache/dev-python/argon2-cffi-21.1.0
index a5fd4e079684..78abed7e2dc1 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-21.1.0
+++ b/metadata/md5-cache/dev-python/argon2-cffi-21.1.0
@@ -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/a/argon2-cffi/argon2-cffi-21.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6055b825828d69069c9e6b4eca328ee
diff --git a/metadata/md5-cache/dev-python/argparse-manpage-1.4 b/metadata/md5-cache/dev-python/argparse-manpage-1.4
index e6216c520f84..5209f04857a6 100644
--- a/metadata/md5-cache/dev-python/argparse-manpage-1.4
+++ b/metadata/md5-cache/dev-python/argparse-manpage-1.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/praiskup/argparse-manpage/archive/v1.4.tar.gz -> argparse-manpage-1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42bb3cd28a29f92a5930a65b5e1fe3cb
diff --git a/metadata/md5-cache/dev-python/argparse-manpage-1.5-r1 b/metadata/md5-cache/dev-python/argparse-manpage-1.5-r1
index eb40a891f53e..26116640e1d9 100644
--- a/metadata/md5-cache/dev-python/argparse-manpage-1.5-r1
+++ b/metadata/md5-cache/dev-python/argparse-manpage-1.5-r1
@@ -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/praiskup/argparse-manpage/archive/v1.5.tar.gz -> argparse-manpage-1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dac33e0245f4bfa74fd89824ec86df41
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.10.2 b/metadata/md5-cache/dev-python/arpeggio-1.10.2
index 2b0cee2ce87d..3dbe47cfb12c 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.10.2
+++ b/metadata/md5-cache/dev-python/arpeggio-1.10.2
@@ -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/textX/Arpeggio/archive/1.10.2.tar.gz -> Arpeggio-1.10.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0deac721995ec1a4a14795733c79c464
diff --git a/metadata/md5-cache/dev-python/arrow-1.1.1 b/metadata/md5-cache/dev-python/arrow-1.1.1
index 4c51b234979a..32ef31646b45 100644
--- a/metadata/md5-cache/dev-python/arrow-1.1.1
+++ b/metadata/md5-cache/dev-python/arrow-1.1.1
@@ -1,15 +1,15 @@
-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(-)?]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=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
+IUSE=test python_targets_pypy3 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 )
+RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b08825e45c6e373834ef832ed0da4f2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a4cd9adf5f039f274c6662f39e7a7c20
diff --git a/metadata/md5-cache/dev-python/asgiref-3.4.1 b/metadata/md5-cache/dev-python/asgiref-3.4.1
index 6bb0d145c2bb..9227e7c1100f 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.4.1
+++ b/metadata/md5-cache/dev-python/asgiref-3.4.1
@@ -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/a/asgiref/asgiref-3.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=418b0247b15fda1609676d8914f1a1fb
diff --git a/metadata/md5-cache/dev-python/asn1crypto-1.4.0 b/metadata/md5-cache/dev-python/asn1crypto-1.4.0
index 6c3b47967321..c083e6eb3fe2 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-1.4.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-1.4.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/wbond/asn1crypto/archive/1.4.0.tar.gz -> asn1crypto-1.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae822eb695b24b1ed4c197d810060a19
diff --git a/metadata/md5-cache/dev-python/asteval-0.9.25 b/metadata/md5-cache/dev-python/asteval-0.9.25
index ffbd79a27394..d6202374470f 100644
--- a/metadata/md5-cache/dev-python/asteval-0.9.25
+++ b/metadata/md5-cache/dev-python/asteval-0.9.25
@@ -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/a/asteval/asteval-0.9.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30bc0b63e6cb0cddbe5e8f91e733c80c
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index c73a2e137b58..137bd02eb101 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.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/a/astor/astor-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75ce90d8959689a707a69973098016ec
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.6 b/metadata/md5-cache/dev-python/astroid-2.6.6
index 83369c0f3454..c34cf70d5dd1 100644
--- a/metadata/md5-cache/dev-python/astroid-2.6.6
+++ b/metadata/md5-cache/dev-python/astroid-2.6.6
@@ -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/PyCQA/astroid/archive/v2.6.6.tar.gz -> astroid-2.6.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dcd9eeb2797b5f42946bfc402acd65f
diff --git a/metadata/md5-cache/dev-python/astroid-2.7.2 b/metadata/md5-cache/dev-python/astroid-2.7.2
deleted file mode 100644
index 31101a84131d..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/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.7.2.tar.gz -> astroid-2.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c487407c6242f7c3b2de88239d05c23
diff --git a/metadata/md5-cache/dev-python/astroid-2.7.3 b/metadata/md5-cache/dev-python/astroid-2.7.3
index c3250a27ea60..02bcc2da4ee5 100644
--- a/metadata/md5-cache/dev-python/astroid-2.7.3
+++ b/metadata/md5-cache/dev-python/astroid-2.7.3
@@ -4,12 +4,12 @@ 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 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k 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.7.3.tar.gz -> astroid-2.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=25b752b2b57090a88338f4bea28cd70d
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c65d30e9f95a9d998ddf8a79bdbcb043
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.0 b/metadata/md5-cache/dev-python/astroid-2.8.0
index a6075ab9603b..1f18eff7fe2b 100644
--- a/metadata/md5-cache/dev-python/astroid-2.8.0
+++ b/metadata/md5-cache/dev-python/astroid-2.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.0.tar.gz -> astroid-2.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11527e706f0e135c0a029015c5ccc0e1
diff --git a/metadata/md5-cache/dev-python/asttokens-2.0.5 b/metadata/md5-cache/dev-python/asttokens-2.0.5
index 14da74095d25..172385133150 100644
--- a/metadata/md5-cache/dev-python/asttokens-2.0.5
+++ b/metadata/md5-cache/dev-python/asttokens-2.0.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://github.com/gristlabs/asttokens/archive/v2.0.5.tar.gz -> asttokens-2.0.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20c77321335cc83865e0eb3f2830cdef
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.3 b/metadata/md5-cache/dev-python/astunparse-1.6.3
index ea890feb3203..7e23915b1e7a 100644
--- a/metadata/md5-cache/dev-python/astunparse-1.6.3
+++ b/metadata/md5-cache/dev-python/astunparse-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=mirror://pypi/a/astunparse/astunparse-1.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d2a342e37854f61cca974d76a998e7f
diff --git a/metadata/md5-cache/dev-python/async-lru-1.0.2_p20201029 b/metadata/md5-cache/dev-python/async-lru-1.0.2_p20201029
index 2f48791e0868..a7b2ac717424 100644
--- a/metadata/md5-cache/dev-python/async-lru-1.0.2_p20201029
+++ b/metadata/md5-cache/dev-python/async-lru-1.0.2_p20201029
@@ -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/aio-libs/async-lru/archive/17a5d207f603c0c142f01a69fbf6f487b3fef5c4.tar.gz -> async-lru-17a5d207f603c0c142f01a69fbf6f487b3fef5c4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c4140713469d527947c01234c92bc83
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10-r1 b/metadata/md5-cache/dev-python/async_generator-1.10-r1
index 70095e70b37f..273ec539411f 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10-r1
+++ b/metadata/md5-cache/dev-python/async_generator-1.10-r1
@@ -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/a/async_generator/async_generator-1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f796e5cf77352682da76773af0bec6d6
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 26b870e5c3e1..f25c2147c634 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -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/a/async_timeout/async-timeout-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71b569e5a5ebfe986ca34b6f2b70c78
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.0 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.0
index 647c350e52c8..24d816883ecf 100644
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.0
+++ b/metadata/md5-cache/dev-python/asyncstdlib-3.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.0.tar.gz -> asyncstdlib-3.10.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecd934fcd3b7bb9c56dfa3d14451c4c7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.1 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.1
index b29c3ad318d0..606b880ba650 100644
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.1
+++ b/metadata/md5-cache/dev-python/asyncstdlib-3.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=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.1.tar.gz -> asyncstdlib-3.10.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecd934fcd3b7bb9c56dfa3d14451c4c7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.9.1 b/metadata/md5-cache/dev-python/asyncstdlib-3.9.1
index 42eddf765bff..f539782d9ce6 100644
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.9.1
+++ b/metadata/md5-cache/dev-python/asyncstdlib-3.9.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/maxfischer2781/asyncstdlib/archive/v3.9.1.tar.gz -> asyncstdlib-3.9.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b1b5430e69ca466d7b0595b7eb22f28
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.9.2 b/metadata/md5-cache/dev-python/asyncstdlib-3.9.2
index 4169ea88106c..b251b050f02e 100644
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.9.2
+++ b/metadata/md5-cache/dev-python/asyncstdlib-3.9.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/maxfischer2781/asyncstdlib/archive/v3.9.2.tar.gz -> asyncstdlib-3.9.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7b27f6e7b4fd9182de45801159c8bf65
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1 b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
index f2ec758f8153..966ddcb3ffb6 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.4.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=mirror://pypi/a/atomicwrites/atomicwrites-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83d82d0e6e391e27e423204a1c2bc299
diff --git a/metadata/md5-cache/dev-python/atpublic-2.3 b/metadata/md5-cache/dev-python/atpublic-2.3
index 6327a003daaf..76b38783ddc5 100644
--- a/metadata/md5-cache/dev-python/atpublic-2.3
+++ b/metadata/md5-cache/dev-python/atpublic-2.3
@@ -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/a/atpublic/atpublic-2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ca82a2d2094bea4f004f8ba4fbd9f8b
diff --git a/metadata/md5-cache/dev-python/attrs-21.2.0 b/metadata/md5-cache/dev-python/attrs-21.2.0
index fcff5e475276..912ade95c287 100644
--- a/metadata/md5-cache/dev-python/attrs-21.2.0
+++ b/metadata/md5-cache/dev-python/attrs-21.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-21.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=173b07b700dc829c4cbeefeda0ddb9ed
diff --git a/metadata/md5-cache/dev-python/audioread-2.1.8-r2 b/metadata/md5-cache/dev-python/audioread-2.1.8-r2
index f6f021d1b9fa..fa035840a14e 100644
--- a/metadata/md5-cache/dev-python/audioread-2.1.8-r2
+++ b/metadata/md5-cache/dev-python/audioread-2.1.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ffmpeg? ( media-video/ffmpeg ) gstreamer? ( dev-python/pygobject:3[pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/audioread/audioread-2.1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6602eda3dc8e7224f35a4ff5cdafb2af
diff --git a/metadata/md5-cache/dev-python/audioread-2.1.9 b/metadata/md5-cache/dev-python/audioread-2.1.9
index 6707f290bb93..b4dd61214080 100644
--- a/metadata/md5-cache/dev-python/audioread-2.1.9
+++ b/metadata/md5-cache/dev-python/audioread-2.1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) test? ( ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/audioread/audioread-2.1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57c412cdf5d15752a4179e205c6ad283
diff --git a/metadata/md5-cache/dev-python/authheaders-0.13.0 b/metadata/md5-cache/dev-python/authheaders-0.13.0
index f1145a62a400..e0f5fb1a5b5b 100644
--- a/metadata/md5-cache/dev-python/authheaders-0.13.0
+++ b/metadata/md5-cache/dev-python/authheaders-0.13.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/a/authheaders/authheaders-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc7bdc72c23d4505565a8852a4be415e
diff --git a/metadata/md5-cache/dev-python/authres-1.2.0 b/metadata/md5-cache/dev-python/authres-1.2.0
index 6d04833f4238..360760972fee 100644
--- a/metadata/md5-cache/dev-python/authres-1.2.0
+++ b/metadata/md5-cache/dev-python/authres-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c147086041231419bfef375a221ef4ef
diff --git a/metadata/md5-cache/dev-python/autobahn-21.3.1 b/metadata/md5-cache/dev-python/autobahn-21.3.1
index 59fafc9df1b5..41c6badc6aad 100644
--- a/metadata/md5-cache/dev-python/autobahn-21.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-21.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-21.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b90b3b76b35ddf6b6f456f568f3f452d
diff --git a/metadata/md5-cache/dev-python/automat-20.2.0 b/metadata/md5-cache/dev-python/automat-20.2.0
index 50f9594b2971..98628c9df4cb 100644
--- a/metadata/md5-cache/dev-python/automat-20.2.0
+++ b/metadata/md5-cache/dev-python/automat-20.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-20.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cb489638d3d9c8a47b3a22e26141afe8
diff --git a/metadata/md5-cache/dev-python/autopage-0.4.0 b/metadata/md5-cache/dev-python/autopage-0.4.0
index c75b890d332d..58a09c386e94 100644
--- a/metadata/md5-cache/dev-python/autopage-0.4.0
+++ b/metadata/md5-cache/dev-python/autopage-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaneb/autopage/archive/v0.4.0.tar.gz -> autopage-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=840f3de45c50cbf79b9b1533495686eb
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.7 b/metadata/md5-cache/dev-python/autopep8-1.5.7
index ac4bd114823a..6ff8630bf21b 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.5.7
+++ b/metadata/md5-cache/dev-python/autopep8-1.5.7
@@ -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/a/autopep8/autopep8-1.5.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d25cf1b019341d619409a8fc0b0a36b9
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index f8bca70d5836..11ac5da7fc9e 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91567ebdcff4e78dc1cb1d72f74159de
diff --git a/metadata/md5-cache/dev-python/autoprop-3.0.0 b/metadata/md5-cache/dev-python/autoprop-3.0.0
index 4cda47f2d49f..3d812d8ffa6b 100644
--- a/metadata/md5-cache/dev-python/autoprop-3.0.0
+++ b/metadata/md5-cache/dev-python/autoprop-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autoprop/autoprop-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b78c2636707bc855ac117363fec02ac8
diff --git a/metadata/md5-cache/dev-python/autoprop-4.0.1 b/metadata/md5-cache/dev-python/autoprop-4.0.1
index cd2d393248f6..0c18a1a5fc5f 100644
--- a/metadata/md5-cache/dev-python/autoprop-4.0.1
+++ b/metadata/md5-cache/dev-python/autoprop-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autoprop/autoprop-4.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a34246f0a7b2379ba66f8e25afff363a
diff --git a/metadata/md5-cache/dev-python/autoprop-4.0.2 b/metadata/md5-cache/dev-python/autoprop-4.0.2
index 64b9eb40f7dc..d1c847c608bb 100644
--- a/metadata/md5-cache/dev-python/autoprop-4.0.2
+++ b/metadata/md5-cache/dev-python/autoprop-4.0.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/a/autoprop/autoprop-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dbe2140dc3c5d04cbe998dfec87da275
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0
index b11672259664..6b83d145006d 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.38.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.38.0.tar.gz -> aws-sam-translator-1.38.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36f41adac9149737b93b2466e1d62580
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.39.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.39.0
new file mode 100644
index 000000000000..fe4930a453d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.39.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/boto3-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model https://pypi.org/project/aws-sam-translator/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/boto3-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.39.0.tar.gz -> aws-sam-translator-1.39.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=41c5544c00bb013b69f180a1f6959d1a
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
index 319f64c4cb12..794c57092d16 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.8.0.tar.gz -> aws-xray-sdk-python-2.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2fbc852ac64e95b15ac7352ae96014d
diff --git a/metadata/md5-cache/dev-python/awxkit-19.0.0-r1 b/metadata/md5-cache/dev-python/awxkit-19.0.0-r1
index 85f08ec11186..63416164589d 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.0.0-r1
+++ b/metadata/md5-cache/dev-python/awxkit-19.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/awxkit/awxkit-19.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=947365ca8f0081393d92b17361fdb672
diff --git a/metadata/md5-cache/dev-python/awxkit-19.1.0 b/metadata/md5-cache/dev-python/awxkit-19.1.0
index d16b8618db4c..74ed389aedc7 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.1.0
+++ b/metadata/md5-cache/dev-python/awxkit-19.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/awxkit/awxkit-19.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60402e7c6a6b0b71bd794f53bf24230e
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.0 b/metadata/md5-cache/dev-python/awxkit-19.2.0
index 1d73a233ee37..6cd09efc1e5e 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.2.0
+++ b/metadata/md5-cache/dev-python/awxkit-19.2.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/a/awxkit/awxkit-19.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90425657b4130b3b3e55611d6e8f725a
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.1 b/metadata/md5-cache/dev-python/awxkit-19.2.1
index 64e7d7af5866..f3860c6f3f1c 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.2.1
+++ b/metadata/md5-cache/dev-python/awxkit-19.2.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/a/awxkit/awxkit-19.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87228f701745a8bf749dac684e86f240
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.2 b/metadata/md5-cache/dev-python/awxkit-19.2.2
index 0cfbd4190fbb..2b27d6fe43a6 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.2.2
+++ b/metadata/md5-cache/dev-python/awxkit-19.2.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/a/awxkit/awxkit-19.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24e397a4fb395f380666faf48a95c04f
diff --git a/metadata/md5-cache/dev-python/awxkit-19.3.0 b/metadata/md5-cache/dev-python/awxkit-19.3.0
index ed7e5100de20..efc282b551ed 100644
--- a/metadata/md5-cache/dev-python/awxkit-19.3.0
+++ b/metadata/md5-cache/dev-python/awxkit-19.3.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/a/awxkit/awxkit-19.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24e397a4fb395f380666faf48a95c04f
diff --git a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1 b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
index 95a4a40b55ad..787199581df4 100644
--- a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+++ b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/babelfish/babelfish-0.5.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b3b7c64e7efada05d022d5c9da39e5a
diff --git a/metadata/md5-cache/dev-python/babelfish-0.6.0-r1 b/metadata/md5-cache/dev-python/babelfish-0.6.0-r1
index cd9303e77aa9..a89ec358439e 100644
--- a/metadata/md5-cache/dev-python/babelfish-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/babelfish-0.6.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=https://github.com/Diaoul/babelfish/archive/0.6.0.tar.gz -> babelfish-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee378e19e74eb2e81a3481412f8cc82a
diff --git a/metadata/md5-cache/dev-python/babelfish-9999 b/metadata/md5-cache/dev-python/babelfish-9999
index 032a9dfcca96..5b59007a7d50 100644
--- a/metadata/md5-cache/dev-python/babelfish-9999
+++ b/metadata/md5-cache/dev-python/babelfish-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17aa38559e487c06e453a728832f9487
diff --git a/metadata/md5-cache/dev-python/backcall-0.2.0 b/metadata/md5-cache/dev-python/backcall-0.2.0
index 67bd57934ba2..131050c8d454 100644
--- a/metadata/md5-cache/dev-python/backcall-0.2.0
+++ b/metadata/md5-cache/dev-python/backcall-0.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Specifications for callback functions passed in to an API
 EAPI=7
 HOMEPAGE=https://pypi.org/project/backcall/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backcall/backcall-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4227b985783e6e21cbff2c58a8baab6f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58724240cba1f6a0bde206c8915fbf53
diff --git a/metadata/md5-cache/dev-python/backoff-1.11.0 b/metadata/md5-cache/dev-python/backoff-1.11.0
index e69c7d64ae92..457ec711317d 100644
--- a/metadata/md5-cache/dev-python/backoff-1.11.0
+++ b/metadata/md5-cache/dev-python/backoff-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/litl/backoff/archive/v1.11.0.tar.gz -> backoff-1.11.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4764bbf84722b2cf5acb2726be28eff0
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 133a7e524d8a..c0fdd7ebed0e 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
@@ -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/jaraco/backports.entry_points_selectable/archive/v1.1.0.tar.gz -> backports.entry_points_selectable-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ceb37ca619aba0dc3e2ff68316926ba
diff --git a/metadata/md5-cache/dev-python/backports-tempfile-1.0-r1 b/metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
index 1bb899aed21e..b25e7dcc37e5 100644
--- a/metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
+++ b/metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.tempfile/backports.tempfile-1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aafe735a6d8859913d05cbc394f1d3ae
diff --git a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1 b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
index b399ce6a9cca..64fee1dd3a01 100644
--- a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
+++ b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.weakref/backports.weakref-1.0.post1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5163fe3a9ba4747661e90092a87833a8
diff --git a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1 b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
index b0e389cc2db2..c4bb3dde955d 100644
--- a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Backport of the standard library zoneinfo module
 EAPI=7
 HOMEPAGE=https://github.com/pganssle/zoneinfo/
 IUSE=test 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_resources[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=https://github.com/pganssle/zoneinfo/archive/0.2.1.tar.gz -> zoneinfo-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f66ac45dcbbce4ddac2f9f3a5e153891
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7c2a1c2479a0a75680a461255dd5535d
diff --git a/metadata/md5-cache/dev-python/backrefs-5.0.1 b/metadata/md5-cache/dev-python/backrefs-5.0.1
index 904b51bd3f0a..cf637bc4a766 100644
--- a/metadata/md5-cache/dev-python/backrefs-5.0.1
+++ b/metadata/md5-cache/dev-python/backrefs-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/backrefs/archive/5.0.1.tar.gz -> backrefs-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ea8e73a1c9e9e1a54d5efb69e366edd
diff --git a/metadata/md5-cache/dev-python/bandit-1.6.2-r1 b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
index f1cef6aa8e93..9e8b2c5813da 100644
--- a/metadata/md5-cache/dev-python/bandit-1.6.2-r1
+++ b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.6.2.tar.gz https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> bandit-1.6.2_py38-1.patch https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> bandit-1.6.2_py38-2.patch
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=069b9f301a607339cfa49c8a70c129f1
diff --git a/metadata/md5-cache/dev-python/bandit-1.7.0 b/metadata/md5-cache/dev-python/bandit-1.7.0
index d707823d8fc9..0601e91b7a80 100644
--- a/metadata/md5-cache/dev-python/bandit-1.7.0
+++ b/metadata/md5-cache/dev-python/bandit-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5a12b67d838a235861b66f0f3adcb01
diff --git a/metadata/md5-cache/dev-python/bareos-19.2.8 b/metadata/md5-cache/dev-python/bareos-19.2.8
index c858f6da1e2f..d959c7799ccd 100644
--- a/metadata/md5-cache/dev-python/bareos-19.2.8
+++ b/metadata/md5-cache/dev-python/bareos-19.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.8.tar.gz -> bareos-19.2.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=606f7d8cd30dfdeea6341c835b7a3691
diff --git a/metadata/md5-cache/dev-python/bareos-20.0.2 b/metadata/md5-cache/dev-python/bareos-20.0.2
index c55de5d7914a..b44fcd14c3f5 100644
--- a/metadata/md5-cache/dev-python/bareos-20.0.2
+++ b/metadata/md5-cache/dev-python/bareos-20.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/20.0.2.tar.gz -> bareos-20.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=47e833bdcafd21c23d6bc0a1e68978e5
diff --git a/metadata/md5-cache/dev-python/bashate-2.0.0 b/metadata/md5-cache/dev-python/bashate-2.0.0
index 3ab1e21997fe..c1cd87df5095 100644
--- a/metadata/md5-cache/dev-python/bashate-2.0.0
+++ b/metadata/md5-cache/dev-python/bashate-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=605cc7c6cf5dd140ace978734bb207f5
diff --git a/metadata/md5-cache/dev-python/bashate-2.1.0 b/metadata/md5-cache/dev-python/bashate-2.1.0
index 6a45e8f5ac6d..63410bc9e9df 100644
--- a/metadata/md5-cache/dev-python/bashate-2.1.0
+++ b/metadata/md5-cache/dev-python/bashate-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/b/bashate/bashate-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82358240827f2a5160dadac21733c787
diff --git a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1 b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
index 3c756b849f72..4a2bf5f6bfef 100644
--- a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
+++ b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/basho-erlastic/basho-erlastic-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ec291a3cd0736771fd724c75afdfd3e
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2 b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
index 011490353c61..1a45fa50a11d 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
@@ -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/b/bcrypt/bcrypt-3.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a840beee70d30dc39fb6be72c51d73a1
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.2.0 b/metadata/md5-cache/dev-python/bcrypt-3.2.0
index 740d05f04d36..2dc75745ca2d 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.2.0
+++ b/metadata/md5-cache/dev-python/bcrypt-3.2.0
@@ -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/b/bcrypt/bcrypt-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aad29493c1a8b74d03ff4496e2c7d897
diff --git a/metadata/md5-cache/dev-python/beagle-0.3.0 b/metadata/md5-cache/dev-python/beagle-0.3.0
index 483c30d78bb3..f7d7ecc977e2 100644
--- a/metadata/md5-cache/dev-python/beagle-0.3.0
+++ b/metadata/md5-cache/dev-python/beagle-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] >=dev-python/cliff-
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beagle/beagle-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c5baf5c30c78a091931f219928128ba
diff --git a/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0 b/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
index c1688675defc..49a92fb8f279 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
+++ b/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
@@ -4,12 +4,12 @@ DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML
 EAPI=8
 HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
 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 ~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=MIT
 RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[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(-)?]
 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/beautifulsoup4/beautifulsoup4-4.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a8383a5da5c5e55bec2f3892bedd692
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c12b0c285bfb97f397c6b5b28f9ee08
diff --git a/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3 b/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3
index f629148cdbc6..820653fffce4 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3
@@ -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/beautifulsoup4/beautifulsoup4-4.9.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9a7403c4b46ff38159058309c787552
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.0 b/metadata/md5-cache/dev-python/beniget-0.4.0
index 5a633bc97376..1af95645567e 100644
--- a/metadata/md5-cache/dev-python/beniget-0.4.0
+++ b/metadata/md5-cache/dev-python/beniget-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.0.tar.gz -> beniget-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b962fb30c7873d549c4e294f8ecffbda
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1 b/metadata/md5-cache/dev-python/beniget-0.4.1
index 2736bd7330ff..d555eaa1e000 100644
--- a/metadata/md5-cache/dev-python/beniget-0.4.1
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b962fb30c7873d549c4e294f8ecffbda
diff --git a/metadata/md5-cache/dev-python/berkeleydb-18.1.4 b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
index 9c57f5eaf33b..6e46f5580901 100644
--- a/metadata/md5-cache/dev-python/berkeleydb-18.1.4
+++ b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
@@ -11,5 +11,5 @@ RDEPEND=|| ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~arthurzam/distfiles/dev-python/berkeleydb/berkeleydb-18.1.4.tar.xz
-_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ec7c17467c6a56827ffbc11818f415e
diff --git a/metadata/md5-cache/dev-python/bert-2.2.0 b/metadata/md5-cache/dev-python/bert-2.2.0
index 69cd8f516800..5a7c44c0aa88 100644
--- a/metadata/md5-cache/dev-python/bert-2.2.0
+++ b/metadata/md5-cache/dev-python/bert-2.2.0
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bert/bert-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f984c8468fb50271b28779ab261f4ae2
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 23beba58ecff..5b061856d10c 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -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/b/betamax/betamax-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=030552f50bb54d3f196d87467ae85e35
diff --git a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0 b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
index 6be311afbf04..c40fc21865c8 100644
--- a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
+++ b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax-matchers/betamax-matchers-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f83c54b44cfbb13b6941839f64b7e62
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.1.0 b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
index 390e5410c357..a92f6fb607d4 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-1.1.0
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.1.0.tar.gz -> bibtexparser-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a6116e1e33e0fea683a94cde80c1832
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2 b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
index d0e43d261b71..3de071314804 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
@@ -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/b/binaryornot/binaryornot-0.4.4.tar.gz -> binaryornot-0.4.4.r1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=590637195bf947be5b372f9d38e2c428
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.2 b/metadata/md5-cache/dev-python/bitarray-2.3.2
index 58a43296c6a7..e0fbba4f22c2 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.3.2
+++ b/metadata/md5-cache/dev-python/bitarray-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a4890e9f2be9b1410e6dca893d227779
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.3 b/metadata/md5-cache/dev-python/bitarray-2.3.3
index 20b43fec27f5..eff87e55e5e5 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.3.3
+++ b/metadata/md5-cache/dev-python/bitarray-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.4 b/metadata/md5-cache/dev-python/bitarray-2.3.4
index 1ea6d7717a96..03747de5d457 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.3.4
+++ b/metadata/md5-cache/dev-python/bitarray-2.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.9 b/metadata/md5-cache/dev-python/bitstring-3.1.9
index 113d4d965f6e..dc849d2c996a 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.9
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.9
@@ -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/scott-griffiths/bitstring/archive/bitstring-3.1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fe7307e7056734c81172317358e22ab
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index 9105a60825a2..cd0b20effa87 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=261589f9b3c1fa008792e5f173129c40
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index 5a044ccb0d4d..559ec1513747 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -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/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c8269e264d15fe16d844d9f7117831d
diff --git a/metadata/md5-cache/dev-python/black-21.8_beta0 b/metadata/md5-cache/dev-python/black-21.8_beta0
index 7e722eab87e1..2d12cf2e9d8e 100644
--- a/metadata/md5-cache/dev-python/black-21.8_beta0
+++ b/metadata/md5-cache/dev-python/black-21.8_beta0
@@ -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/psf/black/archive/21.8b0.tar.gz -> black-21.8b0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d0cdf398ce44b7025922c231b5bdf67
diff --git a/metadata/md5-cache/dev-python/black-21.9_beta0 b/metadata/md5-cache/dev-python/black-21.9_beta0
index fef295d92432..81c07ca1d56c 100644
--- a/metadata/md5-cache/dev-python/black-21.9_beta0
+++ b/metadata/md5-cache/dev-python/black-21.9_beta0
@@ -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/psf/black/archive/21.9b0.tar.gz -> black-21.9b0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f9f4e027e047469a7d8f14bae7b4308e
diff --git a/metadata/md5-cache/dev-python/bleach-4.0.0 b/metadata/md5-cache/dev-python/bleach-4.0.0
index 466f608463bd..1edcc1cf3238 100644
--- a/metadata/md5-cache/dev-python/bleach-4.0.0
+++ b/metadata/md5-cache/dev-python/bleach-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2cf6c4e69258edb7e6770c880d66a293
diff --git a/metadata/md5-cache/dev-python/bleach-4.1.0 b/metadata/md5-cache/dev-python/bleach-4.1.0
index f08b3eb46057..30bff95d0664 100644
--- a/metadata/md5-cache/dev-python/bleach-4.1.0
+++ b/metadata/md5-cache/dev-python/bleach-4.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=mirror://pypi/b/bleach/bleach-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=22846406a3331888c30bbc4bf334e583
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.12 b/metadata/md5-cache/dev-python/blessed-1.17.12
index 7cdcc4e2f664..a18ece725a82 100644
--- a/metadata/md5-cache/dev-python/blessed-1.17.12
+++ b/metadata/md5-cache/dev-python/blessed-1.17.12
@@ -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/blessed/blessed-1.17.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7b63f87e0515d4ddfb64a5cad63d05ad
diff --git a/metadata/md5-cache/dev-python/blessed-1.18.0 b/metadata/md5-cache/dev-python/blessed-1.18.0
index aa1026439627..08f982ddb8c0 100644
--- a/metadata/md5-cache/dev-python/blessed-1.18.0
+++ b/metadata/md5-cache/dev-python/blessed-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessed/blessed-1.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f1ebcef47db49f20725c6f9de4d7d14
diff --git a/metadata/md5-cache/dev-python/blessed-1.18.1 b/metadata/md5-cache/dev-python/blessed-1.18.1
index 091f217d4d24..04a1d3202c87 100644
--- a/metadata/md5-cache/dev-python/blessed-1.18.1
+++ b/metadata/md5-cache/dev-python/blessed-1.18.1
@@ -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/blessed/blessed-1.18.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a4c797f38fc58d323070340b5075792b
diff --git a/metadata/md5-cache/dev-python/blessed-1.19.0 b/metadata/md5-cache/dev-python/blessed-1.19.0
index e8b37c6f083d..982b762a4dc6 100644
--- a/metadata/md5-cache/dev-python/blessed-1.19.0
+++ b/metadata/md5-cache/dev-python/blessed-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessed/blessed-1.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5edd49499b9fc532b804c630d69b446c
diff --git a/metadata/md5-cache/dev-python/blessings-1.7-r1 b/metadata/md5-cache/dev-python/blessings-1.7-r1
index 5943006e2617..0bb5e3cb76e7 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.7-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/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=517297253caa2d22e3ce68eca6933195
diff --git a/metadata/md5-cache/dev-python/blinker-1.4-r2 b/metadata/md5-cache/dev-python/blinker-1.4-r2
index 049e7191ff3b..23a0548f2d64 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4-r2
+++ b/metadata/md5-cache/dev-python/blinker-1.4-r2
@@ -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/blinker/blinker-1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b792fcdab5aa055cf9bced3fa43e1c6d
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index 8bb530ee0346..c2ab3f9ecdba 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd7a3fa8563ac2394ca1f98afa4b1ccc
diff --git a/metadata/md5-cache/dev-python/blosc-1.10.4 b/metadata/md5-cache/dev-python/blosc-1.10.4
index e462e2b325a4..cc04daa8f1e1 100644
--- a/metadata/md5-cache/dev-python/blosc-1.10.4
+++ b/metadata/md5-cache/dev-python/blosc-1.10.4
@@ -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/b/blosc/blosc-1.10.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c8f91d2f686bdb3bcdf403aaa498977
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index a26eddd7886d..2e93fc864fc5 100644
--- a/metadata/md5-cache/dev-python/bluelet-0.2.0
+++ b/metadata/md5-cache/dev-python/bluelet-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0e804aaf57fc51be60b2753208de5dc
diff --git a/metadata/md5-cache/dev-python/blurb-1.0.7 b/metadata/md5-cache/dev-python/blurb-1.0.7
index 4bf5582e1a80..7d91b5df51a6 100644
--- a/metadata/md5-cache/dev-python/blurb-1.0.7
+++ b/metadata/md5-cache/dev-python/blurb-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/blurb-1.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=279bcb66c4ecadb120a8d21718a3b926
diff --git a/metadata/md5-cache/dev-python/blurb-1.0.8 b/metadata/md5-cache/dev-python/blurb-1.0.8
index 08823135ea94..b214072a2102 100644
--- a/metadata/md5-cache/dev-python/blurb-1.0.8
+++ b/metadata/md5-cache/dev-python/blurb-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blurb/blurb-1.0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d93c6cb09dcb9bc59a5b0da81387134e
diff --git a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1 b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
index 147e465beb96..1d46e1dee4e8 100644
--- a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/typemytype/booleanOperations/archive/0.9.0.tar.gz -> booleanOperations-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=898edf1c54c816ac3150b5f7154aa54d
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0-r4 b/metadata/md5-cache/dev-python/boto-2.49.0-r4
index 13289c8fbfa9..2bbfb15e7e37 100644
--- a/metadata/md5-cache/dev-python/boto-2.49.0-r4
+++ b/metadata/md5-cache/dev-python/boto-2.49.0-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=628aa60d8f6351d702d3eb249e7a448b
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.28 b/metadata/md5-cache/dev-python/boto3-1.18.28
index e9468dfaf6d3..e7456f25d702 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.28
+++ b/metadata/md5-cache/dev-python/boto3-1.18.28
@@ -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/boto/boto3/archive/1.18.28.tar.gz -> boto3-1.18.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17ba1142b8447b20ee58814cef5b13dd
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.40 b/metadata/md5-cache/dev-python/boto3-1.18.40
index ff9cb224b938..952f153a5c0e 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.40
+++ b/metadata/md5-cache/dev-python/boto3-1.18.40
@@ -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/boto/boto3/archive/1.18.40.tar.gz -> boto3-1.18.40.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.41 b/metadata/md5-cache/dev-python/boto3-1.18.41
index 70baf5b7196f..500cd78adb89 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.41
+++ b/metadata/md5-cache/dev-python/boto3-1.18.41
@@ -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/boto/boto3/archive/1.18.41.tar.gz -> boto3-1.18.41.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.42 b/metadata/md5-cache/dev-python/boto3-1.18.42
index 47d95fa21981..cfcbc0c9f450 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.42
+++ b/metadata/md5-cache/dev-python/boto3-1.18.42
@@ -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/boto/boto3/archive/1.18.42.tar.gz -> boto3-1.18.42.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.43 b/metadata/md5-cache/dev-python/boto3-1.18.43
index 59d04424e2aa..6fa6edabc24e 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.43
+++ b/metadata/md5-cache/dev-python/boto3-1.18.43
@@ -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/boto/boto3/archive/1.18.43.tar.gz -> boto3-1.18.43.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.44 b/metadata/md5-cache/dev-python/boto3-1.18.44
index 124d2e8f9772..d093d1ccd145 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.44
+++ b/metadata/md5-cache/dev-python/boto3-1.18.44
@@ -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/boto/boto3/archive/1.18.44.tar.gz -> boto3-1.18.44.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.45 b/metadata/md5-cache/dev-python/boto3-1.18.45
index 82325199ebed..a786a10d2fda 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.45
+++ b/metadata/md5-cache/dev-python/boto3-1.18.45
@@ -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/boto/boto3/archive/1.18.45.tar.gz -> boto3-1.18.45.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.46 b/metadata/md5-cache/dev-python/boto3-1.18.46
index f507b2497a46..2fd429dc4c3c 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.46
+++ b/metadata/md5-cache/dev-python/boto3-1.18.46
@@ -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/boto/boto3/archive/1.18.46.tar.gz -> boto3-1.18.46.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.47 b/metadata/md5-cache/dev-python/boto3-1.18.47
index 9157c1bff8b0..e00a7bd63b14 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.47
+++ b/metadata/md5-cache/dev-python/boto3-1.18.47
@@ -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/boto/boto3/archive/1.18.47.tar.gz -> boto3-1.18.47.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.48 b/metadata/md5-cache/dev-python/boto3-1.18.48
index 19f9ee4af95b..4751a2ca3d22 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.48
+++ b/metadata/md5-cache/dev-python/boto3-1.18.48
@@ -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/boto/boto3/archive/1.18.48.tar.gz -> boto3-1.18.48.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.49 b/metadata/md5-cache/dev-python/boto3-1.18.49
new file mode 100644
index 000000000000..c058c2503a1d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.49
@@ -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.49[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/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 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.49[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.49.tar.gz -> boto3-1.18.49.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.50 b/metadata/md5-cache/dev-python/boto3-1.18.50
new file mode 100644
index 000000000000..cc0d06bc87ec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.50
@@ -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.50[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/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 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.50[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.50.tar.gz -> boto3-1.18.50.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.51 b/metadata/md5-cache/dev-python/boto3-1.18.51
new file mode 100644
index 000000000000..c88a2f681394
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.51
@@ -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.51[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/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 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.51[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.51.tar.gz -> boto3-1.18.51.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.52 b/metadata/md5-cache/dev-python/boto3-1.18.52
new file mode 100644
index 000000000000..8d2e23166d2f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.52
@@ -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.52[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/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 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.52[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.52.tar.gz -> boto3-1.18.52.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index 1b49ba080c1a..1714e7d50538 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-9999[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e90203f2010b88fae5a31dfa6d45495a
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.28 b/metadata/md5-cache/dev-python/botocore-1.21.28
index d7deb658bdd1..10c5c4719e45 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.28
+++ b/metadata/md5-cache/dev-python/botocore-1.21.28
@@ -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/b/botocore/botocore-1.21.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f28598add674dfc967045ac2385739e
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.40 b/metadata/md5-cache/dev-python/botocore-1.21.40
index f1f2f34e13a3..039139ce2a2d 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.40
+++ b/metadata/md5-cache/dev-python/botocore-1.21.40
@@ -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/b/botocore/botocore-1.21.40.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.41 b/metadata/md5-cache/dev-python/botocore-1.21.41
index 0996db5f0d7f..b2e822587603 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.41
+++ b/metadata/md5-cache/dev-python/botocore-1.21.41
@@ -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/b/botocore/botocore-1.21.41.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.42 b/metadata/md5-cache/dev-python/botocore-1.21.42
index 59a46be8bf13..d151adb7965b 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.42
+++ b/metadata/md5-cache/dev-python/botocore-1.21.42
@@ -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/b/botocore/botocore-1.21.42.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.43 b/metadata/md5-cache/dev-python/botocore-1.21.43
index ede8df32c240..55a7d357bcec 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.43
+++ b/metadata/md5-cache/dev-python/botocore-1.21.43
@@ -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/b/botocore/botocore-1.21.43.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.44 b/metadata/md5-cache/dev-python/botocore-1.21.44
index c2f6ad02ba0c..b044577292d9 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.44
+++ b/metadata/md5-cache/dev-python/botocore-1.21.44
@@ -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/b/botocore/botocore-1.21.44.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.45 b/metadata/md5-cache/dev-python/botocore-1.21.45
index d98984dfedb9..ca0aa7f5f6c4 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.45
+++ b/metadata/md5-cache/dev-python/botocore-1.21.45
@@ -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/b/botocore/botocore-1.21.45.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.46 b/metadata/md5-cache/dev-python/botocore-1.21.46
index 3394ee7f54e5..23ab7d04d7cf 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.46
+++ b/metadata/md5-cache/dev-python/botocore-1.21.46
@@ -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/b/botocore/botocore-1.21.46.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b1c0a85db0f812cffbe39d9d0cb881
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.47 b/metadata/md5-cache/dev-python/botocore-1.21.47
index 889eff4fc351..8dd2d1aa8fe9 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.47
+++ b/metadata/md5-cache/dev-python/botocore-1.21.47
@@ -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/b/botocore/botocore-1.21.47.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b1c0a85db0f812cffbe39d9d0cb881
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.48 b/metadata/md5-cache/dev-python/botocore-1.21.48
index acf1026f87ab..6d38d40b2f14 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.48
+++ b/metadata/md5-cache/dev-python/botocore-1.21.48
@@ -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/b/botocore/botocore-1.21.48.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b1c0a85db0f812cffbe39d9d0cb881
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.49 b/metadata/md5-cache/dev-python/botocore-1.21.49
new file mode 100644
index 000000000000..351ae126e997
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.49
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/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=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.49.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.50 b/metadata/md5-cache/dev-python/botocore-1.21.50
new file mode 100644
index 000000000000..258cd4cfcccf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.50
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/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=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.50.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.51 b/metadata/md5-cache/dev-python/botocore-1.21.51
new file mode 100644
index 000000000000..7da667aef368
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.51
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/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=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.51.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.52 b/metadata/md5-cache/dev-python/botocore-1.21.52
new file mode 100644
index 000000000000..5a2ffdad75a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.52
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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/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=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.52.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-9999 b/metadata/md5-cache/dev-python/botocore-9999
index ba6de1e8e306..72e8d9b8dd64 100644
--- a/metadata/md5-cache/dev-python/botocore-9999
+++ b/metadata/md5-cache/dev-python/botocore-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( 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(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( 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/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=Low-level, data-driven core of boto 3
 EAPI=8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3b1c0a85db0f812cffbe39d9d0cb881
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.19 b/metadata/md5-cache/dev-python/bottle-0.12.19
index 35948e73f193..4241ad77d192 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 34f7fa5af6e8..06f920a69e74 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.2
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.2
@@ -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/kwgoodman/bottleneck/archive/v1.3.2.tar.gz -> bottleneck-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68c2823d756fc62f1fc1b6c813fc3afc
diff --git a/metadata/md5-cache/dev-python/bpython-0.21 b/metadata/md5-cache/dev-python/bpython-0.21
index 237f602ec303..09a347d39ccf 100644
--- a/metadata/md5-cache/dev-python/bpython-0.21
+++ b/metadata/md5-cache/dev-python/bpython-0.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a4836a162364d1e71b3aa90ce9b20f3
diff --git a/metadata/md5-cache/dev-python/bracex-2.1.1 b/metadata/md5-cache/dev-python/bracex-2.1.1
index c32615d1f589..3e3f410e9865 100644
--- a/metadata/md5-cache/dev-python/bracex-2.1.1
+++ b/metadata/md5-cache/dev-python/bracex-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/bracex/archive/2.1.1.tar.gz -> bracex-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79d12440177e06a4fcf09a08c34966ed
diff --git a/metadata/md5-cache/dev-python/braintree-4.12.0 b/metadata/md5-cache/dev-python/braintree-4.12.0
index 7d000b2f382d..7a0ff4b68585 100644
--- a/metadata/md5-cache/dev-python/braintree-4.12.0
+++ b/metadata/md5-cache/dev-python/braintree-4.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/braintree/braintree-4.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e043b3edfb1dc790dd40f275680b8c1
diff --git a/metadata/md5-cache/dev-python/breathe-4.30.0 b/metadata/md5-cache/dev-python/breathe-4.30.0
index 17ccb2c7bc9d..15e2bf285e8d 100644
--- a/metadata/md5-cache/dev-python/breathe-4.30.0
+++ b/metadata/md5-cache/dev-python/breathe-4.30.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/michaeljones/breathe/archive/v4.30.0.tar.gz -> breathe-4.30.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=922c051d407ca310355534ff368cde8c
diff --git a/metadata/md5-cache/dev-python/breathe-4.31.0 b/metadata/md5-cache/dev-python/breathe-4.31.0
index 5a68fcfee142..0c3d91380d4d 100644
--- a/metadata/md5-cache/dev-python/breathe-4.31.0
+++ b/metadata/md5-cache/dev-python/breathe-4.31.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/michaeljones/breathe/archive/v4.31.0.tar.gz -> breathe-4.31.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7bf5894187c3ab142da7f8f50b8920c
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
index fa8fbc45fd82..7811b0c659e5 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.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/python-hyper/brotlicffi/archive/v1.0.9.2.tar.gz -> brotlicffi-1.0.9.2.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9de132a62d598c04cda3ec377cca2db
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.9 b/metadata/md5-cache/dev-python/bsddb3-6.2.9
index e556a9f33e00..ba6fddbe8b17 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.9
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.9
@@ -11,5 +11,5 @@ RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.9.tar.gz https://dev.gentoo.org/~arthurzam/patches/dev-python/bsddb3-6.2.9-fix-py3.10.patch.gz
-_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac097de1eef8ebe5c781c77df2f0ac40
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.2 b/metadata/md5-cache/dev-python/cached-property-1.5.2
index db11f299aaed..6007b9df2498 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.2
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.2
@@ -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/c/cached-property/cached-property-1.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61e5a97ae0352f78cb92d6b5bef40447
diff --git a/metadata/md5-cache/dev-python/cachelib-0.1.1 b/metadata/md5-cache/dev-python/cachelib-0.1.1
index f21ec79f2c91..f2c0e6bbfe29 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.1.1
+++ b/metadata/md5-cache/dev-python/cachelib-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5d7ace7c30d30302a1773f33df9d69e
diff --git a/metadata/md5-cache/dev-python/cachelib-0.2.0 b/metadata/md5-cache/dev-python/cachelib-0.2.0
index 7356ecf4a6c6..8bffc9b908c6 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.2.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8c7ae9f7030aa8b6acf7cfde623aa80
diff --git a/metadata/md5-cache/dev-python/cachelib-0.3.0 b/metadata/md5-cache/dev-python/cachelib-0.3.0
index 883af9e6220c..23df6268d3c9 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.3.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7711d84f3aab3ee10f33744eabd855b5
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.2 b/metadata/md5-cache/dev-python/cachetools-4.2.2
index 5642a0d0873a..140bb59ed46f 100644
--- a/metadata/md5-cache/dev-python/cachetools-4.2.2
+++ b/metadata/md5-cache/dev-python/cachetools-4.2.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/c/cachetools/cachetools-4.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f51e1bbaf00746fe4e4a460a7468377
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.3 b/metadata/md5-cache/dev-python/cachetools-4.2.3
new file mode 100644
index 000000000000..f47c23ff4362
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-4.2.3
@@ -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=Extensible memoizing collections and decorators
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cachetools/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-4.2.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20a1fef98d17460a785ef97d6a374017
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.4 b/metadata/md5-cache/dev-python/cachetools-4.2.4
new file mode 100644
index 000000000000..c548c580b7d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-4.2.4
@@ -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=Extensible memoizing collections and decorators
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cachetools/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-4.2.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20a1fef98d17460a785ef97d6a374017
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.2.0 b/metadata/md5-cache/dev-python/cairocffi-1.2.0
index e56964820100..ae7593dcd69b 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.2.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.2.0
@@ -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=mirror://pypi/c/cairocffi/cairocffi-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=f5f08e92366cfcbe5b22bb9f3d5986f9
diff --git a/metadata/md5-cache/dev-python/capturer-3.0 b/metadata/md5-cache/dev-python/capturer-3.0
index 44f2811ee7ac..4cbe7913b8ff 100644
--- a/metadata/md5-cache/dev-python/capturer-3.0
+++ b/metadata/md5-cache/dev-python/capturer-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/capturer/capturer-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2737377f5fe551d0bfd78a2cf689de49
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.5 b/metadata/md5-cache/dev-python/carbon-1.1.5
index b22192871c1f..a38820b59713 100644
--- a/metadata/md5-cache/dev-python/carbon-1.1.5
+++ b/metadata/md5-cache/dev-python/carbon-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted[python_targets_python3_8(-)?] dev-python/cachetools[p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=311a4fc5084e029b78c47ed947403a95
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.7 b/metadata/md5-cache/dev-python/carbon-1.1.7
index 351ecfd677ad..97bcf3cd437b 100644
--- a/metadata/md5-cache/dev-python/carbon-1.1.7
+++ b/metadata/md5-cache/dev-python/carbon-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8a10670241af4cca2dfd2b31078ce891
diff --git a/metadata/md5-cache/dev-python/case-1.5.3 b/metadata/md5-cache/dev-python/case-1.5.3
index df7c54487320..dc725677a382 100644
--- a/metadata/md5-cache/dev-python/case-1.5.3
+++ b/metadata/md5-cache/dev-python/case-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.3.7[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6e7cb2043f98a89649bbfa902d4049b
diff --git a/metadata/md5-cache/dev-python/casttube-0.2.0 b/metadata/md5-cache/dev-python/casttube-0.2.0
index 27f1b3100856..9097352de979 100644
--- a/metadata/md5-cache/dev-python/casttube-0.2.0
+++ b/metadata/md5-cache/dev-python/casttube-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/casttube/casttube-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bdc1ac0ab201712fdc5ffad83791e9e
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
index e2272ea8546c..b381a4d4dc49 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-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/ros-infrastructure/catkin_pkg/archive/0.4.23.tar.gz -> catkin_pkg-0.4.23-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6cd2a3cb176c3f83a6032ba5903f247
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index 2ceaa6f94610..cae6cb89bd26 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6cd2a3cb176c3f83a6032ba5903f247
diff --git a/metadata/md5-cache/dev-python/cattrs-1.7.1 b/metadata/md5-cache/dev-python/cattrs-1.7.1
index 26635bdd3070..d4f0ce080b81 100644
--- a/metadata/md5-cache/dev-python/cattrs-1.7.1
+++ b/metadata/md5-cache/dev-python/cattrs-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tinche/cattrs/archive/v1.7.1.tar.gz -> cattrs-1.7.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbce52399670b97520d359f66db2e20a
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0-r1 b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
index 20d0715ad06f..cbb93f44708b 100644
--- a/metadata/md5-cache/dev-python/cbor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/brianolson/cbor_py/archive/b3af679e7cf3e12d50acb83c3c591fc5db9a658d.tar.gz -> cbor-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8fe173847bcfaa5e04465737fa47c03
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.1 b/metadata/md5-cache/dev-python/cbor2-5.4.1
index 42c5a98a266a..fa6ba85bc0c0 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.4.1
+++ b/metadata/md5-cache/dev-python/cbor2-5.4.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/c/cbor2/cbor2-5.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e9cefda4bd3c55e6260b729155e922b
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.2 b/metadata/md5-cache/dev-python/cerberus-1.3.2
index 00caad0a4587..076bb95a230e 100644
--- a/metadata/md5-cache/dev-python/cerberus-1.3.2
+++ b/metadata/md5-cache/dev-python/cerberus-1.3.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/pyeve/cerberus/archive/refs/tags/1.3.2.tar.gz -> cerberus-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75605ba36f3a19942fcd46c5ed29ba7c
diff --git a/metadata/md5-cache/dev-python/certifi-10001-r1 b/metadata/md5-cache/dev-python/certifi-10001-r1
index 85c4f0c3d0b9..d1d0a47d1b7f 100644
--- a/metadata/md5-cache/dev-python/certifi-10001-r1
+++ b/metadata/md5-cache/dev-python/certifi-10001-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/mgorny/certifi-shim/archive/v10001.tar.gz -> certifi-shim-10001.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=729d9abc8befe8f4cf6a0fabd7f0cf5a
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.6 b/metadata/md5-cache/dev-python/cffi-1.14.6
index 7eccc8d9f6c9..73d1d32a6d55 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.6
+++ b/metadata/md5-cache/dev-python/cffi-1.14.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.14.6
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1878ff7713385f7f51ce27b4acb804e5
diff --git a/metadata/md5-cache/dev-python/cfgv-3.3.0 b/metadata/md5-cache/dev-python/cfgv-3.3.0
index e847a788fb80..575b116e2755 100644
--- a/metadata/md5-cache/dev-python/cfgv-3.3.0
+++ b/metadata/md5-cache/dev-python/cfgv-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/cfgv/archive/refs/tags/v3.3.0.tar.gz -> cfgv-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c5f1be64493b883f1665b21ccd948ce
diff --git a/metadata/md5-cache/dev-python/cfgv-3.3.1 b/metadata/md5-cache/dev-python/cfgv-3.3.1
index 8a48e4f486a1..8a2f21bf4e40 100644
--- a/metadata/md5-cache/dev-python/cfgv-3.3.1
+++ b/metadata/md5-cache/dev-python/cfgv-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/cfgv/archive/refs/tags/v3.3.1.tar.gz -> cfgv-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=62e96c3c6d32ca40b75d07e693a73703
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.53.1 b/metadata/md5-cache/dev-python/cfn-lint-0.53.1
index 58d8e1b64cba..3666ec58e8fe 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.53.1
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.53.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.53.1.tar.gz -> cfn-lint-0.53.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=944b7cb11fc474b58f137ed89a83bc43
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.54.1 b/metadata/md5-cache/dev-python/cfn-lint-0.54.1
index e7109a6c90aa..89deb9a48a8c 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.54.1
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.54.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.54.1.tar.gz -> cfn-lint-0.54.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2ea3030e670bc6c85600f4755bfa9ea
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.54.2 b/metadata/md5-cache/dev-python/cfn-lint-0.54.2
index 97d019c6505d..c67ee7a178c6 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.54.2
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.54.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/aws-cloudformation/cfn-lint/archive/v0.54.2.tar.gz -> cfn-lint-0.54.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2ea3030e670bc6c85600f4755bfa9ea
diff --git a/metadata/md5-cache/dev-python/cftime-1.4.1 b/metadata/md5-cache/dev-python/cftime-1.4.1
index 6bb5c008d3cf..4cc4282933a9 100644
--- a/metadata/md5-cache/dev-python/cftime-1.4.1
+++ b/metadata/md5-cache/dev-python/cftime-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cftime/cftime-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68b4725cb4e19c376cf4e43d1f0eba4d
diff --git a/metadata/md5-cache/dev-python/cftime-1.5.0 b/metadata/md5-cache/dev-python/cftime-1.5.0
index d9f05f47286a..0aab12466548 100644
--- a/metadata/md5-cache/dev-python/cftime-1.5.0
+++ b/metadata/md5-cache/dev-python/cftime-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cftime/cftime-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6af57276fd0884fbe77eb0ea7f5b9376
diff --git a/metadata/md5-cache/dev-python/cftime-1.5.1 b/metadata/md5-cache/dev-python/cftime-1.5.1
index 68ec8b5e1791..3a7b5ae55fec 100644
--- a/metadata/md5-cache/dev-python/cftime-1.5.1
+++ b/metadata/md5-cache/dev-python/cftime-1.5.1
@@ -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/c/cftime/cftime-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ecfea4aba4a592174ca9f76643d5157
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.8 b/metadata/md5-cache/dev-python/cgroup-utils-0.8
index f772b328d56f..123e26c6745d 100644
--- a/metadata/md5-cache/dev-python/cgroup-utils-0.8
+++ b/metadata/md5-cache/dev-python/cgroup-utils-0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/peo3/cgroup-utils/archive/v0.8.tar.gz -> cgroup-utils-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef8b21b8730002898fb7ea11bc0a7e43
diff --git a/metadata/md5-cache/dev-python/chai-1.1.2 b/metadata/md5-cache/dev-python/chai-1.1.2
index fce5d73a2c4a..c9c831ce8800 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.2
+++ b/metadata/md5-cache/dev-python/chai-1.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=mirror://pypi/c/chai/chai-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8746a8c5687e7cc1d443fb1faa943fd8
diff --git a/metadata/md5-cache/dev-python/chameleon-3.9.1 b/metadata/md5-cache/dev-python/chameleon-3.9.1
index d31255e45c64..255c736267da 100644
--- a/metadata/md5-cache/dev-python/chameleon-3.9.1
+++ b/metadata/md5-cache/dev-python/chameleon-3.9.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/malthe/chameleon/archive/3.9.1.tar.gz -> chameleon-3.9.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=66dfc13b1ee45cd6e4c80efe2bd61f33
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
index f28b77806972..9a49ad334d43 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
@@ -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/c/characteristic/characteristic-14.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e12eb7036121c88c307c1d123fbf0fbd
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4-r1 b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
index 6df4b351342a..60d1bffdae1c 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4-r1
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4-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/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=417f3183a9c6253fe03479084a62d59f
diff --git a/metadata/md5-cache/dev-python/chardet-4.0.0 b/metadata/md5-cache/dev-python/chardet-4.0.0
index 7c08a3870557..96255a985900 100644
--- a/metadata/md5-cache/dev-python/chardet-4.0.0
+++ b/metadata/md5-cache/dev-python/chardet-4.0.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/chardet/chardet/archive/4.0.0.tar.gz -> chardet-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=377c490bbc9c9091508b806c6acd5af1
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 292aba58a47d..b354d0912e7d 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.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/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=889c8c961a96d9f6bd9683a043aff28a
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
index 905fe9ef4ba3..7517b1840b3e 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
@@ -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/Ousret/charset_normalizer/archive/2.0.4.tar.gz -> charset_normalizer-2.0.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0d87eb4e542423a5213d291b6eedb49
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.5 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.5
index 694605907f85..9090fd92ce3e 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.5
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.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/Ousret/charset_normalizer/archive/2.0.5.tar.gz -> charset_normalizer-2.0.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ca4ca441d22211b2baae409c2772d1c
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.6 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
index 8f267b00040e..9171d40155f1 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
@@ -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/Ousret/charset_normalizer/archive/2.0.6.tar.gz -> charset_normalizer-2.0.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ca4ca441d22211b2baae409c2772d1c
diff --git a/metadata/md5-cache/dev-python/chart-studio-1.1.0 b/metadata/md5-cache/dev-python/chart-studio-1.1.0
index b5a31fc79084..aa99cfe0a98c 100644
--- a/metadata/md5-cache/dev-python/chart-studio-1.1.0
+++ b/metadata/md5-cache/dev-python/chart-studio-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plotly[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chart-studio/chart-studio-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e85df598060fb0e6d8b35407d2fa49c
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.6 b/metadata/md5-cache/dev-python/cheetah3-3.2.6
index 7338bbf945c7..e269c613aa60 100644
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.6
+++ b/metadata/md5-cache/dev-python/cheetah3-3.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb8185da42fec75c095b3d6215bb661d
diff --git a/metadata/md5-cache/dev-python/cheroot-8.5.2 b/metadata/md5-cache/dev-python/cheroot-8.5.2
index ed3bca1b6a5c..2cd1b09eff3f 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.5.2
+++ b/metadata/md5-cache/dev-python/cheroot-8.5.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/C/Cheroot/cheroot-8.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcc5176dd7386d1d2782cbd002a7f2e7
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.6.1 b/metadata/md5-cache/dev-python/cherrypy-18.6.1
index e58e2394c775..aa023bdf7893 100644
--- a/metadata/md5-cache/dev-python/cherrypy-18.6.1
+++ b/metadata/md5-cache/dev-python/cherrypy-18.6.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/C/CherryPy/CherryPy-18.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55c9edbfdcdb23489c697301ccb7b162
diff --git a/metadata/md5-cache/dev-python/chump-1.6.0-r1 b/metadata/md5-cache/dev-python/chump-1.6.0-r1
index 8236824e9c4c..a08d0b841a35 100644
--- a/metadata/md5-cache/dev-python/chump-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/chump-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chump/chump-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a95e09bece1d81cb9aa3d9bdf7c9442d
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1 b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
index d974d1cff0ca..dff8fce82a5b 100644
--- a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/rnc2rng[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/citeproc-py/citeproc-py-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2443e6a8cb0cef1ac91f6b6665b7f08
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1 b/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
index b444b9d895b4..e67297c26a9b 100644
--- a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
+++ b/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63fe8cf66c8c545741696844dcc1ec83
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0 b/metadata/md5-cache/dev-python/clang-python-13.0.0
new file mode 100644
index 000000000000..d433958fce2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-13.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-13.0.0:* !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
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-13.0.0:* !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.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6a328146d67691e7e22fbb8cefe19338
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc2 b/metadata/md5-cache/dev-python/clang-python-13.0.0_rc2
deleted file mode 100644
index 7bac7d75bffc..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-13.0.0_rc2:* !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_rc2:* !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-rc2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc3 b/metadata/md5-cache/dev-python/clang-python-13.0.0_rc3
deleted file mode 100644
index fbd2ef29d677..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-13.0.0_rc3:* !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_rc3:* !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-rc3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc4 b/metadata/md5-cache/dev-python/clang-python-13.0.0_rc4
deleted file mode 100644
index 1fe0837fd6c3..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-13.0.0_rc4:* !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_rc4:* !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-rc4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/cleo-0.8.1 b/metadata/md5-cache/dev-python/cleo-0.8.1
index 3f06c248e55d..7403d92defd5 100644
--- a/metadata/md5-cache/dev-python/cleo-0.8.1
+++ b/metadata/md5-cache/dev-python/cleo-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdispater/cleo/archive/0.8.1.tar.gz -> cleo-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db35434e1d43b294b48672e19eeda26d
diff --git a/metadata/md5-cache/dev-python/cli_helpers-2.1.0 b/metadata/md5-cache/dev-python/cli_helpers-2.1.0
index 03314810dc5e..967270ca8cfb 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-2.1.0
+++ b/metadata/md5-cache/dev-python/cli_helpers-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=https://github.com/dbcli/cli_helpers/archive/v2.1.0.tar.gz -> cli_helpers-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efa6c60347deffadf72926e86cea3aed
diff --git a/metadata/md5-cache/dev-python/cli_helpers-2.2.0 b/metadata/md5-cache/dev-python/cli_helpers-2.2.0
index a2297d023f70..a102665a1e05 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-2.2.0
+++ b/metadata/md5-cache/dev-python/cli_helpers-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/cli_helpers/archive/v2.2.0.tar.gz -> cli_helpers-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0437005c162a78c78b6aeae95ce18023
diff --git a/metadata/md5-cache/dev-python/cli_helpers-9999 b/metadata/md5-cache/dev-python/cli_helpers-9999
index d74cf1eec054..a1f7fb04f187 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-9999
+++ b/metadata/md5-cache/dev-python/cli_helpers-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/configobj-5.0.5[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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d991b069be97b180711ed264da4f0f0
diff --git a/metadata/md5-cache/dev-python/click-7.1.2-r1 b/metadata/md5-cache/dev-python/click-7.1.2-r1
index c389b48979b7..7ad4abd3b046 100644
--- a/metadata/md5-cache/dev-python/click-7.1.2-r1
+++ b/metadata/md5-cache/dev-python/click-7.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.1.2.tar.gz -> click-7.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad7e1010ddd05c9a14642962943216b5
diff --git a/metadata/md5-cache/dev-python/click-8.0.1 b/metadata/md5-cache/dev-python/click-8.0.1
index 9708a872bcdc..34e7866c3c75 100644
--- a/metadata/md5-cache/dev-python/click-8.0.1
+++ b/metadata/md5-cache/dev-python/click-8.0.1
@@ -4,12 +4,12 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
 EAPI=7
 HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/8.0.1.tar.gz -> click-8.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d8fc532a08530e49af6523888dbb144
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=32cf106a381e90a98e163667036be7f0
diff --git a/metadata/md5-cache/dev-python/click-default-group-1.2.2 b/metadata/md5-cache/dev-python/click-default-group-1.2.2
index 2bb74d0c5843..734f7017d83b 100644
--- a/metadata/md5-cache/dev-python/click-default-group-1.2.2
+++ b/metadata/md5-cache/dev-python/click-default-group-1.2.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/click-contrib/click-default-group/archive/v1.2.2.tar.gz -> click-default-group-1.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9a67cdb1be373a7c95c7bad089b7a29
diff --git a/metadata/md5-cache/dev-python/click-help-colors-0.9 b/metadata/md5-cache/dev-python/click-help-colors-0.9
index 67e7ca5efe50..abf84d25e98b 100644
--- a/metadata/md5-cache/dev-python/click-help-colors-0.9
+++ b/metadata/md5-cache/dev-python/click-help-colors-0.9
@@ -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/click-contrib/click-help-colors/archive/refs/tags/0.9.tar.gz -> click-help-colors-0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e122d17517708d95d0762ec81bc1d3e
diff --git a/metadata/md5-cache/dev-python/click-help-colors-0.9.1 b/metadata/md5-cache/dev-python/click-help-colors-0.9.1
index 3ea46ae48a6e..a81a5ae94c13 100644
--- a/metadata/md5-cache/dev-python/click-help-colors-0.9.1
+++ b/metadata/md5-cache/dev-python/click-help-colors-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-help-colors/archive/0.9.1.tar.gz -> click-help-colors-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fa36bb41b97ceec03a6c17429e4000a
diff --git a/metadata/md5-cache/dev-python/click-log-0.3.2 b/metadata/md5-cache/dev-python/click-log-0.3.2
index 34fbdb52d4ed..8ac2f14b4087 100644
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ b/metadata/md5-cache/dev-python/click-log-0.3.2
@@ -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/c/click-log/click-log-0.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=181a88b52ba66005523917000c7d21fe
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index 46de9cf7a5ec..adce052ecfc9 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea89b1deda16c8dae76cf9006328dfca
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.1.1 b/metadata/md5-cache/dev-python/click-plugins-1.1.1
index c8c2a25a20db..d2ee2b129e44 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.1.1
+++ b/metadata/md5-cache/dev-python/click-plugins-1.1.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/c/click-plugins/click-plugins-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8552ee792543d050ad39a69b77287001
diff --git a/metadata/md5-cache/dev-python/click-threading-0.4.4 b/metadata/md5-cache/dev-python/click-threading-0.4.4
index 58c32f6ed6b1..756f57a4af93 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ b/metadata/md5-cache/dev-python/click-threading-0.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-threading/archive/0.4.4.tar.gz -> click-threading-0.4.4-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a72b0f702a892418933220a10b29f33
diff --git a/metadata/md5-cache/dev-python/click-threading-0.5.0 b/metadata/md5-cache/dev-python/click-threading-0.5.0
index a84ec34d7706..ab10de42803c 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.5.0
+++ b/metadata/md5-cache/dev-python/click-threading-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-threading/archive/0.5.0.tar.gz -> click-threading-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7840ed9fffc2a168f229ae138b96064f
diff --git a/metadata/md5-cache/dev-python/cliff-3.8.0 b/metadata/md5-cache/dev-python/cliff-3.8.0
index 7a6b8c96e771..9fb4fbd0c7d0 100644
--- a/metadata/md5-cache/dev-python/cliff-3.8.0
+++ b/metadata/md5-cache/dev-python/cliff-3.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=656520925d32f36ecf0b165a083f89ed
diff --git a/metadata/md5-cache/dev-python/cliff-3.9.0 b/metadata/md5-cache/dev-python/cliff-3.9.0
index 8719220e9721..ba1715505760 100644
--- a/metadata/md5-cache/dev-python/cliff-3.9.0
+++ b/metadata/md5-cache/dev-python/cliff-3.9.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12.0[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(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=8
 HOMEPAGE=https://github.com/openstack/cliff
-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 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12.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/c/cliff/cliff-3.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c78853774462cecfabef3a193764d2cd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=468eea850f3d4956f80f71417b3ebc12
diff --git a/metadata/md5-cache/dev-python/clikit-0.6.2 b/metadata/md5-cache/dev-python/clikit-0.6.2
index dce33cae3aee..08870d1de052 100644
--- a/metadata/md5-cache/dev-python/clikit-0.6.2
+++ b/metadata/md5-cache/dev-python/clikit-0.6.2
@@ -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/sdispater/clikit/archive/0.6.2.tar.gz -> clikit-0.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46809f3a0f8d0b44133ff0ec86781206
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1-r3 b/metadata/md5-cache/dev-python/clint-0.5.1-r3
index 365aab7133b9..8b1068175c3a 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1-r3
+++ b/metadata/md5-cache/dev-python/clint-0.5.1-r3
@@ -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/kennethreitz-archive/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0360a660302f38b3b786666ee4518406
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.6.0 b/metadata/md5-cache/dev-python/cloudpickle-1.6.0
index 8c02cc7d9abd..8d66fb767463 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-1.6.0
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.6.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/c/cloudpickle/cloudpickle-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=32e9a1699365daf82634f72284bd8d14
diff --git a/metadata/md5-cache/dev-python/cloudpickle-2.0.0 b/metadata/md5-cache/dev-python/cloudpickle-2.0.0
index f79d23fc2bbc..b302db722d89 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-2.0.0
+++ b/metadata/md5-cache/dev-python/cloudpickle-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c7e47d7c2e34def21effd6a92be10ba
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.58 b/metadata/md5-cache/dev-python/cloudscraper-1.2.58
index f75f969599fa..935f4bd65e37 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 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3312da6c16ba752e5e62972e1c134ec
diff --git a/metadata/md5-cache/dev-python/cmd2-2.1.2 b/metadata/md5-cache/dev-python/cmd2-2.1.2
index 3be781d9e6ac..a5f105cbede4 100644
--- a/metadata/md5-cache/dev-python/cmd2-2.1.2
+++ b/metadata/md5-cache/dev-python/cmd2-2.1.2
@@ -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=mirror://pypi/c/cmd2/cmd2-2.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=559a3cbec2f322984e0fe02d9281417d
diff --git a/metadata/md5-cache/dev-python/cmd2-2.2.0 b/metadata/md5-cache/dev-python/cmd2-2.2.0
index 5b9ba2c1f2ec..fc3e0a2ea808 100644
--- a/metadata/md5-cache/dev-python/cmd2-2.2.0
+++ b/metadata/md5-cache/dev-python/cmd2-2.2.0
@@ -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=mirror://pypi/c/cmd2/cmd2-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6fb2608ab4efb92b8003b02b73cbb44f
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
index 9fd725fa3314..82bdbdbae851 100644
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
+++ b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4756e7b063c71fd474521a87ba5381d9
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.3-r1 b/metadata/md5-cache/dev-python/colorama-0.4.3-r1
index f3098d86c46e..7e35ab54b758 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/colorama-0.4.3-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/tartley/colorama/archive/0.4.3.tar.gz -> colorama-0.4.3.github.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c8bcea166a47bc1b442cef637d8e7de
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.4 b/metadata/md5-cache/dev-python/colorama-0.4.4
index fba168c1b618..e774b4b13037 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.4
+++ b/metadata/md5-cache/dev-python/colorama-0.4.4
@@ -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/tartley/colorama/archive/0.4.4.tar.gz -> colorama-0.4.4.github.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=656733ab5d427dfdf2c5b822e126e4b7
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
index fd52fa80e879..086ce86d9ed0 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.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/Robpol86/colorclass/archive/v2.2.0.tar.gz -> colorclass-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2228bffd0dc3ba4e512aa0be7a1e6492
diff --git a/metadata/md5-cache/dev-python/coloredlogs-14.0 b/metadata/md5-cache/dev-python/coloredlogs-14.0
index 85f5a32c8ba8..6dee9592d421 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-14.0
+++ b/metadata/md5-cache/dev-python/coloredlogs-14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64e3a50c00c8a2fc64529bb89a458450
diff --git a/metadata/md5-cache/dev-python/coloredlogs-15.0.1 b/metadata/md5-cache/dev-python/coloredlogs-15.0.1
index 7f23675fd6ac..52e87cb16c45 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-15.0.1
+++ b/metadata/md5-cache/dev-python/coloredlogs-15.0.1
@@ -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/c/coloredlogs/coloredlogs-15.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a78d4799f78b593feba607dcbaa9bd9
diff --git a/metadata/md5-cache/dev-python/colorlog-5.0.1 b/metadata/md5-cache/dev-python/colorlog-5.0.1
deleted file mode 100644
index ecde55ed20e6..000000000000
--- a/metadata/md5-cache/dev-python/colorlog-5.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Log formatting with colors
-EAPI=7
-HOMEPAGE=https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/colorlog/colorlog-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e87d2ac9e74a02746e62588a86157ec
diff --git a/metadata/md5-cache/dev-python/colorlog-6.4.1 b/metadata/md5-cache/dev-python/colorlog-6.4.1
index ec46c150aabf..d4b4062742ea 100644
--- a/metadata/md5-cache/dev-python/colorlog-6.4.1
+++ b/metadata/md5-cache/dev-python/colorlog-6.4.1
@@ -4,12 +4,12 @@ DESCRIPTION=Log formatting with colors
 EAPI=8
 HOMEPAGE=https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 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/c/colorlog/colorlog-6.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5dd846596739807733859695d6222618
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=676b3e42f41cd20f2b7dd26bb89c43ff
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.2 b/metadata/md5-cache/dev-python/colorspacious-1.1.2
index f6c2050dd31d..196386c35bc7 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.2
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f421b2acb4e66cfa56cff2f3482aba1
diff --git a/metadata/md5-cache/dev-python/commentjson-0.9.0 b/metadata/md5-cache/dev-python/commentjson-0.9.0
index 7c465a226cc5..bbed63ec335f 100644
--- a/metadata/md5-cache/dev-python/commentjson-0.9.0
+++ b/metadata/md5-cache/dev-python/commentjson-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vaidik/commentjson/archive/v0.9.0.tar.gz -> commentjson-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e50063bc77231650d3bac56eead1e18f
diff --git a/metadata/md5-cache/dev-python/commonmark-0.9.1 b/metadata/md5-cache/dev-python/commonmark-0.9.1
index 0ce6edda1377..b3ebfe5481d3 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.9.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.9.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/c/commonmark/commonmark-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c553d66970e4d4cc2f8b964e1c4fca19
diff --git a/metadata/md5-cache/dev-python/configargparse-1.5.2 b/metadata/md5-cache/dev-python/configargparse-1.5.2
index b9e76c823947..b84a2dbae0f0 100644
--- a/metadata/md5-cache/dev-python/configargparse-1.5.2
+++ b/metadata/md5-cache/dev-python/configargparse-1.5.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/bw2/ConfigArgParse/archive/1.5.2.tar.gz -> ConfigArgParse-1.5.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecaacbe63b5ec2c3b500d4e12ad60219
diff --git a/metadata/md5-cache/dev-python/configclass-0.2.0 b/metadata/md5-cache/dev-python/configclass-0.2.0
index 0a4f1b1076f1..2f0dfe81a93d 100644
--- a/metadata/md5-cache/dev-python/configclass-0.2.0
+++ b/metadata/md5-cache/dev-python/configclass-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schettino72/configclass/archive/0.2.0.tar.gz -> configclass-0.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=029b32f42a76ea38b353990d788df2e7
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 c4175f85f862..376acabe8468 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6-r1
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6-r1
@@ -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/DiffSK/configobj/archive/v5.0.6.tar.gz -> configobj-5.0.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4893c289980ef3ed6d67e5c531ebccba
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.28 b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
index 260a290e2615..ffd4161261ae 100644
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.28
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?] dev-python/six[python
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0a6681833a87eafcfea0f0439276803
diff --git a/metadata/md5-cache/dev-python/confuse-1.0.0 b/metadata/md5-cache/dev-python/confuse-1.0.0
index d6c74e7f7c24..5c43c2937dfe 100644
--- a/metadata/md5-cache/dev-python/confuse-1.0.0
+++ b/metadata/md5-cache/dev-python/confuse-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v1.0.0.tar.gz -> confuse-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=838f61435c6665109b032b7532a1bbab
diff --git a/metadata/md5-cache/dev-python/confuse-1.4.0 b/metadata/md5-cache/dev-python/confuse-1.4.0
index c31e58209877..50cf2afff5f1 100644
--- a/metadata/md5-cache/dev-python/confuse-1.4.0
+++ b/metadata/md5-cache/dev-python/confuse-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v1.4.0.tar.gz -> confuse-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c1357b5e5508d1c318a4620d2233229
diff --git a/metadata/md5-cache/dev-python/confuse-1.5.0 b/metadata/md5-cache/dev-python/confuse-1.5.0
index 3944c048ec58..69e39cdd0b91 100644
--- a/metadata/md5-cache/dev-python/confuse-1.5.0
+++ b/metadata/md5-cache/dev-python/confuse-1.5.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/beetbox/confuse/archive/v1.5.0.tar.gz -> confuse-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f700682f2fe68f1184772c3c9f7ff4be
diff --git a/metadata/md5-cache/dev-python/confuse-1.6.0 b/metadata/md5-cache/dev-python/confuse-1.6.0
new file mode 100644
index 000000000000..7de64cae2b14
--- /dev/null
+++ b/metadata/md5-cache/dev-python/confuse-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Confuse is a configuration library for Python that uses YAML
+EAPI=8
+HOMEPAGE=https://github.com/beetbox/confuse
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pyyaml[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/beetbox/confuse/archive/v1.6.0.tar.gz -> confuse-1.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f700682f2fe68f1184772c3c9f7ff4be
diff --git a/metadata/md5-cache/dev-python/consonance-0.1.3-r1 b/metadata/md5-cache/dev-python/consonance-0.1.3-r1
index 76d4e443c453..40a030711ff8 100644
--- a/metadata/md5-cache/dev-python/consonance-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/consonance-0.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tgalal/consonance/archive/0.1.3.tar.gz -> consonance-0.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0bdb5863abaee9bc1be9154aaf4b125
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 6d88a1196c7d..cee19f458de3 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -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/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc6d7830f928de746a8e6725a8f8c8ac
diff --git a/metadata/md5-cache/dev-python/construct-2.10.67 b/metadata/md5-cache/dev-python/construct-2.10.67
index 2ea68156b68a..d4925d616600 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.67
+++ b/metadata/md5-cache/dev-python/construct-2.10.67
@@ -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/construct/construct/archive/v2.10.67.tar.gz -> construct-2.10.67.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d29654f00e594caba6d5b4448cb0e64f
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
index e6cddf0f3bc5..718f906015fa 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
@@ -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/c/cookies/cookies-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d2ecb5696bff29ad35fd0907bcda509
diff --git a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1 b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
index e68704b9c68f..1abf35fa128d 100644
--- a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
+++ b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
@@ -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/core-api/python-client/archive/2.3.3.tar.gz -> core-api-python-client-2.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3112074a35fa5745d31b81b1df150400
diff --git a/metadata/md5-cache/dev-python/coreschema-0.0.4 b/metadata/md5-cache/dev-python/coreschema-0.0.4
index 2bfc40c881e3..1feefa8dc8c2 100644
--- a/metadata/md5-cache/dev-python/coreschema-0.0.4
+++ b/metadata/md5-cache/dev-python/coreschema-0.0.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/core-api/python-coreschema/archive/0.0.4.tar.gz -> python-coreschema-0.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1200321cd1cabb2af214401d3e0bead1
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0-r2 b/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
index 2730aa2706ed..cb1dfcc42301 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da9919e77aa893a17db9a80e6e401101
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.4 b/metadata/md5-cache/dev-python/coverage-4.5.4
index ac5cb2e1e246..252e43f655d7 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.4
+++ b/metadata/md5-cache/dev-python/coverage-4.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0bfe703a29f2825906a79aca888a3d54
diff --git a/metadata/md5-cache/dev-python/coverage-5.5 b/metadata/md5-cache/dev-python/coverage-5.5
index 781db19fef8d..9a5b45f0aa9f 100644
--- a/metadata/md5-cache/dev-python/coverage-5.5
+++ b/metadata/md5-cache/dev-python/coverage-5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7afed1f37b2736d7e2ddd4856649ab32
diff --git a/metadata/md5-cache/dev-python/cppy-1.1.0 b/metadata/md5-cache/dev-python/cppy-1.1.0
index c6add51422f9..93dca434a287 100644
--- a/metadata/md5-cache/dev-python/cppy-1.1.0
+++ b/metadata/md5-cache/dev-python/cppy-1.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/c/cppy/cppy-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cde75b4e267782a895e39516786c762
diff --git a/metadata/md5-cache/dev-python/crashtest-0.3.1 b/metadata/md5-cache/dev-python/crashtest-0.3.1
index bc9ba61693d7..a4cd77e274b6 100644
--- a/metadata/md5-cache/dev-python/crashtest-0.3.1
+++ b/metadata/md5-cache/dev-python/crashtest-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdispater/crashtest/archive/0.3.1.tar.gz -> crashtest-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f2294cd38f97e2e95d52f3225f77a8b
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r4 b/metadata/md5-cache/dev-python/crcmod-1.7-r4
index b574eedc5b54..7c59bc0aa60d 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r4
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bf30d20187b56c2030e46d7be9aa786
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.15 b/metadata/md5-cache/dev-python/croniter-1.0.15
index a39af0643446..cef26c16cfae 100644
--- a/metadata/md5-cache/dev-python/croniter-1.0.15
+++ b/metadata/md5-cache/dev-python/croniter-1.0.15
@@ -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/c/croniter/croniter-1.0.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8958ceee2bd1c259cadb46966699b9ca
diff --git a/metadata/md5-cache/dev-python/cryptography-3.4.7-r2 b/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
index 88f5b68e92c4..988217b57641 100644
--- a/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
+++ b/metadata/md5-cache/dev-python/cryptography-3.4.7-r2
@@ -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/c/cryptography/cryptography-3.4.7.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.4.7.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=427cdf7a08c5bb601d452eade2ce4eab
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
index c43f21346ee3..1d3eef47bb5a 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=017896f0660fb7f4c9937007d8396eec
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.6 b/metadata/md5-cache/dev-python/css-parser-1.0.6
index a6d83e7869e3..69738204efac 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.6
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.6
@@ -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/c/css-parser/css-parser-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3719b38d512ef38c8a24be7bc6823c22
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1 b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
index 7fccdb238d35..f62cc8146a96 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.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/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34782e4560eaf18cdd6bb0499900d40d
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.4.1 b/metadata/md5-cache/dev-python/cssselect2-0.4.1
index 561474493d52..0745d4062f5f 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.4.1
+++ b/metadata/md5-cache/dev-python/cssselect2-0.4.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/c/cssselect2/cssselect2-0.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=870c78c4cc41f2806bb822a4ea3f7294
diff --git a/metadata/md5-cache/dev-python/cssutils-2.2.0 b/metadata/md5-cache/dev-python/cssutils-2.2.0
index a86adff5b0f1..b10df16d062f 100644
--- a/metadata/md5-cache/dev-python/cssutils-2.2.0
+++ b/metadata/md5-cache/dev-python/cssutils-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7eb0b73001f115f3fb53357062585202
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.6 b/metadata/md5-cache/dev-python/csvkit-1.0.6
index e7139fb4a11a..fc47a9936c91 100644
--- a/metadata/md5-cache/dev-python/csvkit-1.0.6
+++ b/metadata/md5-cache/dev-python/csvkit-1.0.6
@@ -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/c/csvkit/csvkit-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b28f11b04facdaf3539ba450d1e42d5e
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-0.5 b/metadata/md5-cache/dev-python/ctypescrypto-0.5
index 5302200c11fe..7c3ece33de55 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-0.5
+++ b/metadata/md5-cache/dev-python/ctypescrypto-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vbwagner/ctypescrypto/archive/v0.5.tar.gz -> ctypescrypto-0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=886fa7403c255894c7698672a3c8a9bf
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-9999 b/metadata/md5-cache/dev-python/ctypescrypto-9999
index b20e65dd5a36..54fb8939ee78 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-9999
+++ b/metadata/md5-cache/dev-python/ctypescrypto-9999
@@ -10,5 +10,5 @@ RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_8? ( dev-lang/py
 REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=886fa7403c255894c7698672a3c8a9bf
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.5 b/metadata/md5-cache/dev-python/curtsies-0.3.5
index 5d57612dbff6..440a1f8c01f1 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.5
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.5
@@ -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/c/curtsies/curtsies-0.3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ef04af9c332563ce535613b4a447128
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.6 b/metadata/md5-cache/dev-python/curtsies-0.3.6
new file mode 100644
index 000000000000..9c18d7c80fb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyte[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[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=Curses-like terminal wrapper, with colored strings
+EAPI=8
+HOMEPAGE=https://github.com/bpython/curtsies
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.6.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8794d88eb47ce3d55d70dcbbcd0eaf87
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.7 b/metadata/md5-cache/dev-python/curtsies-0.3.7
new file mode 100644
index 000000000000..c6970866886a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyte[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[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=Curses-like terminal wrapper, with colored strings
+EAPI=8
+HOMEPAGE=https://github.com/bpython/curtsies
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8794d88eb47ce3d55d70dcbbcd0eaf87
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1 b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
index 8bc6363c6967..b2e5ee2debe7 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.5.tar.gz -> cvxopt-1.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9264eade96e423972a0a3bc76c05ddf9
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.6 b/metadata/md5-cache/dev-python/cvxopt-1.2.6
index 9d5e49afea2f..26c992e1bcdd 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.6
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.6
@@ -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/cvxopt/cvxopt/archive/1.2.6.tar.gz -> cvxopt-1.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=950d15a52378258f62a9652d3eb411cb
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.7 b/metadata/md5-cache/dev-python/cvxopt-1.2.7
index 078e2fd81877..50f50ebccfd2 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.7
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.7
@@ -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=https://github.com/cvxopt/cvxopt/archive/1.2.7.tar.gz -> cvxopt-1.2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0923e5a4c49b6e49ee1d722b3a8b731b
diff --git a/metadata/md5-cache/dev-python/cwcwidth-0.1.4 b/metadata/md5-cache/dev-python/cwcwidth-0.1.4
index c200bee45731..611d3e8f592f 100644
--- a/metadata/md5-cache/dev-python/cwcwidth-0.1.4
+++ b/metadata/md5-cache/dev-python/cwcwidth-0.1.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/sebastinas/cwcwidth/archive/v0.1.4.tar.gz -> cwcwidth-0.1.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3f75d075a1b51ee9ba296ae1ae5e1aa
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.6-r1 b/metadata/md5-cache/dev-python/cx_Freeze-6.6-r1
index bd2be20daca3..ba7a507da250 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.6-r1
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cx_Freeze/cx_Freeze-6.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed6a1c6477c93325938e5a5e2da5a23c
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0-r1 b/metadata/md5-cache/dev-python/cycler-0.10.0-r1
index 3682db2c77dc..402ae51eec0d 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/cycler-0.10.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=https://github.com/matplotlib/cycler/archive/v0.10.0.tar.gz -> cycler-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=446205c9cbe962adff61d81fdf6f3ab8
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21 b/metadata/md5-cache/dev-python/cython-0.29.21
index 2d757eeb2371..1a83526eb977 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21
+++ b/metadata/md5-cache/dev-python/cython-0.29.21
@@ -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/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8ea807eb63c32dd28b66fb728c3276a
diff --git a/metadata/md5-cache/dev-python/cython-0.29.23 b/metadata/md5-cache/dev-python/cython-0.29.23
index 302af7dad8ca..38d1ae8a427b 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.23
+++ b/metadata/md5-cache/dev-python/cython-0.29.23
@@ -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/cython/cython/archive/0.29.23.tar.gz -> cython-0.29.23.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71f9d3a3c21d3fdceb2048bfa96a805
diff --git a/metadata/md5-cache/dev-python/cython-0.29.24-r1 b/metadata/md5-cache/dev-python/cython-0.29.24-r1
index 2926260757be..a4d93ac521c1 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.24-r1
+++ b/metadata/md5-cache/dev-python/cython-0.29.24-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/cython/cython/archive/0.29.24.tar.gz -> cython-0.29.24.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee2a96894127c4bb7afa1b2750385d20
diff --git a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0 b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
index df965a6578bb..63962909cb32 100644
--- a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
+++ b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/twisted/cython-test-exception-raiser/archive/v1.0.0.tar.gz -> cython-test-exception-raiser-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef52e717aa5ed1ca647ad7eec65f85de
diff --git a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2 b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2
index 5c399330d437..609115a60813 100644
--- a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2
+++ b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/twisted/cython-test-exception-raiser/archive/v1.0.2.tar.gz -> cython-test-exception-raiser-1.0.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6e0cfa2fd1fd870b323db6777d3fa69
diff --git a/metadata/md5-cache/dev-python/daemonize-2.5.0 b/metadata/md5-cache/dev-python/daemonize-2.5.0
index 68875fec7667..8b5b56c60c3a 100644
--- a/metadata/md5-cache/dev-python/daemonize-2.5.0
+++ b/metadata/md5-cache/dev-python/daemonize-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/thesharp/daemonize/archive/v2.5.0.tar.gz -> daemonize-2.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4595ec438e8a7625e95c0834089450f
diff --git a/metadata/md5-cache/dev-python/dask-2021.8.1 b/metadata/md5-cache/dev-python/dask-2021.8.1
index c7a05aaeddc5..2699e2f1f6cd 100644
--- a/metadata/md5-cache/dev-python/dask-2021.8.1
+++ b/metadata/md5-cache/dev-python/dask-2021.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2021.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dfc09766095eb12bc024b52785f2da7e
diff --git a/metadata/md5-cache/dev-python/dask-2021.9.0 b/metadata/md5-cache/dev-python/dask-2021.9.0
index 4164350930da..07092f38e230 100644
--- a/metadata/md5-cache/dev-python/dask-2021.9.0
+++ b/metadata/md5-cache/dev-python/dask-2021.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2021.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e40643a4158af043b6a360f5128177e
diff --git a/metadata/md5-cache/dev-python/dask-2021.9.1 b/metadata/md5-cache/dev-python/dask-2021.9.1
index c8e916faacd1..01540710e2bf 100644
--- a/metadata/md5-cache/dev-python/dask-2021.9.1
+++ b/metadata/md5-cache/dev-python/dask-2021.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2021.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18d38203e83ce754657947191392dc3c
diff --git a/metadata/md5-cache/dev-python/dbfread-2.0.7 b/metadata/md5-cache/dev-python/dbfread-2.0.7
index c1ec0584426a..d955107c955a 100644
--- a/metadata/md5-cache/dev-python/dbfread-2.0.7
+++ b/metadata/md5-cache/dev-python/dbfread-2.0.7
@@ -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/d/dbfread/dbfread-2.0.7.tar.gz test? ( https://github.com/olemb/dbfread/archive/refs/tags/2.0.7.tar.gz -> dbfread-2.0.7-src.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d28acce8f0038650ee02dc9a8583f632
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.16-r1 b/metadata/md5-cache/dev-python/dbus-python-1.2.16-r1
index 402e86e8adc5..4110ad280007 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.16-r1
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.16-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.16.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=102c212bf81b2960b4f3395250c8cf19
+_md5_=dd3ecf491f30fd6ebf054546cd5c4ad6
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.18 b/metadata/md5-cache/dev-python/dbus-python-1.2.18
index db3dae8a5301..b40a22750e04 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.18
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.18
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.18.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0e94006a2308a875e462bca673acc62
+_md5_=ba5e90b1aeddaccdb49e9bbc377c2efa
diff --git a/metadata/md5-cache/dev-python/dbutils-1.3 b/metadata/md5-cache/dev-python/dbutils-1.3
index 97c1cabf12c7..c1ff51678987 100644
--- a/metadata/md5-cache/dev-python/dbutils-1.3
+++ b/metadata/md5-cache/dev-python/dbutils-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3adfec218a34fa1a8b0fea3049b1b54b
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0 b/metadata/md5-cache/dev-python/dbutils-2.0
index efb0afe7e2f9..f496ca3d8823 100644
--- a/metadata/md5-cache/dev-python/dbutils-2.0
+++ b/metadata/md5-cache/dev-python/dbutils-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70c27d800eb55e8d1e8dcff0dc39e55d
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0.1 b/metadata/md5-cache/dev-python/dbutils-2.0.1
index 4fa79796fd25..6571b99fee10 100644
--- a/metadata/md5-cache/dev-python/dbutils-2.0.1
+++ b/metadata/md5-cache/dev-python/dbutils-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9e6e1406170ea55407fb6c7dad126f2
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0.2 b/metadata/md5-cache/dev-python/dbutils-2.0.2
index 88f16f6c6878..93d674aa0286 100644
--- a/metadata/md5-cache/dev-python/dbutils-2.0.2
+++ b/metadata/md5-cache/dev-python/dbutils-2.0.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/d/dbutils/DBUtils-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc8a9052221af48fad51e61e5b696253
diff --git a/metadata/md5-cache/dev-python/ddt-1.4.2 b/metadata/md5-cache/dev-python/ddt-1.4.2
index 7392a6c224c7..8813a7375916 100644
--- a/metadata/md5-cache/dev-python/ddt-1.4.2
+++ b/metadata/md5-cache/dev-python/ddt-1.4.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/datadriventests/ddt/archive/1.4.2.tar.gz -> ddt-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1ce7f183e08d6243fd7603aa286adde
diff --git a/metadata/md5-cache/dev-python/ddt-1.4.3 b/metadata/md5-cache/dev-python/ddt-1.4.3
new file mode 100644
index 000000000000..009886cbfcf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ddt-1.4.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[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 library to multiply test cases
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
+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 ~ppc64 ~riscv ~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 ) 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/datadriventests/ddt/archive/1.4.3.tar.gz -> ddt-1.4.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f000f7517fcf24817b08cb1686c63cc7
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.2.0 b/metadata/md5-cache/dev-python/debtcollector-2.2.0
index 90fb5270879b..3c924aa29aad 100644
--- a/metadata/md5-cache/dev-python/debtcollector-2.2.0
+++ b/metadata/md5-cache/dev-python/debtcollector-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82266fddaecf9ee60538f766ad5b135f
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.3.0 b/metadata/md5-cache/dev-python/debtcollector-2.3.0
new file mode 100644
index 000000000000..0e096080dde8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/debtcollector-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/subunit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.7.0[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=Python deprecation patterns and strategies that collect technical debt
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=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/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.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/d/debtcollector/debtcollector-2.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6700ffcbebec85af0238e30138df6151
diff --git a/metadata/md5-cache/dev-python/debugpy-1.4.1 b/metadata/md5-cache/dev-python/debugpy-1.4.1
index 881cfb663569..bb8a669f4450 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.4.1
+++ b/metadata/md5-cache/dev-python/debugpy-1.4.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/microsoft/debugpy/archive/refs/tags/v1.4.1.tar.gz -> debugpy-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=357420aadd32e530e6ff00fd1867d046
diff --git a/metadata/md5-cache/dev-python/debugpy-1.4.2 b/metadata/md5-cache/dev-python/debugpy-1.4.2
index 9d7f4c38248d..3ca9bc5f2476 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.4.2
+++ b/metadata/md5-cache/dev-python/debugpy-1.4.2
@@ -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/microsoft/debugpy/archive/refs/tags/v1.4.2.tar.gz -> debugpy-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da0201e1656fdb659a0b689b71b1372d
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.2-r1 b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
index eecd5331853a..14955035e207 100644
--- a/metadata/md5-cache/dev-python/decorator-4.4.2-r1
+++ b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5e0658aa0f2edf29cf793229062bdba
diff --git a/metadata/md5-cache/dev-python/decorator-5.0.9 b/metadata/md5-cache/dev-python/decorator-5.0.9
index d57a06859be2..48ec127bc1ac 100644
--- a/metadata/md5-cache/dev-python/decorator-5.0.9
+++ b/metadata/md5-cache/dev-python/decorator-5.0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-5.0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6c8c8ac95d1c280d377cdb37be449dc
diff --git a/metadata/md5-cache/dev-python/decorator-5.1.0 b/metadata/md5-cache/dev-python/decorator-5.1.0
index 3cf97738c8e3..d842f933a5ad 100644
--- a/metadata/md5-cache/dev-python/decorator-5.1.0
+++ b/metadata/md5-cache/dev-python/decorator-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b382d6f88e723c28b9ec6145100f9c0b
diff --git a/metadata/md5-cache/dev-python/deepmerge-0.3.0 b/metadata/md5-cache/dev-python/deepmerge-0.3.0
index 22d924c6e3e7..da7b58a35973 100644
--- a/metadata/md5-cache/dev-python/deepmerge-0.3.0
+++ b/metadata/md5-cache/dev-python/deepmerge-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toumorokoshi/deepmerge/archive/v0.3.0.tar.gz -> deepmerge-0.3.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a72550b4647502ed3ffb78425f4f2c1
diff --git a/metadata/md5-cache/dev-python/defcon-0.9.0 b/metadata/md5-cache/dev-python/defcon-0.9.0
index 420cf16630b0..b0bcc6fbe6b0 100644
--- a/metadata/md5-cache/dev-python/defcon-0.9.0
+++ b/metadata/md5-cache/dev-python/defcon-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/robotools/defcon/archive/0.9.0.tar.gz -> defcon-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e9b2651a7e74e8d8b6486f99fd2b57
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.7.1 b/metadata/md5-cache/dev-python/defusedxml-0.7.1
index f87156c8a4c8..782cbf204283 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.7.1
+++ b/metadata/md5-cache/dev-python/defusedxml-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/tiran/defusedxml/archive/v0.7.1.tar.gz -> defusedxml-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45ae35481ed0670c852fe0eb819cded9
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.7 b/metadata/md5-cache/dev-python/denonavr-0.10.7
index fb062827100a..e9fe430d7e17 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.10.7
+++ b/metadata/md5-cache/dev-python/denonavr-0.10.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.10.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2518f04030054bc0fa2a2caaf30dd42b
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.8 b/metadata/md5-cache/dev-python/denonavr-0.10.8
index 49d800772eba..92862d3a7e25 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.10.8
+++ b/metadata/md5-cache/dev-python/denonavr-0.10.8
@@ -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/d/denonavr/denonavr-0.10.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20cbc085171c614d70a261e2e1bfe7d6
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.9 b/metadata/md5-cache/dev-python/denonavr-0.10.9
index 536c289b6655..624013d66cbe 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.10.9
+++ b/metadata/md5-cache/dev-python/denonavr-0.10.9
@@ -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/d/denonavr/denonavr-0.10.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f613e57dd6ab8c4478ef3ed50b4c2b78
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.12 b/metadata/md5-cache/dev-python/deprecated-1.2.12
index 82921002bcf0..984e65f82238 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.12
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.12
@@ -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/tantale/deprecated/archive/v1.2.12.tar.gz -> deprecated-1.2.12.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=483b734423f731197f96fbe2563b398b
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.13 b/metadata/md5-cache/dev-python/deprecated-1.2.13
index 71dde0e6a5cc..73d3471bd17e 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.13
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.13
@@ -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/tantale/deprecated/archive/v1.2.13.tar.gz -> deprecated-1.2.13.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dc1e209efcd82e71fb3e3027521bc4d
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0 b/metadata/md5-cache/dev-python/deprecation-2.1.0
index f54804ad0560..29be9673b8e4 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0
+++ b/metadata/md5-cache/dev-python/deprecation-2.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=mirror://pypi/d/deprecation/deprecation-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46f6f13ca1f6143c32360c2ed4719af6
diff --git a/metadata/md5-cache/dev-python/dictdiffer-0.9.0 b/metadata/md5-cache/dev-python/dictdiffer-0.9.0
index 553fb6292baa..dce77b57f89a 100644
--- a/metadata/md5-cache/dev-python/dictdiffer-0.9.0
+++ b/metadata/md5-cache/dev-python/dictdiffer-0.9.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/d/dictdiffer/dictdiffer-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a905000306b5cff5abcd57670c1cfdc5
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
deleted file mode 100644
index c97a144c3cca..000000000000
--- a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts a Python dictionary or other data type to a valid XML string
-EAPI=7
-HOMEPAGE=https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-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 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dicttoxml/dicttoxml-1.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbe2d5d398b60de6f5f60685b3e25e81
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2
index a4c3d2ca2315..89cb2c6d29c3 100644
--- a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2
+++ b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Converts a Python dictionary or other data type to a valid XML strin
 EAPI=8
 HOMEPAGE=https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 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/d/dicttoxml/dicttoxml-1.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae85b009586977d66e440d9622cc897c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a16ab306ce9b857e3aee8e2f769c69ed
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20181111 b/metadata/md5-cache/dev-python/diff-match-patch-20181111
index 23bd78d59bab..f4c72fa8a9c7 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20181111
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20181111
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20181111.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40857dfdc0f302b83d0c28f96a08ba0c
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20200713 b/metadata/md5-cache/dev-python/diff-match-patch-20200713
index 6f1bc3d326c8..26d7a352344d 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20200713
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20200713
@@ -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/d/diff-match-patch/diff-match-patch-20200713.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1eb271afc62ef5712bd437a38b497e2b
diff --git a/metadata/md5-cache/dev-python/dill-0.3.4 b/metadata/md5-cache/dev-python/dill-0.3.4
index dc150a9bd629..2bf4969ca128 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.4
+++ b/metadata/md5-cache/dev-python/dill-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.4.tar.gz -> dill-0.3.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c0571618b9926ac59421d77a3fbf91a9
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1 b/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1
index 4931fe4b45f3..692f0e59a709 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.3.12-r1
+++ b/metadata/md5-cache/dev-python/discogs-client-2.3.12-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/p/python3-discogs-client/python3-discogs-client-2.3.12.tar.gz -> discogs-client-2.3.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cda58647a585d4fd3d093bc3a195cd4
diff --git a/metadata/md5-cache/dev-python/discogs-client-9999 b/metadata/md5-cache/dev-python/discogs-client-9999
index b69ab8eb0b33..7fa62717a26b 100644
--- a/metadata/md5-cache/dev-python/discogs-client-9999
+++ b/metadata/md5-cache/dev-python/discogs-client-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cda58647a585d4fd3d093bc3a195cd4
diff --git a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1 b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
index dfdd82698ee8..2d702894f001 100644
--- a/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
+++ b/metadata/md5-cache/dev-python/diskcache-5.2.1-r1
@@ -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/grantjenks/python-diskcache/archive/v5.2.1.tar.gz -> diskcache-5.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7979d4fe8c22f087f5e858086bf177c2
diff --git a/metadata/md5-cache/dev-python/dissononce-0.34.3-r1 b/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
index f3398894886c..9bf77f3daa9b 100644
--- a/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
+++ b/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
@@ -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/tgalal/dissononce/archive/0.34.3.tar.gz -> dissononce-0.34.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=929d11cb7f0e12749553fe6412f46662
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.2 b/metadata/md5-cache/dev-python/distlib-0.3.2
index d26c26fe0675..43f011e31e9a 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.2
+++ b/metadata/md5-cache/dev-python/distlib-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.2.tar.bz2 -> distlib-0.3.2.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=116e94697748a8a41df25a3887d1e9e8
diff --git a/metadata/md5-cache/dev-python/distro-1.6.0 b/metadata/md5-cache/dev-python/distro-1.6.0
index 742933a39e92..98588826331a 100644
--- a/metadata/md5-cache/dev-python/distro-1.6.0
+++ b/metadata/md5-cache/dev-python/distro-1.6.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/d/distro/distro-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16cd64083c105ac061a0a64275dbe18e
diff --git a/metadata/md5-cache/dev-python/dj-database-url-0.5.0 b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
index 954f3e57dfae..e0870d8cab64 100644
--- a/metadata/md5-cache/dev-python/dj-database-url-0.5.0
+++ b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
@@ -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/jacobian/dj-database-url/archive/v0.5.0.tar.gz -> dj-database-url-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6a15902665fb3c6fc7057c428a0ca24
diff --git a/metadata/md5-cache/dev-python/dj-email-url-1.0.2 b/metadata/md5-cache/dev-python/dj-email-url-1.0.2
index 970eb51dd730..1eb32cea9da0 100644
--- a/metadata/md5-cache/dev-python/dj-email-url-1.0.2
+++ b/metadata/md5-cache/dev-python/dj-email-url-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v1.0.2.tar.gz -> dj-email-url-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79fb9eb8f2267b80ed61ef60e1d18d1b
diff --git a/metadata/md5-cache/dev-python/dj-search-url-0.1 b/metadata/md5-cache/dev-python/dj-search-url-0.1
index b2f259bd259b..bf04a6ecfb40 100644
--- a/metadata/md5-cache/dev-python/dj-search-url-0.1
+++ b/metadata/md5-cache/dev-python/dj-search-url-0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dj-search-url/dj-search-url-0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f4305fb1ab445a58f06a129a67d1644
diff --git a/metadata/md5-cache/dev-python/django-2.2.24 b/metadata/md5-cache/dev-python/django-2.2.24
index da2e73b4020b..7dfbc88be5a2 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 43c3f9d45a04..958e99fd2264 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=ef6e6af8165fbaeeef1ba5c1b940881c
diff --git a/metadata/md5-cache/dev-python/django-3.2.6 b/metadata/md5-cache/dev-python/django-3.2.6
index 606dc0859ab0..1739867d7c21 100644
--- a/metadata/md5-cache/dev-python/django-3.2.6
+++ b/metadata/md5-cache/dev-python/django-3.2.6
@@ -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.6.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.6.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=8375ebb373076a05790c4c61a4bd14ed
diff --git a/metadata/md5-cache/dev-python/django-allauth-0.42.0 b/metadata/md5-cache/dev-python/django-allauth-0.42.0
index 3e2f00bf14ed..5bae7225b0d2 100644
--- a/metadata/md5-cache/dev-python/django-allauth-0.42.0
+++ b/metadata/md5-cache/dev-python/django-allauth-0.42.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_8(-)?] dev-python/python3-openi
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-allauth/django-allauth-0.42.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4edfee9a5bd6f1aab9508bdf85dc0c52
diff --git a/metadata/md5-cache/dev-python/django-allauth-0.45.0 b/metadata/md5-cache/dev-python/django-allauth-0.45.0
index 47391ce1c8a4..b67e585a0a66 100644
--- a/metadata/md5-cache/dev-python/django-allauth-0.45.0
+++ b/metadata/md5-cache/dev-python/django-allauth-0.45.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-allauth/django-allauth-0.45.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc8a3799b6d9656693239387b977a117
diff --git a/metadata/md5-cache/dev-python/django-appconf-1.0.4 b/metadata/md5-cache/dev-python/django-appconf-1.0.4
index 25d27abcc48d..62a3cf4c4834 100644
--- a/metadata/md5-cache/dev-python/django-appconf-1.0.4
+++ b/metadata/md5-cache/dev-python/django-appconf-1.0.4
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-appconf/django-appconf-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4860d8693c1036a65cb69424c12b5ce0
diff --git a/metadata/md5-cache/dev-python/django-appconf-1.0.5 b/metadata/md5-cache/dev-python/django-appconf-1.0.5
new file mode 100644
index 000000000000..0cc4dd4c41c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-appconf-1.0.5
@@ -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 helper class for handling configuration defaults of packaged apps gracefully.
+EAPI=7
+HOMEPAGE=https://django-appconf.readthedocs.io/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-appconf/django-appconf-1.0.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=22c38fd749db2121f4825c989dbe2ba5
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0 b/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0
index 98c960e5b138..be932faf465b 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a239a43fe39ab29636c3d249716164d2
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0 b/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0
index c751e3bd02a2..9affb856689d 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cce71667dbc29833d32a6fb495e9c86c
diff --git a/metadata/md5-cache/dev-python/django-cache-url-3.2.3 b/metadata/md5-cache/dev-python/django-cache-url-3.2.3
index 684f48afb57a..03c974d769f4 100644
--- a/metadata/md5-cache/dev-python/django-cache-url-3.2.3
+++ b/metadata/md5-cache/dev-python/django-cache-url-3.2.3
@@ -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/epicserve/django-cache-url/archive/3480e70bb19eef22f4e1beeddd236f44414ac5ac.tar.gz -> django-cache-url-3.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf279daf1df9487a023a448289d2c8a2
diff --git a/metadata/md5-cache/dev-python/django-cacheops-5.1 b/metadata/md5-cache/dev-python/django-cacheops-5.1
index 95c334bd579d..83178de8c8fd 100644
--- a/metadata/md5-cache/dev-python/django-cacheops-5.1
+++ b/metadata/md5-cache/dev-python/django-cacheops-5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cacheops/django-cacheops-5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c90a8ffcd049f696e0a6867636dfbaeb
diff --git a/metadata/md5-cache/dev-python/django-compressor-2.4 b/metadata/md5-cache/dev-python/django-compressor-2.4
index bd3d0c34af00..3cb05d58e25d 100644
--- a/metadata/md5-cache/dev-python/django-compressor-2.4
+++ b/metadata/md5-cache/dev-python/django-compressor-2.4
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_compressor/django_compressor-2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aec20da8cf80a3d317747eea9ee4d3c6
diff --git a/metadata/md5-cache/dev-python/django-compressor-2.4.1 b/metadata/md5-cache/dev-python/django-compressor-2.4.1
index 9e16a29c4d8a..cd432122e417 100644
--- a/metadata/md5-cache/dev-python/django-compressor-2.4.1
+++ b/metadata/md5-cache/dev-python/django-compressor-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django_compressor/django_compressor-2.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db9262a59419d5688c5d590397aa9a8a
diff --git a/metadata/md5-cache/dev-python/django-configurations-2.2 b/metadata/md5-cache/dev-python/django-configurations-2.2
index 287f70278f5e..43acd0607638 100644
--- a/metadata/md5-cache/dev-python/django-configurations-2.2
+++ b/metadata/md5-cache/dev-python/django-configurations-2.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/jazzband/django-configurations/archive/2.2.tar.gz -> django-configurations-2.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57eac7a456f473386f2620ab573a2baa
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.7.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.7.0
index af0c15fbe407..2427f8472403 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.7.0
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-3.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b799b24f2590a812deb1a884c37a65a5
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.8.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.8.0
index 41b58056d643..552c7bbd0176 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.8.0
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.8.0.tar.gz -> django-cors-headers-3.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a7a51627235eb8da1924147006cb3acc
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.9.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.9.0
new file mode 100644
index 000000000000..38974e836111
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.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=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
+EAPI=8
+HOMEPAGE=https://github.com/adamchainz/django-cors-headers
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-2.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/adamchainz/django-cors-headers/archive/3.9.0.tar.gz -> django-cors-headers-3.9.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a7a51627235eb8da1924147006cb3acc
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
index ac4932e88f56..1ea5548d106e 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.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/jazzband/django-debug-toolbar/archive/3.2.1.tar.gz -> django-debug-toolbar-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13820a860a6706f0baa73cb3398a275f
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.2 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.2
index cd9a8f5528f1..656805d88572 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.2
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.2
@@ -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/jazzband/django-debug-toolbar/archive/3.2.2.tar.gz -> django-debug-toolbar-3.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=22121098c0b31545c60dec275f115409
diff --git a/metadata/md5-cache/dev-python/django-extensions-3.0.9 b/metadata/md5-cache/dev-python/django-extensions-3.0.9
index 5407ce5b1aa7..b0a6a81fa590 100644
--- a/metadata/md5-cache/dev-python/django-extensions-3.0.9
+++ b/metadata/md5-cache/dev-python/django-extensions-3.0.9
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[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/django-extensions/django-extensions-3.0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71336aafa604ca4d5e058fcadbcaff3
diff --git a/metadata/md5-cache/dev-python/django-filter-2.4.0 b/metadata/md5-cache/dev-python/django-filter-2.4.0
index c80ef617eca7..4acc35d2df76 100644
--- a/metadata/md5-cache/dev-python/django-filter-2.4.0
+++ b/metadata/md5-cache/dev-python/django-filter-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filter/django-filter-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61386a28e390c52789861aed59e34e15
diff --git a/metadata/md5-cache/dev-python/django-filter-21.1-r2 b/metadata/md5-cache/dev-python/django-filter-21.1-r2
index 0ef8c6dc7af9..168d496e324e 100644
--- a/metadata/md5-cache/dev-python/django-filter-21.1-r2
+++ b/metadata/md5-cache/dev-python/django-filter-21.1-r2
@@ -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/d/django-filter/django-filter-21.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4aad17f1249566c0bb24eff9612b3544
diff --git a/metadata/md5-cache/dev-python/django-gravatar2-1.4.4 b/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
index e320021ddb72..619a464fb2f8 100644
--- a/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
+++ b/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[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/django-gravatar2/django-gravatar2-1.4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8df022718d795b1c105af8043f3730a5
diff --git a/metadata/md5-cache/dev-python/django-haystack-3.0 b/metadata/md5-cache/dev-python/django-haystack-3.0
index a0d6033f6620..c92642bbfd09 100644
--- a/metadata/md5-cache/dev-python/django-haystack-3.0
+++ b/metadata/md5-cache/dev-python/django-haystack-3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-haystack/django-haystack-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2cc90f8bc30f1db8638b180716be8d61
diff --git a/metadata/md5-cache/dev-python/django-js-asset-1.2.2 b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
index 201d2b22039e..0f7c4a695bec 100644
--- a/metadata/md5-cache/dev-python/django-js-asset-1.2.2
+++ b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-js-asset/django-js-asset-1.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44ea40d936a1744a3bca5376aae75903
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.11.0 b/metadata/md5-cache/dev-python/django-mptt-0.11.0
deleted file mode 100644
index 53643367f66c..000000000000
--- a/metadata/md5-cache/dev-python/django-mptt-0.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/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=utilities for modified preorder tree traversal and trees of model instances
-EAPI=7
-HOMEPAGE=https://github.com/django-mptt/django-mptt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/d/django-mptt/django-mptt-0.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fae1972f971c718396c5c1240f849236
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13 b/metadata/md5-cache/dev-python/django-mptt-0.13
deleted file mode 100644
index f1d1ce79690d..000000000000
--- a/metadata/md5-cache/dev-python/django-mptt-0.13
+++ /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=utilities for modified preorder tree traversal and trees of model instances
-EAPI=8
-HOMEPAGE=https://github.com/django-mptt/django-mptt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/django-mptt/django-mptt/archive/0.13.tar.gz -> django-mptt-0.13.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3cbc0ed66854c56b555be8706d9193d6
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.1 b/metadata/md5-cache/dev-python/django-mptt-0.13.1
deleted file mode 100644
index 9ac50860fcfc..000000000000
--- a/metadata/md5-cache/dev-python/django-mptt-0.13.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=utilities for modified preorder tree traversal and trees of model instances
-EAPI=8
-HOMEPAGE=https://github.com/django-mptt/django-mptt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/django-mptt/django-mptt/archive/0.13.1.tar.gz -> django-mptt-0.13.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.2 b/metadata/md5-cache/dev-python/django-mptt-0.13.2
deleted file mode 100644
index fa7280f1b74e..000000000000
--- a/metadata/md5-cache/dev-python/django-mptt-0.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=utilities for modified preorder tree traversal and trees of model instances
-EAPI=8
-HOMEPAGE=https://github.com/django-mptt/django-mptt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/django-mptt/django-mptt/archive/0.13.2.tar.gz -> django-mptt-0.13.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.3 b/metadata/md5-cache/dev-python/django-mptt-0.13.3
index 4fdd427abcd9..8a90dae858b7 100644
--- a/metadata/md5-cache/dev-python/django-mptt-0.13.3
+++ b/metadata/md5-cache/dev-python/django-mptt-0.13.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/django-mptt/django-mptt/archive/0.13.3.tar.gz -> django-mptt-0.13.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.4 b/metadata/md5-cache/dev-python/django-mptt-0.13.4
new file mode 100644
index 000000000000..58ca3360e49c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-mptt-0.13.4
@@ -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=utilities for modified preorder tree traversal and trees of model instances
+EAPI=8
+HOMEPAGE=https://github.com/django-mptt/django-mptt
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/django-mptt/django-mptt/archive/0.13.4.tar.gz -> django-mptt-0.13.4.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.6 b/metadata/md5-cache/dev-python/django-otp-1.0.6
index 81cf2b33ef3a..57e86148a962 100644
--- a/metadata/md5-cache/dev-python/django-otp-1.0.6
+++ b/metadata/md5-cache/dev-python/django-otp-1.0.6
@@ -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/django-otp/django-otp/archive/v1.0.6.tar.gz -> django-otp-1.0.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=609ea9d1d9f4160c23ff24f1ed5ab662
diff --git a/metadata/md5-cache/dev-python/django-otp-1.1.0 b/metadata/md5-cache/dev-python/django-otp-1.1.0
index 74d7b8e6a267..6ba30aa8a0ac 100644
--- a/metadata/md5-cache/dev-python/django-otp-1.1.0
+++ b/metadata/md5-cache/dev-python/django-otp-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-otp/django-otp/archive/v1.1.0.tar.gz -> django-otp-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce79a02b07b1571ab7864d3e05554d93
diff --git a/metadata/md5-cache/dev-python/django-otp-1.1.1 b/metadata/md5-cache/dev-python/django-otp-1.1.1
index febb281e0ea3..3be3aee6ce3a 100644
--- a/metadata/md5-cache/dev-python/django-otp-1.1.1
+++ b/metadata/md5-cache/dev-python/django-otp-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-otp/django-otp/archive/v1.1.1.tar.gz -> django-otp-1.1.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce79a02b07b1571ab7864d3e05554d93
diff --git a/metadata/md5-cache/dev-python/django-pglocks-1.0.4 b/metadata/md5-cache/dev-python/django-pglocks-1.0.4
index 26a06acce27d..73e24f947bd6 100644
--- a/metadata/md5-cache/dev-python/django-pglocks-1.0.4
+++ b/metadata/md5-cache/dev-python/django-pglocks-1.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.0.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-pglocks/django-pglocks-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6690974ef10301b76ac86fc1d43d77f
diff --git a/metadata/md5-cache/dev-python/django-picklefield-3.0.1 b/metadata/md5-cache/dev-python/django-picklefield-3.0.1
index 33070a54acd8..ca70a12aa4ae 100644
--- a/metadata/md5-cache/dev-python/django-picklefield-3.0.1
+++ b/metadata/md5-cache/dev-python/django-picklefield-3.0.1
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-picklefield/django-picklefield-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc45c6bfdc2a349a6a589c95ee3cb549
diff --git a/metadata/md5-cache/dev-python/django-picklefield-3.0.1-r1 b/metadata/md5-cache/dev-python/django-picklefield-3.0.1-r1
index f326f4161a91..fbdaad257b19 100644
--- a/metadata/md5-cache/dev-python/django-picklefield-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/django-picklefield-3.0.1-r1
@@ -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/gintas/django-picklefield/archive/v3.0.1.tar.gz -> django-picklefield-3.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c1e5befaf232b04aeeef7294bbda6cd
diff --git a/metadata/md5-cache/dev-python/django-prometheus-2.1.0 b/metadata/md5-cache/dev-python/django-prometheus-2.1.0
index 4ccacfa86cf4..c5170c852f0a 100644
--- a/metadata/md5-cache/dev-python/django-prometheus-2.1.0
+++ b/metadata/md5-cache/dev-python/django-prometheus-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prometheus_client-0.7[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-prometheus/django-prometheus-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8746e4c76e6c0ec34a7e6472e56acb5
diff --git a/metadata/md5-cache/dev-python/django-q-1.3.3 b/metadata/md5-cache/dev-python/django-q-1.3.3
index 78b6f72e44cb..c9e8019a5b52 100644
--- a/metadata/md5-cache/dev-python/django-q-1.3.3
+++ b/metadata/md5-cache/dev-python/django-q-1.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[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/django-q/django-q-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8742abcbc68f9cc9cea0337ba3bcbb2
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
index e4b256f85332..cf8e7716d5e5 100644
--- a/metadata/md5-cache/dev-python/django-redis-4.10.0
+++ b/metadata/md5-cache/dev-python/django-redis-4.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?] >=dev-python/redi
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d5938d5302bc9ae32e203a548676fce
diff --git a/metadata/md5-cache/dev-python/django-redis-5.0.0 b/metadata/md5-cache/dev-python/django-redis-5.0.0
index bdcc0287e4c4..5c048e75b3ff 100644
--- a/metadata/md5-cache/dev-python/django-redis-5.0.0
+++ b/metadata/md5-cache/dev-python/django-redis-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41b5861c07fe8963334405b73c295357
diff --git a/metadata/md5-cache/dev-python/django-rq-2.3.2 b/metadata/md5-cache/dev-python/django-rq-2.3.2
index 08cc77c95afd..75537fea8b83 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.3.2
+++ b/metadata/md5-cache/dev-python/django-rq-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-2.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f380be4ec2148895f68e199106ab24a
diff --git a/metadata/md5-cache/dev-python/django-rq-2.4.0 b/metadata/md5-cache/dev-python/django-rq-2.4.0
index 189f79c65d55..3cabca3497e2 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.4.0
+++ b/metadata/md5-cache/dev-python/django-rq-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-2.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6d73e84467dbe587e47558a58c151af
diff --git a/metadata/md5-cache/dev-python/django-rq-2.4.1 b/metadata/md5-cache/dev-python/django-rq-2.4.1
index 6f5401622ef7..130caf0057fd 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.4.1
+++ b/metadata/md5-cache/dev-python/django-rq-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-2.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=22bfe2d0201ce2b948a6ab0d445c2232
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2 b/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
index b0e3c7ea0a90..3f418e69855d 100644
--- a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-3.0.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/jazzband/django-sortedm2m/archive/3.0.2.tar.gz -> django-sortedm2m-3.0.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=863fddbaef91787f3ebaf7fadb196854
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1 b/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
new file mode 100644
index 000000000000..d866e6e18e19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
@@ -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/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Drop-in replacement for django's many to many field with sorted relations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/django-sortedm2m/ https://github.com/jazzband/django-sortedm2m
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jazzband/django-sortedm2m/archive/3.1.1.tar.gz -> django-sortedm2m-3.1.1.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c0b184f3a12ce4c0237fdb582c8f626
diff --git a/metadata/md5-cache/dev-python/django-tables2-2.3.4 b/metadata/md5-cache/dev-python/django-tables2-2.3.4
index 8e01fc5dfd0b..0630f3c6cfca 100644
--- a/metadata/md5-cache/dev-python/django-tables2-2.3.4
+++ b/metadata/md5-cache/dev-python/django-tables2-2.3.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11 python_targets_python3_8? ( dev-lang/python:3.8
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tables2/django-tables2-2.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0005ec5dc3dfa79062b0eba86d0c469
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.5.0 b/metadata/md5-cache/dev-python/django-tagging-0.5.0
index ba9a03fe5363..c5de40f0cd14 100644
--- a/metadata/md5-cache/dev-python/django-tagging-0.5.0
+++ b/metadata/md5-cache/dev-python/django-tagging-0.5.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/d/django-tagging/django-tagging-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0be8e6eb70d2db2dc6a44ed154873709
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.3.0 b/metadata/md5-cache/dev-python/django-taggit-1.3.0
index e7240b79b855..b689541bce52 100644
--- a/metadata/md5-cache/dev-python/django-taggit-1.3.0
+++ b/metadata/md5-cache/dev-python/django-taggit-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f17582655b2bb28accc186fd01176657
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.5.1 b/metadata/md5-cache/dev-python/django-taggit-1.5.1
index b0f69b9fa7ab..10e6833a2ed5 100644
--- a/metadata/md5-cache/dev-python/django-taggit-1.5.1
+++ b/metadata/md5-cache/dev-python/django-taggit-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6eb072e15e7a45535acbf8625e28f47
diff --git a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7 b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
index 8aa41eea8d93..2bc5b544ed4f 100644
--- a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
+++ b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit-serializer/django-taggit-serializer-0.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49454761fbdbd88da8d9d0b96fea39ab
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.1 b/metadata/md5-cache/dev-python/django-timezone-field-4.1
index 1a028ce5edf8..9286f5e5ddde 100644
--- a/metadata/md5-cache/dev-python/django-timezone-field-4.1
+++ b/metadata/md5-cache/dev-python/django-timezone-field-4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-timezone-field/django-timezone-field-4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe60bee9a7b95394057cf8ec6cf680ef
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.2.1 b/metadata/md5-cache/dev-python/django-timezone-field-4.2.1
index 602d0de0c464..4938dd1dc677 100644
--- a/metadata/md5-cache/dev-python/django-timezone-field-4.2.1
+++ b/metadata/md5-cache/dev-python/django-timezone-field-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mfogel/django-timezone-field/archive/4.2.1.tar.gz -> django-timezone-field-4.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=52e4c6d20739bb7c6a09f23da84bdc5c
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-3.0.0 b/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
index ec04cb5e6713..bc718c4c3e39 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
+++ b/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-polymorphic/django-polymorphic/archive/3.0.0.tar.gz -> django_polymorphic-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d231f7209266f9d3e12be5ffb51cbbac
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.12.4 b/metadata/md5-cache/dev-python/djangorestframework-3.12.4
index d31b3d80a333..9229dbd7b017 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.12.4
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.12.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/encode/django-rest-framework/archive/3.12.4.tar.gz -> django-rest-framework-3.12.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a18b6b430ce99e3072e7ec7bed1f9088
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.0.5 b/metadata/md5-cache/dev-python/dkimpy-1.0.5
index 7a8e344f1216..8101195a30ad 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 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-1.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f372bc681066bd53ba7ef3058130384f
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4 b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
index 594034ca85a1..efc804a7a1d6 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dns-lexicon/dns-lexicon-3.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6034cc76929ac0098807486c9bbd82cb
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.7.0 b/metadata/md5-cache/dev-python/dns-lexicon-3.7.0
index 1b43e1716684..8114ba9159ac 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.7.0
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.7.0.tar.gz -> dns-lexicon-3.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7363970c520c6b72e2546f110b8e541
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0-r2 b/metadata/md5-cache/dev-python/dnspython-1.16.0-r2
index a4cc9f560e79..cabb301f0c63 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0-r2
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v1.16.0.tar.gz -> dnspython-1.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a224e2152c99fabcc11c2f6772996840
diff --git a/metadata/md5-cache/dev-python/dnspython-2.1.0 b/metadata/md5-cache/dev-python/dnspython-2.1.0
index c5ab530cdee1..d6cb1229f754 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.1.0
+++ b/metadata/md5-cache/dev-python/dnspython-2.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/rthalley/dnspython/archive/v2.1.0.tar.gz -> dnspython-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa82452378bce92d798912748bf43cd1
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
index 3a4329c54031..822a47b5f4b1 100644
--- a/metadata/md5-cache/dev-python/doc8-0.6.0
+++ b/metadata/md5-cache/dev-python/doc8-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_8(-)?] dev-python/chardet[py
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doc8/doc8-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb847222af91cb7a1109f74ea783282b
diff --git a/metadata/md5-cache/dev-python/doc8-0.9.0 b/metadata/md5-cache/dev-python/doc8-0.9.0
index b3bfdd0d10f4..ced1a7c5ab0f 100644
--- a/metadata/md5-cache/dev-python/doc8-0.9.0
+++ b/metadata/md5-cache/dev-python/doc8-0.9.0
@@ -4,12 +4,12 @@ DESCRIPTION=Style checker for Sphinx (or other) RST documentation
 EAPI=8
 HOMEPAGE=http://git.openstack.org/cgit/stackforge/doc8
 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
 RDEPEND=dev-python/pbr[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/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/restructuredtext-lint[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/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/doc8/doc8-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d83b620dfc1f7b72fbe214d4b523b2a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=09cf2152c3e4e01155ba119fcbb00f57
diff --git a/metadata/md5-cache/dev-python/doc8-0.9.1 b/metadata/md5-cache/dev-python/doc8-0.9.1
new file mode 100644
index 000000000000..40c01e0baccb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doc8-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[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(-)?] ) test? ( dev-python/pbr[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/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/restructuredtext-lint[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/stevedore[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 postinst prepare test
+DESCRIPTION=Style checker for Sphinx (or other) RST documentation
+EAPI=8
+HOMEPAGE=http://git.openstack.org/cgit/stackforge/doc8
+IUSE=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/pbr[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/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/restructuredtext-lint[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/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/doc8/doc8-0.9.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5d83b620dfc1f7b72fbe214d4b523b2a
diff --git a/metadata/md5-cache/dev-python/docker-py-5.0.0 b/metadata/md5-cache/dev-python/docker-py-5.0.0
index ef7412a755cf..f819b407ae93 100644
--- a/metadata/md5-cache/dev-python/docker-py-5.0.0
+++ b/metadata/md5-cache/dev-python/docker-py-5.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/5.0.0.tar.gz -> docker-py-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=131dbe9c622e807dd7722d5ca7952836
diff --git a/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1 b/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
index b80370517bcb..edb599af59f2 100644
--- a/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
@@ -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/d11wtq/dockerpty/archive/v0.4.1.tar.gz -> dockerpty-0.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ade1930a2fabe8c68e9ea7f734f5adb
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r4 b/metadata/md5-cache/dev-python/docopt-0.6.2-r4
index 12a941313d1f..f7643980fa88 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r4
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r4
@@ -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/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82db43cae165c89abf0f5d1f4d1e56fc
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index 636010031209..2c283885cf09 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -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/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82c1282d30b1f95a9f734fcbd68254cf
diff --git a/metadata/md5-cache/dev-python/docutils-0.16-r1 b/metadata/md5-cache/dev-python/docutils-0.16-r1
index 7c2be6670de5..29468f09f3a8 100644
--- a/metadata/md5-cache/dev-python/docutils-0.16-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ba6c2d112ffc156172dc883f9a7ec5a
diff --git a/metadata/md5-cache/dev-python/docutils-0.17.1 b/metadata/md5-cache/dev-python/docutils-0.17.1
index a6de44001b64..211b0da115c4 100644
--- a/metadata/md5-cache/dev-python/docutils-0.17.1
+++ b/metadata/md5-cache/dev-python/docutils-0.17.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.17.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac427d554ea0b6fe0aff2d4a274edfb3
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.2 b/metadata/md5-cache/dev-python/docutils-glep-1.2
index 7ac5d57a6740..3fe8e76b172a 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.2
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f9b60555ef5857b901981933a3738cc
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.3 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.3
index f8a39ca068a5..ae7af8aea364 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.3
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=32a1ee15e9f1bd7596d6deb72688f7c5
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.4 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.4
index 81401238bc25..8ff5a94d4cd5 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.4
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.4
@@ -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/d/dogpile.cache/dogpile.cache-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7da0b16e1f0e47b5dc3ef8d7fa62a5e6
diff --git a/metadata/md5-cache/dev-python/doit-0.33.1 b/metadata/md5-cache/dev-python/doit-0.33.1
index 787a6d8fc51b..bded590f3361 100644
--- a/metadata/md5-cache/dev-python/doit-0.33.1
+++ b/metadata/md5-cache/dev-python/doit-0.33.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.33.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3bf58217333d9f228a2db7d77fa1ccc7
diff --git a/metadata/md5-cache/dev-python/doit-py-0.5.0 b/metadata/md5-cache/dev-python/doit-py-0.5.0
index f448d45f56d5..8658451c66e5 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.5.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.5.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/pydoit/doit-py/archive/0.5.0.tar.gz -> doit-py-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97365b52ba82d2a233ae2364d28a58b9
diff --git a/metadata/md5-cache/dev-python/dominate-2.6.0 b/metadata/md5-cache/dev-python/dominate-2.6.0
index 0f55b089660f..5b39d72909e3 100644
--- a/metadata/md5-cache/dev-python/dominate-2.6.0
+++ b/metadata/md5-cache/dev-python/dominate-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79cdc7630cd9686f80ba96a1f5064cfd
diff --git a/metadata/md5-cache/dev-python/doublex-1.9.2-r1 b/metadata/md5-cache/dev-python/doublex-1.9.2-r1
index 074bcabc9d60..7465673c6410 100644
--- a/metadata/md5-cache/dev-python/doublex-1.9.2-r1
+++ b/metadata/md5-cache/dev-python/doublex-1.9.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=https://bitbucket.org/DavidVilla/python-doublex/get/v1.9.2.tar.gz -> doublex-1.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=4b93b460361784b4e21f9c490395e0e3
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.1 b/metadata/md5-cache/dev-python/doublex-expects-0.7.1
index 98e920942124..0e7ac2bd1e3b 100644
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.1
+++ b/metadata/md5-cache/dev-python/doublex-expects-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaimegildesagredo/doublex-expects/archive/v0.7.1.tar.gz -> doublex-expects-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e067d43f89ee8c09027170c5ab32788
diff --git a/metadata/md5-cache/dev-python/drf-yasg-1.20.0 b/metadata/md5-cache/dev-python/drf-yasg-1.20.0
index 15046d0bdc62..6271edc9fc94 100644
--- a/metadata/md5-cache/dev-python/drf-yasg-1.20.0
+++ b/metadata/md5-cache/dev-python/drf-yasg-1.20.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coreapi-2.3.3[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/drf-yasg/drf-yasg-1.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4439cc88768a237b89f28a139fd5031c
diff --git a/metadata/md5-cache/dev-python/duecredit-0.7.0 b/metadata/md5-cache/dev-python/duecredit-0.7.0
index 930529b446c6..91d456dace14 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.7.0
+++ b/metadata/md5-cache/dev-python/duecredit-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e26bc2537ef819711e4dd396dcc7ddae
diff --git a/metadata/md5-cache/dev-python/duecredit-0.8.0 b/metadata/md5-cache/dev-python/duecredit-0.8.0
index 0870ea7692ef..dcdef7e01db8 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.8.0
+++ b/metadata/md5-cache/dev-python/duecredit-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f8960146964fcbcd719a5ae4e700b31
diff --git a/metadata/md5-cache/dev-python/duecredit-0.9.1 b/metadata/md5-cache/dev-python/duecredit-0.9.1
index 064a69fe07d0..76c678fee740 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.9.1
+++ b/metadata/md5-cache/dev-python/duecredit-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd5ddb2665be7beb183eef7e625c8513
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.23 b/metadata/md5-cache/dev-python/dulwich-0.20.23
index ff435b6bc911..dc7d0b5e8d28 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.23
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.23
@@ -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/d/dulwich/dulwich-0.20.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d82277b5340314a78a3ef1cb444fea11
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1
index 97be0bf958f6..533363a221c6 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0cd01b55fb9254aade59380c85d3c89
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1-r1 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1-r1
index da07a83712e0..d1995df4d6b4 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1-r1
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1-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/e/easy-thumbnails/easy-thumbnails-2.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11e9d4b23435fc6e18267fb3923c9811
diff --git a/metadata/md5-cache/dev-python/easyprocess-0.3-r1 b/metadata/md5-cache/dev-python/easyprocess-0.3-r1
index d012dba06232..55ab1a3e2fc4 100644
--- a/metadata/md5-cache/dev-python/easyprocess-0.3-r1
+++ b/metadata/md5-cache/dev-python/easyprocess-0.3-r1
@@ -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/ponty/EasyProcess/archive/0.3.tar.gz -> easyprocess-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=251292218eace792aeb217a062daaab7
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.17.0 b/metadata/md5-cache/dev-python/ecdsa-0.17.0
index 043992e49be0..63ed43b42039 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.17.0
+++ b/metadata/md5-cache/dev-python/ecdsa-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b8edf11f22822399d2d21a39dc76fed
diff --git a/metadata/md5-cache/dev-python/editdistance-s-1.0.0 b/metadata/md5-cache/dev-python/editdistance-s-1.0.0
index 7bf83d8497ac..410389c581e7 100644
--- a/metadata/md5-cache/dev-python/editdistance-s-1.0.0
+++ b/metadata/md5-cache/dev-python/editdistance-s-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/editdistance-s/archive/refs/tags/v1.0.0.tar.gz -> editdistance-s-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fb59f40dc6d58ec14c918472aabd96e
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
index 32badeb7c685..1fd72ca18346 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e6c7ce3294dc0e6ed8fb2f6ce82a0a0b
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
index 78ac844adc80..8787d98485b9 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
@@ -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/editorconfig/editorconfig-core-py/archive/v0.12.3.tar.gz -> editorconfig-core-py-0.12.3.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7de256f386f3153ec86ef07745d98023
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0-r1 b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0-r1
index 4b7c91cd55b9..4150601aa9cd 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0-r1
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elastic/elasticsearch-py/archive/7.7.0.tar.gz -> elasticsearch-py-7.7.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e956588ade0d857fca8836523c85e851
diff --git a/metadata/md5-cache/dev-python/elementpath-2.2.3 b/metadata/md5-cache/dev-python/elementpath-2.2.3
index fb1b12050dee..ea076951ad21 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.2.3
+++ b/metadata/md5-cache/dev-python/elementpath-2.2.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/sissaschool/elementpath/archive/v2.2.3.tar.gz -> elementpath-2.2.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c95f8407b81f8104cdd949603378df35
diff --git a/metadata/md5-cache/dev-python/elementpath-2.3.0 b/metadata/md5-cache/dev-python/elementpath-2.3.0
index 64b1fb7d4f0d..fde27b5cc657 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.3.0
+++ b/metadata/md5-cache/dev-python/elementpath-2.3.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/sissaschool/elementpath/archive/v2.3.0.tar.gz -> elementpath-2.3.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c88fb066d29ddc23b57b52ddfc932cd4
diff --git a/metadata/md5-cache/dev-python/elementpath-2.3.1 b/metadata/md5-cache/dev-python/elementpath-2.3.1
index 45deab21c6ad..f97dcef556f8 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.3.1
+++ b/metadata/md5-cache/dev-python/elementpath-2.3.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/sissaschool/elementpath/archive/v2.3.1.tar.gz -> elementpath-2.3.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c88fb066d29ddc23b57b52ddfc932cd4
diff --git a/metadata/md5-cache/dev-python/elementpath-2.3.2 b/metadata/md5-cache/dev-python/elementpath-2.3.2
index 840194cc54af..9b80d0ff018f 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.3.2
+++ b/metadata/md5-cache/dev-python/elementpath-2.3.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/sissaschool/elementpath/archive/v2.3.2.tar.gz -> elementpath-2.3.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c88fb066d29ddc23b57b52ddfc932cd4
diff --git a/metadata/md5-cache/dev-python/emcee-3.0.2 b/metadata/md5-cache/dev-python/emcee-3.0.2
index aa19cd718727..9c46e2b61c59 100644
--- a/metadata/md5-cache/dev-python/emcee-3.0.2
+++ b/metadata/md5-cache/dev-python/emcee-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a255bb1f25c06b6ecf03c543f210f3e7
diff --git a/metadata/md5-cache/dev-python/emcee-3.1.0 b/metadata/md5-cache/dev-python/emcee-3.1.0
index 750cc76bf02e..833689f9832f 100644
--- a/metadata/md5-cache/dev-python/emcee-3.1.0
+++ b/metadata/md5-cache/dev-python/emcee-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68a19b6a1c3bf9ca73cd880b76439e27
diff --git a/metadata/md5-cache/dev-python/emcee-3.1.1 b/metadata/md5-cache/dev-python/emcee-3.1.1
index 9714848dd3a9..aa8bbab2ad3c 100644
--- a/metadata/md5-cache/dev-python/emcee-3.1.1
+++ b/metadata/md5-cache/dev-python/emcee-3.1.1
@@ -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/e/emcee/emcee-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=183a3c42d0db71bd17f60a2bf02ee89d
diff --git a/metadata/md5-cache/dev-python/emoji-1.4.2 b/metadata/md5-cache/dev-python/emoji-1.4.2
index 6df7f47bdb24..1773c4d8fa0a 100644
--- a/metadata/md5-cache/dev-python/emoji-1.4.2
+++ b/metadata/md5-cache/dev-python/emoji-1.4.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/carpedm20/emoji/archive/refs/tags/v.1.4.2.tar.gz -> emoji-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=882a8bfdb3069eb77e6a9c9433f766a9
diff --git a/metadata/md5-cache/dev-python/emoji-1.5.0 b/metadata/md5-cache/dev-python/emoji-1.5.0
index fdccdaae7c38..11621618bdd0 100644
--- a/metadata/md5-cache/dev-python/emoji-1.5.0
+++ b/metadata/md5-cache/dev-python/emoji-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carpedm20/emoji/archive/v1.5.0.tar.gz -> emoji-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9487889e60b33a417af2f326a837e32a
diff --git a/metadata/md5-cache/dev-python/empy-3.3.4 b/metadata/md5-cache/dev-python/empy-3.3.4
index 6c482924003a..c034ecd549a4 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.4
+++ b/metadata/md5-cache/dev-python/empy-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f0d8170ffc251e4d52f37393fedd61f
diff --git a/metadata/md5-cache/dev-python/enrich-1.2.6 b/metadata/md5-cache/dev-python/enrich-1.2.6
index 50440a070caa..e1488a32a045 100644
--- a/metadata/md5-cache/dev-python/enrich-1.2.6
+++ b/metadata/md5-cache/dev-python/enrich-1.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/enrich/enrich-1.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f94426961cfef2131de171f62818aa96
diff --git a/metadata/md5-cache/dev-python/entrypoint2-0.2.4 b/metadata/md5-cache/dev-python/entrypoint2-0.2.4
index 6b8a3507663b..7c591c759199 100644
--- a/metadata/md5-cache/dev-python/entrypoint2-0.2.4
+++ b/metadata/md5-cache/dev-python/entrypoint2-0.2.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/ponty/entrypoint2/archive/0.2.4.tar.gz -> entrypoint2-0.2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44545c3ce63b4e6987bbf41ea03bce2c
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.3-r2 b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
index 95732578f3c0..f8b77a969f99 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.3-r2
+++ b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
@@ -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/e/entrypoints/entrypoints-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb40ccf00299296a2a81a2011b20f2f0
diff --git a/metadata/md5-cache/dev-python/environs-9.3.2 b/metadata/md5-cache/dev-python/environs-9.3.2
index c8b2686800ef..443ee6f28714 100644
--- a/metadata/md5-cache/dev-python/environs-9.3.2
+++ b/metadata/md5-cache/dev-python/environs-9.3.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/sloria/environs/archive/refs/tags/9.3.2.tar.gz -> environs-9.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a99221bdf44f541109c33302a464423
diff --git a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2 b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
index e13a51284cba..4b763846d3e0 100644
--- a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
@@ -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/e/enzyme/enzyme-0.4.1.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90526de4d645d19ea04a568a119995b3
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index 420fb2f1b33c..f127175757b5 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82db37bf945b0e253d1b7f122e5c22c1
diff --git a/metadata/md5-cache/dev-python/eradicate-2.0.0 b/metadata/md5-cache/dev-python/eradicate-2.0.0
index e99a68da2d0b..e7615f9203c8 100644
--- a/metadata/md5-cache/dev-python/eradicate-2.0.0
+++ b/metadata/md5-cache/dev-python/eradicate-2.0.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/myint/eradicate/archive/v2.0.0.tar.gz -> eradicate-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cbbca6228c069703a3c8718d2a444fb
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
index f6841510262c..467d03d8e985 100644
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ b/metadata/md5-cache/dev-python/errorhandler-2.0.1
@@ -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/e/errorhandler/errorhandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e8b0a2ef7c14a0dbb7bc6b4cae3e9d3
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0 b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
index bc960570128c..880a0ddc5e9f 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/1.1/et_xmlfile-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84ed66e11e75c0fd79c185056a2c5d7e
diff --git a/metadata/md5-cache/dev-python/eventlet-0.31.1 b/metadata/md5-cache/dev-python/eventlet-0.31.1
index 495b252d28d4..45cd731bbb9f 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.31.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.31.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.31.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=569b74837921abd8bb75edd6434f4306
diff --git a/metadata/md5-cache/dev-python/eventlet-0.32.0 b/metadata/md5-cache/dev-python/eventlet-0.32.0
index c6a0ba548b66..f6083cd6e59e 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.32.0
+++ b/metadata/md5-cache/dev-python/eventlet-0.32.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.32.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0f6b20fd2825e3f21e2a4e81e05ce7b
diff --git a/metadata/md5-cache/dev-python/ewmh-0.1.6 b/metadata/md5-cache/dev-python/ewmh-0.1.6
index a37a4ec2d7f5..35a19f384782 100644
--- a/metadata/md5-cache/dev-python/ewmh-0.1.6
+++ b/metadata/md5-cache/dev-python/ewmh-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-xlib[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ewmh/ewmh-0.1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a8d5c9660610851959363522e865f06
diff --git a/metadata/md5-cache/dev-python/exam-0.10.6 b/metadata/md5-cache/dev-python/exam-0.10.6
index 2eee9d7679a1..7526611149c6 100644
--- a/metadata/md5-cache/dev-python/exam-0.10.6
+++ b/metadata/md5-cache/dev-python/exam-0.10.6
@@ -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/e/exam/exam-0.10.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95bad0f8a232d8d280e79ede29278e87
diff --git a/metadata/md5-cache/dev-python/exdown-0.9.0 b/metadata/md5-cache/dev-python/exdown-0.9.0
index 1e6d0c2d9a87..e86ca6b91b9d 100644
--- a/metadata/md5-cache/dev-python/exdown-0.9.0
+++ b/metadata/md5-cache/dev-python/exdown-0.9.0
@@ -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/nschloe/pytest-codeblocks/archive/v0.9.0.tar.gz -> pytest-codeblocks-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=3a8947a42412a2bd5ca827b9ec09c40a
diff --git a/metadata/md5-cache/dev-python/execnet-1.9.0 b/metadata/md5-cache/dev-python/execnet-1.9.0
index 6925314d2a46..6f064d81ddec 100644
--- a/metadata/md5-cache/dev-python/execnet-1.9.0
+++ b/metadata/md5-cache/dev-python/execnet-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=785f248bf5e36aa62d030c82e8e6a989
diff --git a/metadata/md5-cache/dev-python/executing-0.7.0 b/metadata/md5-cache/dev-python/executing-0.7.0
index cc347f3103b1..0fd64a62da75 100644
--- a/metadata/md5-cache/dev-python/executing-0.7.0
+++ b/metadata/md5-cache/dev-python/executing-0.7.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/alexmojaki/executing/archive/v0.7.0.tar.gz -> executing-0.7.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03a1ce35cdd9d4334a0372eee5c81fb7
diff --git a/metadata/md5-cache/dev-python/executing-0.8.0 b/metadata/md5-cache/dev-python/executing-0.8.0
index 0695442668fa..1db07cbf8059 100644
--- a/metadata/md5-cache/dev-python/executing-0.8.0
+++ b/metadata/md5-cache/dev-python/executing-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.0.tar.gz -> executing-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bfa9012ab92dbec3607854f6f668b50
diff --git a/metadata/md5-cache/dev-python/executing-0.8.1 b/metadata/md5-cache/dev-python/executing-0.8.1
index 7783c87e87a8..fe88af2c0809 100644
--- a/metadata/md5-cache/dev-python/executing-0.8.1
+++ b/metadata/md5-cache/dev-python/executing-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.1.tar.gz -> executing-0.8.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d4c5c2e61ee56a31f47ca9db134e288
diff --git a/metadata/md5-cache/dev-python/expects-0.9.0 b/metadata/md5-cache/dev-python/expects-0.9.0
index 618cebfac19e..dc574b37afaa 100644
--- a/metadata/md5-cache/dev-python/expects-0.9.0
+++ b/metadata/md5-cache/dev-python/expects-0.9.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/e/expects/expects-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=480753dc195c835fcdddb92417ec62d3
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0-r1 b/metadata/md5-cache/dev-python/extras-1.0.0-r1
index a14ce98b4680..c6fb98965852 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/extras-1.0.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=mirror://pypi/e/extras/extras-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63f1f3c3d9782f066244179de2a22a2b
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.9.6 b/metadata/md5-cache/dev-python/eyeD3-0.9.6
index 81225a35388c..112ecc14be3e 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.9.6
+++ b/metadata/md5-cache/dev-python/eyeD3-0.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5b4c0fb12b01450b2f42576546fd160
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.5.1 b/metadata/md5-cache/dev-python/fakeredis-1.5.1
index aa88412f46ec..34590f3a02bb 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.5.1
+++ b/metadata/md5-cache/dev-python/fakeredis-1.5.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/jamesls/fakeredis/archive/1.5.1.tar.gz -> fakeredis-1.5.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d23c53729c985b986f82982dc9471bb
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.6.0 b/metadata/md5-cache/dev-python/fakeredis-1.6.0
index c838b553df24..7cce957eaf0d 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.6.0
+++ b/metadata/md5-cache/dev-python/fakeredis-1.6.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/jamesls/fakeredis/archive/1.6.0.tar.gz -> fakeredis-1.6.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b878e60ec5ee79301785d57383a8820
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.6.1 b/metadata/md5-cache/dev-python/fakeredis-1.6.1
index f34f4ff4606d..dc647c5ea440 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.6.1
+++ b/metadata/md5-cache/dev-python/fakeredis-1.6.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/jamesls/fakeredis/archive/1.6.1.tar.gz -> fakeredis-1.6.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5465002e5d7fdcd7fe2392a1031d0285
diff --git a/metadata/md5-cache/dev-python/falcon-2.0.0-r1 b/metadata/md5-cache/dev-python/falcon-2.0.0-r1
index c063f8c7cd57..432eb8d258bc 100644
--- a/metadata/md5-cache/dev-python/falcon-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/falcon-2.0.0-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/falconry/falcon/archive/2.0.0.tar.gz -> falcon-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc38d5f557c12896ae97817fe50f5756
diff --git a/metadata/md5-cache/dev-python/falcon-3.0.1-r1 b/metadata/md5-cache/dev-python/falcon-3.0.1-r1
index 59857d6e46b2..b6901ee141cd 100644
--- a/metadata/md5-cache/dev-python/falcon-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/falcon-3.0.1-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/falconry/falcon/archive/3.0.1.tar.gz -> falcon-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2575cbebae967ca36e96d09eddf72be0
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16.3 b/metadata/md5-cache/dev-python/fasteners-0.16.3
index a18223c1804b..e7441e6495b8 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.16.3
+++ b/metadata/md5-cache/dev-python/fasteners-0.16.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/harlowja/fasteners/archive/0.16.3.tar.gz -> fasteners-0.16.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49968020fb935875b9d42760ee2a006f
diff --git a/metadata/md5-cache/dev-python/fastimport-0.9.11 b/metadata/md5-cache/dev-python/fastimport-0.9.11
index 21e2ee0841a2..18b99c820b1a 100644
--- a/metadata/md5-cache/dev-python/fastimport-0.9.11
+++ b/metadata/md5-cache/dev-python/fastimport-0.9.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3b3a5409e4521388dc656f6045884e1
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.15.1 b/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
index 4413659cacef..ac3d4006ec2c 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
@@ -4,12 +4,12 @@ DESCRIPTION=Fast JSON schema validator for Python
 EAPI=7
 HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 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/horejsek/python-fastjsonschema/archive/v2.15.1.tar.gz -> python-fastjsonschema-2.15.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f49e76de4908a539101690f0cc399cae
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6fad93a6b1d8e5691b356d5b36c7bbc1
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9.2 b/metadata/md5-cache/dev-python/feedgenerator-1.9.2
index 50f27bedd56a..ede853b40ca5 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9.2
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9.2
@@ -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/f/feedgenerator/feedgenerator-1.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=976e6ac7c698896189c27fd3d18383fc
diff --git a/metadata/md5-cache/dev-python/feedgenerator-2.0.0 b/metadata/md5-cache/dev-python/feedgenerator-2.0.0
new file mode 100644
index 000000000000..ba9d34e797d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/feedgenerator-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytz[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=Standalone version of django.utils.feedgenerator
+EAPI=8
+HOMEPAGE=https://pypi.org/project/feedgenerator/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pytz[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/feedgenerator/feedgenerator-2.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3aad298239d31617b314ac60226b5b00
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1-r1 b/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
index be25ea0d97b9..fcecb4ca9421 100644
--- a/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
+++ b/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c11df47c5621d7b342b9dcc77d461fad
diff --git a/metadata/md5-cache/dev-python/feedparser-6.0.8 b/metadata/md5-cache/dev-python/feedparser-6.0.8
index f721b2d2fcc3..3e4b83b4f84a 100644
--- a/metadata/md5-cache/dev-python/feedparser-6.0.8
+++ b/metadata/md5-cache/dev-python/feedparser-6.0.8
@@ -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/kurtmckee/feedparser/archive/6.0.8.tar.gz -> feedparser-6.0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0c8dcf54802ad354894ade758b7454d
diff --git a/metadata/md5-cache/dev-python/fido2-0.8.1 b/metadata/md5-cache/dev-python/fido2-0.8.1
index 11c5a685a2a1..652c5c205106 100644
--- a/metadata/md5-cache/dev-python/fido2-0.8.1
+++ b/metadata/md5-cache/dev-python/fido2-0.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/Yubico/python-fido2/releases/download/0.8.1/fido2-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed57cded245a8a8580f1737dfeefb1ba
diff --git a/metadata/md5-cache/dev-python/fido2-0.9.1 b/metadata/md5-cache/dev-python/fido2-0.9.1
index a0fb6341de90..6336a083ff34 100644
--- a/metadata/md5-cache/dev-python/fido2-0.9.1
+++ b/metadata/md5-cache/dev-python/fido2-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a86df289c4552e9c76b14d13b7263dae
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r2 b/metadata/md5-cache/dev-python/fields-5.0.0-r2
index 24247870d883..aba150ea3914 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r2
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r2
@@ -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/f/fields/fields-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbd584c0bbfedd7e268704ab51b27970
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.12-r1 b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
index ef945d027a0d..c6ebfd230abc 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.12-r1
+++ b/metadata/md5-cache/dev-python/filelock-3.0.12-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/benediktschmitt/py-filelock/archive/v3.0.12.tar.gz -> py-filelock-3.0.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7afec7fbc83a88cfcaa830ab3545f3d
diff --git a/metadata/md5-cache/dev-python/filelock-3.1.0 b/metadata/md5-cache/dev-python/filelock-3.1.0
new file mode 100644
index 000000000000..5c92920fbcd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/benediktschmitt/py-filelock https://pypi.org/project/filelock/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/3.1.0.tar.gz -> py-filelock-3.1.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=df7312d6a88e764227f3a004027b076a
diff --git a/metadata/md5-cache/dev-python/filelock-3.2.0 b/metadata/md5-cache/dev-python/filelock-3.2.0
new file mode 100644
index 000000000000..8c116bcc1624
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-timeout[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 platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/benediktschmitt/py-filelock https://pypi.org/project/filelock/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/3.2.0.tar.gz -> py-filelock-3.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=738c072e9bd78a6c5e3e85f986cf256d
diff --git a/metadata/md5-cache/dev-python/filetype-1.0.7 b/metadata/md5-cache/dev-python/filetype-1.0.7
index fb2f74eb67aa..ca18fb27a573 100644
--- a/metadata/md5-cache/dev-python/filetype-1.0.7
+++ b/metadata/md5-cache/dev-python/filetype-1.0.7
@@ -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/f/filetype/filetype-1.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=288f517c8a636fc6b87b081549ec5b02
diff --git a/metadata/md5-cache/dev-python/filetype-1.0.8 b/metadata/md5-cache/dev-python/filetype-1.0.8
index 30fb22c8144b..42ccd808fc56 100644
--- a/metadata/md5-cache/dev-python/filetype-1.0.8
+++ b/metadata/md5-cache/dev-python/filetype-1.0.8
@@ -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/f/filetype/filetype-1.0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12c2d86c5696f99d41877a35a40543c4
diff --git a/metadata/md5-cache/dev-python/findimports-1.5.2 b/metadata/md5-cache/dev-python/findimports-1.5.2
index aa2821253b8c..087d904125b4 100644
--- a/metadata/md5-cache/dev-python/findimports-1.5.2
+++ b/metadata/md5-cache/dev-python/findimports-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgedmin/findimports/archive/1.5.2.tar.gz -> findimports-1.5.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b79d73a162aed71857a0300d6768312
diff --git a/metadata/md5-cache/dev-python/findimports-2.0.0 b/metadata/md5-cache/dev-python/findimports-2.0.0
index 48c2df84f73e..398f84bba107 100644
--- a/metadata/md5-cache/dev-python/findimports-2.0.0
+++ b/metadata/md5-cache/dev-python/findimports-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgedmin/findimports/archive/2.0.0.tar.gz -> findimports-2.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=101acba6becc3a0daf0685cb9c4f21aa
diff --git a/metadata/md5-cache/dev-python/findimports-2.1.0 b/metadata/md5-cache/dev-python/findimports-2.1.0
index 14c56e9ecf85..6b35f29bc652 100644
--- a/metadata/md5-cache/dev-python/findimports-2.1.0
+++ b/metadata/md5-cache/dev-python/findimports-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgedmin/findimports/archive/2.1.0.tar.gz -> findimports-2.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=101acba6becc3a0daf0685cb9c4f21aa
diff --git a/metadata/md5-cache/dev-python/fitsio-0.9.11 b/metadata/md5-cache/dev-python/fitsio-0.9.11
index 98db65a7170a..ab91a52cf418 100644
--- a/metadata/md5-cache/dev-python/fitsio-0.9.11
+++ b/metadata/md5-cache/dev-python/fitsio-0.9.11
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/numpy-1.11[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/esheldon/fitsio/archive/v0.9.11.tar.gz -> fitsio-0.9.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efcc5d34b87403f696e9e22d5abc395f
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0-r1 b/metadata/md5-cache/dev-python/fixtures-3.0.0-r1
index c617c86b816c..9294abc38785 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.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=mirror://pypi/f/fixtures/fixtures-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4aa32684974e65de5562fa356db5f38c
diff --git a/metadata/md5-cache/dev-python/flake8-3.8.4 b/metadata/md5-cache/dev-python/flake8-3.8.4
index 185fc77ec05c..d9a9bc9da833 100644
--- a/metadata/md5-cache/dev-python/flake8-3.8.4
+++ b/metadata/md5-cache/dev-python/flake8-3.8.4
@@ -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/f/flake8/flake8-3.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f85246fc15d4988a8ff4d17fa2724734
diff --git a/metadata/md5-cache/dev-python/flake8-3.9.2 b/metadata/md5-cache/dev-python/flake8-3.9.2
index 7308c00981df..6b7a573b9bce 100644
--- a/metadata/md5-cache/dev-python/flake8-3.9.2
+++ b/metadata/md5-cache/dev-python/flake8-3.9.2
@@ -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/f/flake8/flake8-3.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5e449413fa34deb909a528846ca4bf8
diff --git a/metadata/md5-cache/dev-python/flake8-import-order-0.18 b/metadata/md5-cache/dev-python/flake8-import-order-0.18
index feac7c0a7a36..d55f6d4f9925 100644
--- a/metadata/md5-cache/dev-python/flake8-import-order-0.18
+++ b/metadata/md5-cache/dev-python/flake8-import-order-0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-import-order/flake8-import-order-0.18.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6b8555997398d007a98157cad87cc7cb
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
index 43e36943b976..93b443958677 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
@@ -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/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6269041cab503e25b4dc877e4a5968d6
diff --git a/metadata/md5-cache/dev-python/flaky-3.7.0-r1 b/metadata/md5-cache/dev-python/flaky-3.7.0-r1
index 97c3977fdb28..a51476cd2816 100644
--- a/metadata/md5-cache/dev-python/flaky-3.7.0-r1
+++ b/metadata/md5-cache/dev-python/flaky-3.7.0-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/f/flaky/flaky-3.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=188650172fe99a11403fc10fdba27e57
diff --git a/metadata/md5-cache/dev-python/flask-1.1.4 b/metadata/md5-cache/dev-python/flask-1.1.4
index 228f734a4f06..4007e0c791c3 100644
--- a/metadata/md5-cache/dev-python/flask-1.1.4
+++ b/metadata/md5-cache/dev-python/flask-1.1.4
@@ -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/F/Flask/Flask-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb7943845c13a95eaf688d8df911bbab
diff --git a/metadata/md5-cache/dev-python/flask-2.0.1 b/metadata/md5-cache/dev-python/flask-2.0.1
index 145558961935..9cea037a8dcc 100644
--- a/metadata/md5-cache/dev-python/flask-2.0.1
+++ b/metadata/md5-cache/dev-python/flask-2.0.1
@@ -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/F/Flask/Flask-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19e180a561b8925662890c3a3299f4d5
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 5b00db12e53f..f2bd6a2b5e3e 100644
--- a/metadata/md5-cache/dev-python/flask-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/flask-2.0.1-r1
@@ -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/F/Flask/Flask-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e836647bdea5c6ec7c02837a794c38dc
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index 4aab94b0f7b2..e7366231a6e7 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-7.1.2[python_targets_pypy3(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02a7133f56ed476a493e32be12e87476
diff --git a/metadata/md5-cache/dev-python/flask-api-2.0 b/metadata/md5-cache/dev-python/flask-api-2.0
index b8ffaa9475a1..df6fa48efd6c 100644
--- a/metadata/md5-cache/dev-python/flask-api-2.0
+++ b/metadata/md5-cache/dev-python/flask-api-2.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/flask-api/flask-api/archive/v2.0.tar.gz -> flask-api-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ddee7c38ad19ee8d7f0376c2badb600
diff --git a/metadata/md5-cache/dev-python/flask-api-3.0 b/metadata/md5-cache/dev-python/flask-api-3.0
index e28a6b83e927..915158cab859 100644
--- a/metadata/md5-cache/dev-python/flask-api-3.0
+++ b/metadata/md5-cache/dev-python/flask-api-3.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/flask-api/flask-api/archive/v3.0.tar.gz -> flask-api-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9b9f9c640276cacd511785390114e14
diff --git a/metadata/md5-cache/dev-python/flask-assets-0.12 b/metadata/md5-cache/dev-python/flask-assets-0.12
index 55c22ca4a658..955b60adb776 100644
--- a/metadata/md5-cache/dev-python/flask-assets-0.12
+++ b/metadata/md5-cache/dev-python/flask-assets-0.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_8? (
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/flask-assets/archive/0.12.tar.gz -> flask-assets-0.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a3c778b6c0c3d244552708bb6ebbab2
diff --git a/metadata/md5-cache/dev-python/flask-babel-2.0.0 b/metadata/md5-cache/dev-python/flask-babel-2.0.0
index 9d9053bc32a1..647f72f34f6d 100644
--- a/metadata/md5-cache/dev-python/flask-babel-2.0.0
+++ b/metadata/md5-cache/dev-python/flask-babel-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d981fa54a94a44dc15266a4ae8d13be
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.4 b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
index 03aa47f592bb..fdf84aec7ac4 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.4
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
@@ -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/F/Flask-BabelEx/Flask-BabelEx-0.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f2727e98b8b631cb440d90ecc251f33
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.10.1 b/metadata/md5-cache/dev-python/flask-compress-1.10.1
index 7067990235b7..40c5873e29be 100644
--- a/metadata/md5-cache/dev-python/flask-compress-1.10.1
+++ b/metadata/md5-cache/dev-python/flask-compress-1.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/F/Flask-Compress/Flask-Compress-1.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfbfd0d7ba84a3dc0a5709ae0ab59526
diff --git a/metadata/md5-cache/dev-python/flask-cors-3.0.10 b/metadata/md5-cache/dev-python/flask-cors-3.0.10
index d24b6506f770..517358d09522 100644
--- a/metadata/md5-cache/dev-python/flask-cors-3.0.10
+++ b/metadata/md5-cache/dev-python/flask-cors-3.0.10
@@ -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/corydolphin/flask-cors/archive/3.0.10.tar.gz -> flask-cors-3.0.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1979bf1265be051e5dbb34888855987c
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1 b/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
index 858640ebf700..a6d18591b427 100644
--- a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3-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/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17030cdca34ef19b273a93a7e3cebb9a
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index 143bc302e03d..1cdbe57945ad 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.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/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2047bc3e0da521bade26cd0b1ed855a
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0 b/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
index 45bcf6528186..d0473b5fff2f 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.1.0.tar.gz -> Flask-HTMLmin-2.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed5aaf09d1a64b3d1afe8d7a9a609183
diff --git a/metadata/md5-cache/dev-python/flask-login-0.5.0 b/metadata/md5-cache/dev-python/flask-login-0.5.0
index dcaefffbfe48..71278302e0ae 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-login-0.5.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/maxcountryman/flask-login/archive/0.5.0.tar.gz -> flask-login-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e20e70f5b53557392c0be09d5749363
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index 1d353ce4b9df..d7d0ffa085c1 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-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/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba3bfbb327661648d66429d6bbd0b9e3
diff --git a/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2 b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2
index 0d3d92ac9b20..ca06619fab93 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2
+++ b/metadata/md5-cache/dev-python/flask-migrate-3.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=023fdc84e4914c28a1d6e022bd82f471
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0 b/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
index eab7e69ab9e4..f147f8200b01 100644
--- a/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-1.0.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/MongoEngine/flask-mongoengine/archive/v1.0.0.tar.gz -> flask-mongoengine-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b9cdf3b0c49acf637bced6267f5ec9f
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r2 b/metadata/md5-cache/dev-python/flask-nav-0.6-r2
index 153d1d85728f..166fd8f7cabe 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r2
+++ b/metadata/md5-cache/dev-python/flask-nav-0.6-r2
@@ -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/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9eb5d8237e60f6b389731faba900e0ba
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r4 b/metadata/md5-cache/dev-python/flask-nav-0.6-r4
index e029ae16a058..39af4f311eab 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r4
+++ b/metadata/md5-cache/dev-python/flask-nav-0.6-r4
@@ -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/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfde68be84e28d50aae1071bf07e8f51
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.8.1 b/metadata/md5-cache/dev-python/flask-paginate-0.8.1
index 7c1784f0ad5e..aedb5b10f5af 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.8.1
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.8.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/lixxu/flask-paginate/archive/0.8.1.tar.gz -> flask-paginate-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d41270484276886149e8e59fde5d45a
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
index 45c1b2d9a940..060b54a1c306 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/flask-paranoid/archive/v0.2.tar.gz -> flask-paranoid-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=32850c89ffa48058a915d825df8c3360
diff --git a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1 b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
index 34ebdd8cd226..df82ad0a4132 100644
--- a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/flask-principal-0.4.0-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/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-0.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bfe1efe938a800a114a3121d29cd29c0
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.9 b/metadata/md5-cache/dev-python/flask-restful-0.3.9
index 126f4886a87d..1362547b38ea 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.9
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.9
@@ -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/flask-restful/flask-restful/archive/v0.3.9.tar.gz -> flask-restful-0.3.9.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97f75ef1494a25dad7183e522f72e15
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.6 b/metadata/md5-cache/dev-python/flask-script-2.0.6
index 3d63b576b47a..d10be025f55f 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -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/F/Flask-Script/Flask-Script-2.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=affced5869d023f3d3fb14398f09d163
diff --git a/metadata/md5-cache/dev-python/flask-security-3.4.5 b/metadata/md5-cache/dev-python/flask-security-3.4.5
index 8585b5664579..d6021b9f9afd 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.4.5
+++ b/metadata/md5-cache/dev-python/flask-security-3.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/3.4.5.tar.gz -> flask-security-3.4.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f24a05e8385ba6622dc8c45fc2a37e2b
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.0 b/metadata/md5-cache/dev-python/flask-security-4.1.0
index 4cac936e486b..2b60b8755883 100644
--- a/metadata/md5-cache/dev-python/flask-security-4.1.0
+++ b/metadata/md5-cache/dev-python/flask-security-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/4.1.0.tar.gz -> flask-security-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fff8b9ab9122116fce6488836b724380
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.1 b/metadata/md5-cache/dev-python/flask-security-4.1.1
index e94903ce8a68..ae635a60bdd5 100644
--- a/metadata/md5-cache/dev-python/flask-security-4.1.1
+++ b/metadata/md5-cache/dev-python/flask-security-4.1.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/Flask-Middleware/flask-security/archive/4.1.1.tar.gz -> flask-security-4.1.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ad943c1a34bdaf1ca09f23694c766bd
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.2 b/metadata/md5-cache/dev-python/flask-security-4.1.2
index 47edef6a2934..39af0a5259a8 100644
--- a/metadata/md5-cache/dev-python/flask-security-4.1.2
+++ b/metadata/md5-cache/dev-python/flask-security-4.1.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/Flask-Middleware/flask-security/archive/4.1.2.tar.gz -> flask-security-4.1.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ad943c1a34bdaf1ca09f23694c766bd
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
index 6c7fd6cd2c22..20fb1ff7e75e 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c60705166ea8452a3bb93178427f5cf
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 c951b192be59..035529d03aa1 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
@@ -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/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10df875a1accefb90a01b191e4c142b4
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.15.1 b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
index b8b4426c8db4..ae1cc397ba64 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.15.1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.15.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/F/Flask-WTF/Flask-WTF-0.15.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5952421c6c638ed495560455be57b97
diff --git a/metadata/md5-cache/dev-python/flatbuffers-2.0 b/metadata/md5-cache/dev-python/flatbuffers-2.0
index cf69a58483be..11696a449a80 100644
--- a/metadata/md5-cache/dev-python/flatbuffers-2.0
+++ b/metadata/md5-cache/dev-python/flatbuffers-2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flatbuffers/flatbuffers-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e3f25a59131bb48ae60567e2a3eee82
diff --git a/metadata/md5-cache/dev-python/fleep-1.0.1-r1 b/metadata/md5-cache/dev-python/fleep-1.0.1-r1
index 4455ddcc5335..0c9e4ec85279 100644
--- a/metadata/md5-cache/dev-python/fleep-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/fleep-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/floyernick/fleep-py/archive/994bc2c274482d80ab13d89d8f7343eb316d3e44.tar.gz -> fleep-1.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa1b4beddb865d0e1a4a94d6dd6fdef4
diff --git a/metadata/md5-cache/dev-python/fleep-9999 b/metadata/md5-cache/dev-python/fleep-9999
index 765743570a3d..717e67979b21 100644
--- a/metadata/md5-cache/dev-python/fleep-9999
+++ b/metadata/md5-cache/dev-python/fleep-9999
@@ -9,5 +9,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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d053ca8176fbab9d912db2029e063a43
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.10 b/metadata/md5-cache/dev-python/flexmock-0.10.10
index 2bfd6fd59fc9..5d04accd1ccb 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.10
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.10
@@ -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/f/flexmock/flexmock-0.10.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f38a2f29e7e6769f8c1afff91ae18b42
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
deleted file mode 100644
index 1274cfdecf76..000000000000
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Testing library to create mocks, stubs and fakes
-EAPI=7
-HOMEPAGE=https://flexmock.readthedocs.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/flexmock/flexmock-0.10.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2461410c6065648b8726f753c3cdb36c
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.6 b/metadata/md5-cache/dev-python/flexmock-0.10.6
deleted file mode 100644
index 71cbd282424c..000000000000
--- a/metadata/md5-cache/dev-python/flexmock-0.10.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Testing library to create mocks, stubs and fakes
-EAPI=8
-HOMEPAGE=https://flexmock.readthedocs.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/flexmock/flexmock-0.10.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=047e72acd38631018e4b2227f34ba195
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.8 b/metadata/md5-cache/dev-python/flexmock-0.10.8
deleted file mode 100644
index 946f67f764f5..000000000000
--- a/metadata/md5-cache/dev-python/flexmock-0.10.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Testing library to create mocks, stubs and fakes
-EAPI=8
-HOMEPAGE=https://flexmock.readthedocs.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/flexmock/flexmock-0.10.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03da819c5c11e033bcf8249f3378b29e
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.9 b/metadata/md5-cache/dev-python/flexmock-0.10.9
index 5e323f0c8c6d..a86beb7207df 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.9
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.9
@@ -4,12 +4,12 @@ DESCRIPTION=Testing library to create mocks, stubs and fakes
 EAPI=8
 HOMEPAGE=https://flexmock.readthedocs.io/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv
+KEYWORDS=amd64 ~arm ~riscv
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/flexmock/flexmock-0.10.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=112f919b8cdb99dda3860aacb7322011
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4e05a9a0e5c8ad63cc84aa307a811866
diff --git a/metadata/md5-cache/dev-python/flit-2.1.0 b/metadata/md5-cache/dev-python/flit-2.1.0
index ec6120366b7b..c178e292f97a 100644
--- a/metadata/md5-cache/dev-python/flit-2.1.0
+++ b/metadata/md5-cache/dev-python/flit-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit/flit-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77225c7d7396fbecbc8487f5346c2fd7
diff --git a/metadata/md5-cache/dev-python/flit-3.2.0 b/metadata/md5-cache/dev-python/flit-3.2.0
index d769edf1b38a..ea627ff8a6c1 100644
--- a/metadata/md5-cache/dev-python/flit-3.2.0
+++ b/metadata/md5-cache/dev-python/flit-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit/flit-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=35f288c6aee6a469993b299f8fa88848
diff --git a/metadata/md5-cache/dev-python/flit-3.3.0-r1 b/metadata/md5-cache/dev-python/flit-3.3.0-r1
index 06e3040e16d5..59183863233b 100644
--- a/metadata/md5-cache/dev-python/flit-3.3.0-r1
+++ b/metadata/md5-cache/dev-python/flit-3.3.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=mirror://pypi/f/flit/flit-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e50735d9406976a75638afaf9f8fe35
diff --git a/metadata/md5-cache/dev-python/flit_core-2.1.0 b/metadata/md5-cache/dev-python/flit_core-2.1.0
index ee69cb4823de..2dcf7f98722f 100644
--- a/metadata/md5-cache/dev-python/flit_core-2.1.0
+++ b/metadata/md5-cache/dev-python/flit_core-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit_core/flit_core-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac04d3fed6f30e8316349a723d4ef2e8
diff --git a/metadata/md5-cache/dev-python/flit_core-3.2.0 b/metadata/md5-cache/dev-python/flit_core-3.2.0
index 1d6a2d8063d7..a7f4370aa6a2 100644
--- a/metadata/md5-cache/dev-python/flit_core-3.2.0
+++ b/metadata/md5-cache/dev-python/flit_core-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit_core/flit_core-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63cccf6d0d5ea30e9673782a3444412a
diff --git a/metadata/md5-cache/dev-python/flit_core-3.3.0 b/metadata/md5-cache/dev-python/flit_core-3.3.0
index 5f0faa140c4f..0cbb4aa3f201 100644
--- a/metadata/md5-cache/dev-python/flit_core-3.3.0
+++ b/metadata/md5-cache/dev-python/flit_core-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit_core/flit_core-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dfd845f59f4bdbeda7dea2e5fe0ed0d6
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1 b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
index 983e98c66ce1..4356011071aa 100644
--- a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
+++ b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.bounce/flufl.bounce-3.0.1.tar.gz -> flufl-bounce-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5287534a201b3623e956a1eaa45effd4
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-4.0 b/metadata/md5-cache/dev-python/flufl-bounce-4.0
index 961eddd2cc2c..23f7ef71d384 100644
--- a/metadata/md5-cache/dev-python/flufl-bounce-4.0
+++ b/metadata/md5-cache/dev-python/flufl-bounce-4.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/f/flufl.bounce/flufl.bounce-4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3896a1d78e7cbdcaa01cae0bf5ae436
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2 b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
index 87b695225dc0..102b8823ecc5 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
+++ b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?] python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-2.0.2.tar.gz -> flufl-i18n-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=febb595bae06f1ff358058033e8095a3
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-3.1.4 b/metadata/md5-cache/dev-python/flufl-i18n-3.1.4
index c2319257a880..1b5bbd752a22 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-3.1.4
+++ b/metadata/md5-cache/dev-python/flufl-i18n-3.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-3.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=debc9fd48b26b97b887b334fa78dfe3d
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-3.1.5 b/metadata/md5-cache/dev-python/flufl-i18n-3.1.5
index 16d1fe82857e..e64062bf44b5 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-3.1.5
+++ b/metadata/md5-cache/dev-python/flufl-i18n-3.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-3.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=debc9fd48b26b97b887b334fa78dfe3d
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-3.2 b/metadata/md5-cache/dev-python/flufl-i18n-3.2
index 3d82b071ea76..0771087701b6 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-3.2
+++ b/metadata/md5-cache/dev-python/flufl-i18n-3.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atpublic[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/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high level API for Python internationalization
 EAPI=7
 HOMEPAGE=https://gitlab.com/warsaw/flufl.i18n
-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=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/flufl.i18n/flufl.i18n-3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=debc9fd48b26b97b887b334fa78dfe3d
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=905bfd4634b0ee64ae90b00566158cc5
diff --git a/metadata/md5-cache/dev-python/flufl-lock-5.1 b/metadata/md5-cache/dev-python/flufl-lock-5.1
index f6ed24514ee8..ebee0d4be940 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-5.1
+++ b/metadata/md5-cache/dev-python/flufl-lock-5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2ebe18c324d9aab7b5a2228306042bb
diff --git a/metadata/md5-cache/dev-python/flufl-lock-6.0 b/metadata/md5-cache/dev-python/flufl-lock-6.0
index 73ec632ee94c..8e169823af96 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-6.0
+++ b/metadata/md5-cache/dev-python/flufl-lock-6.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/f/flufl.lock/flufl.lock-6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f1cd2cd8ea978ba3f8488048f34eeba
diff --git a/metadata/md5-cache/dev-python/flufl-testing-0.8 b/metadata/md5-cache/dev-python/flufl-testing-0.8
new file mode 100644
index 000000000000..e1904c2eda03
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flufl-testing-0.8
@@ -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=Small collection of test tool plugins
+EAPI=8
+HOMEPAGE=https://gitlab.com/warsaw/flufl.testing https://pypi.org/project/flufl.testing/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/nose2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/f/flufl.testing/flufl.testing-0.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=14a1aebdf450518c50016c6b757ee4ab
diff --git a/metadata/md5-cache/dev-python/fonttools-4.24.4-r1 b/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
index ecadcf8009de..8abecccda025 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
+++ b/metadata/md5-cache/dev-python/fonttools-4.24.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.4.tar.gz -> fonttools-4.24.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=41b8e9a0ee488f7fcb9ae99b735badb0
diff --git a/metadata/md5-cache/dev-python/fonttools-4.26.1-r1 b/metadata/md5-cache/dev-python/fonttools-4.26.1-r1
index 8af59d0dcb41..281950c582b8 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.26.1-r1
+++ b/metadata/md5-cache/dev-python/fonttools-4.26.1-r1
@@ -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/fonttools/fonttools/archive/4.26.1.tar.gz -> fonttools-4.26.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=c9acc9e8e55a55b8175f6fa7033bfa2a
diff --git a/metadata/md5-cache/dev-python/fonttools-4.26.2 b/metadata/md5-cache/dev-python/fonttools-4.26.2
index 26972ff8c9aa..b377c3600da6 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.26.2
+++ b/metadata/md5-cache/dev-python/fonttools-4.26.2
@@ -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/fonttools/fonttools/archive/4.26.2.tar.gz -> fonttools-4.26.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=12b2ada9eb74095f27cc750d2925fe0e
diff --git a/metadata/md5-cache/dev-python/fonttools-4.27.0 b/metadata/md5-cache/dev-python/fonttools-4.27.0
index 57e9384e3215..9a38a380df85 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.27.0
+++ b/metadata/md5-cache/dev-python/fonttools-4.27.0
@@ -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/fonttools/fonttools/archive/4.27.0.tar.gz -> fonttools-4.27.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=27656d727b10621a38c3f793bba369c1
diff --git a/metadata/md5-cache/dev-python/fonttools-4.27.1 b/metadata/md5-cache/dev-python/fonttools-4.27.1
index aa951f932880..2ee092852bf0 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.27.1
+++ b/metadata/md5-cache/dev-python/fonttools-4.27.1
@@ -4,12 +4,12 @@ DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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_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 ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.27.1.tar.gz -> fonttools-4.27.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=27656d727b10621a38c3f793bba369c1
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=a156a41b7e2387bfab2c9ba61e9d7e3a
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.1 b/metadata/md5-cache/dev-python/fqdn-1.5.1
index 0a5f4e83521b..acdd5cebe0c1 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.5.1
+++ b/metadata/md5-cache/dev-python/fqdn-1.5.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/ypcrts/fqdn/archive/v1.5.1.tar.gz -> fqdn-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28872a6d625fc324fd4f5f6b25195c20
diff --git a/metadata/md5-cache/dev-python/freezegun-1.1.0-r1 b/metadata/md5-cache/dev-python/freezegun-1.1.0-r1
index ef21fff80288..4cbc6fb98dff 100644
--- a/metadata/md5-cache/dev-python/freezegun-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/freezegun-1.1.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=mirror://pypi/f/freezegun/freezegun-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5157253f8b07915e255886b03e38b24
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.5.0 b/metadata/md5-cache/dev-python/fritzconnection-1.5.0
index 4ce4dddac725..5d999a886417 100644
--- a/metadata/md5-cache/dev-python/fritzconnection-1.5.0
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.5.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/kbr/fritzconnection/archive/1.5.0.tar.gz -> fritzconnection-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea471e9c476cde364c7f379c13b5a617
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.6.0 b/metadata/md5-cache/dev-python/fritzconnection-1.6.0
index a17155213040..4595f41cff04 100644
--- a/metadata/md5-cache/dev-python/fritzconnection-1.6.0
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kbr/fritzconnection/archive/1.6.0.tar.gz -> fritzconnection-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.7.0 b/metadata/md5-cache/dev-python/fritzconnection-1.7.0
new file mode 100644
index 000000000000..fd4634a9cd81
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[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=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
+EAPI=8
+HOMEPAGE=https://github.com/kbr/fritzconnection
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/kbr/fritzconnection/archive/1.7.0.tar.gz -> fritzconnection-1.7.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.18 b/metadata/md5-cache/dev-python/frozen-flask-0.18
index 9074772af73b..f1ceb0613712 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.18
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.18
@@ -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/F/Frozen-Flask/Frozen-Flask-0.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=677651ede6a6870c90ba47f2006a4f63
diff --git a/metadata/md5-cache/dev-python/fs-2.4.13 b/metadata/md5-cache/dev-python/fs-2.4.13
index 80c5c64d97eb..919354f28154 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.13
+++ b/metadata/md5-cache/dev-python/fs-2.4.13
@@ -4,12 +4,12 @@ DESCRIPTION=Filesystem abstraction layer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/fs/ https://docs.pyfilesystem.org https://www.willmcgugan.com/tag/fs/
 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 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[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/six-1.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(-)?] >=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/PyFilesystem/pyfilesystem2/archive/v2.4.13.tar.gz -> pyfilesystem2-2.4.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3abbcfd80b17d84bf61f848f39c8e257
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1364ba27401bdb91b95bf0d33e951ed5
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.07.0 b/metadata/md5-cache/dev-python/fsspec-2021.07.0
index b4139e8698b8..c121d220d5ae 100644
--- a/metadata/md5-cache/dev-python/fsspec-2021.07.0
+++ b/metadata/md5-cache/dev-python/fsspec-2021.07.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/intake/filesystem_spec/archive/2021.07.0.tar.gz -> filesystem_spec-2021.07.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a3eee16e0e43d380e316fbc14f98ab6
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.08.1 b/metadata/md5-cache/dev-python/fsspec-2021.08.1
index d7a459d89399..888d98f88710 100644
--- a/metadata/md5-cache/dev-python/fsspec-2021.08.1
+++ b/metadata/md5-cache/dev-python/fsspec-2021.08.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.08.1.tar.gz -> filesystem_spec-2021.08.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=282831ab9138d939fbab528b4ad441fa
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.09.0 b/metadata/md5-cache/dev-python/fsspec-2021.09.0
index 81f11b37be2d..6b6572036be7 100644
--- a/metadata/md5-cache/dev-python/fsspec-2021.09.0
+++ b/metadata/md5-cache/dev-python/fsspec-2021.09.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.09.0.tar.gz -> filesystem_spec-2021.09.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30cdcf501282b29aef79c6941ecc6967
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.1 b/metadata/md5-cache/dev-python/fudge-1.1.1
index bf93836cf194..5b32682fbd03 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.1
+++ b/metadata/md5-cache/dev-python/fudge-1.1.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/f/fudge/fudge-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0849b139cabf62c5bdd2a14f391c322b
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
index 1dad34db8e05..fc90a06da292 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7db4798c42ecdd919ec21c5ff3e730b3
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
index 65eb92656a8b..7e98f6c19ed0 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
@@ -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/vlasovskikh/funcparserlib/archive/d4ba3955ffc10544dbae6aaed68bcab21d0c294b.tar.gz -> funcparserlib-0.3.6_p20210809.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7caa3fc43a4f2a43661d26ba337f869
diff --git a/metadata/md5-cache/dev-python/funcy-1.16 b/metadata/md5-cache/dev-python/funcy-1.16
index fb4b52bc767f..a1b0bd790f7c 100644
--- a/metadata/md5-cache/dev-python/funcy-1.16
+++ b/metadata/md5-cache/dev-python/funcy-1.16
@@ -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/f/funcy/funcy-1.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=762dfd566e2d697cbb1e5285aaacc91f
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.0 b/metadata/md5-cache/dev-python/fuse-python-1.0.0
index 7957ec26741b..7e62cd98ea82 100644
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.0
+++ b/metadata/md5-cache/dev-python/fuse-python-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.0.tar.gz -> fuse-python-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0ed58ff87e92a3832fc10de5a06a6a8
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.4 b/metadata/md5-cache/dev-python/fuse-python-1.0.4
index 1824224cd9fb..4550bd955c86 100644
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.4
+++ b/metadata/md5-cache/dev-python/fuse-python-1.0.4
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.4.tar.gz -> python-fuse-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0505aa6f8b763a389a967034c48d798c
diff --git a/metadata/md5-cache/dev-python/fusepy-3.0.1 b/metadata/md5-cache/dev-python/fusepy-3.0.1
index 8e008626690e..f95187085e58 100644
--- a/metadata/md5-cache/dev-python/fusepy-3.0.1
+++ b/metadata/md5-cache/dev-python/fusepy-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.9.7:0 !dev-python/fuse-python python_targets_python3_8?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fusepy/fusepy-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0e0be3916da6b778916bc5f5fc54668
diff --git a/metadata/md5-cache/dev-python/future-0.18.2-r1 b/metadata/md5-cache/dev-python/future-0.18.2-r1
index 2282371f1255..7629785d4ff2 100644
--- a/metadata/md5-cache/dev-python/future-0.18.2-r1
+++ b/metadata/md5-cache/dev-python/future-0.18.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.18.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7f216177eac1717a2e2fbc24f6727c2
diff --git a/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0 b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
index 34b8e161562a..58fddf4da190 100644
--- a/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
+++ b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.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/f/fuzzywuzzy/fuzzywuzzy-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=632eafa4db56d20ce8d7afc23beadb39
diff --git a/metadata/md5-cache/dev-python/gast-0.5.2 b/metadata/md5-cache/dev-python/gast-0.5.2
index d63d045debc9..a12312a2bbfd 100644
--- a/metadata/md5-cache/dev-python/gast-0.5.2
+++ b/metadata/md5-cache/dev-python/gast-0.5.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/g/gast/gast-0.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13e4aac585496c2d01507db1a5354024
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
index fbf0f379e6a2..1b8fc5915cc3 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36eb1ae11da50a9246d2b3219fc0367a
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
index fc26aaed3ec3..65adff1224c4 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9883bd0bd28d74a8217a1bc55e6e8c0
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.5 b/metadata/md5-cache/dev-python/genshi-0.7.5
index b4a3c8746c7c..03902de5f251 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.5
+++ b/metadata/md5-cache/dev-python/genshi-0.7.5
@@ -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/G/Genshi/Genshi-0.7.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1924635b7add11edc938d47dae2ad3f1
diff --git a/metadata/md5-cache/dev-python/genson-1.1.0 b/metadata/md5-cache/dev-python/genson-1.1.0
index d3de5976573d..a5be0b4f1d77 100644
--- a/metadata/md5-cache/dev-python/genson-1.1.0
+++ b/metadata/md5-cache/dev-python/genson-1.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/g/genson/genson-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8cf4a567f29240701e91fa57b6982e7b
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2-r1 b/metadata/md5-cache/dev-python/genty-1.3.2-r1
index 771974100954..83ee3c7c9839 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/genty-1.3.2-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/g/genty/genty-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=407be2aa089d83ef879242fc300a575d
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index 73ac600772bc..304b67f5fa6c 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-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/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fa485e9552e90216bc8f56d9723ef9e
diff --git a/metadata/md5-cache/dev-python/gevent-21.1.2 b/metadata/md5-cache/dev-python/gevent-21.1.2
index 214be3552af8..a1a6000b9039 100644
--- a/metadata/md5-cache/dev-python/gevent-21.1.2
+++ b/metadata/md5-cache/dev-python/gevent-21.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=mirror://pypi/g/gevent/gevent-21.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c12708572105770b8989ffda335ecb1e
diff --git a/metadata/md5-cache/dev-python/gevent-21.8.0 b/metadata/md5-cache/dev-python/gevent-21.8.0
index 063df73dc9da..b3335be2c4f5 100644
--- a/metadata/md5-cache/dev-python/gevent-21.8.0
+++ b/metadata/md5-cache/dev-python/gevent-21.8.0
@@ -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/g/gevent/gevent-21.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e2617b5465e739ad7f889f6fb6a9a24
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1 b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
index f34fb438dba0..14c068796475 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fcc8dd74c8571db159cac6e6fc1831a
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
index 3aace60b70c4..4f333fd72d7e 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.5
@@ -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/g/geventhttpclient/geventhttpclient-1.4.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4e5171abd40bd525fe8708588908992
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.5.1 b/metadata/md5-cache/dev-python/geventhttpclient-1.5.1
index f20f0a78e4fd..58f9e5a936af 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.5.1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.5.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/g/geventhttpclient/geventhttpclient-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c98012eb1db422cb7ac81df8d252000
diff --git a/metadata/md5-cache/dev-python/ghp-import-2.0.1 b/metadata/md5-cache/dev-python/ghp-import-2.0.1
index c26bef5d3b8e..bd6557d816a0 100644
--- a/metadata/md5-cache/dev-python/ghp-import-2.0.1
+++ b/metadata/md5-cache/dev-python/ghp-import-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/ghp-import/ghp-import-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ed5c8c7992bc212425e66f3bea2ea57
diff --git a/metadata/md5-cache/dev-python/git-review-1.28.0 b/metadata/md5-cache/dev-python/git-review-1.28.0
index 27559c6188da..43bd8c657709 100644
--- a/metadata/md5-cache/dev-python/git-review-1.28.0
+++ b/metadata/md5-cache/dev-python/git-review-1.28.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_8(-)?] dev-python/six[p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.28.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ab923e4564cd1eaca758895c816476f
diff --git a/metadata/md5-cache/dev-python/git-review-2.1.0 b/metadata/md5-cache/dev-python/git-review-2.1.0
index 7f7093b0aaea..681d386bf1b9 100644
--- a/metadata/md5-cache/dev-python/git-review-2.1.0
+++ b/metadata/md5-cache/dev-python/git-review-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74c3ca57da78cdedfdd71161e3931920
diff --git a/metadata/md5-cache/dev-python/gitdb-4.0.7 b/metadata/md5-cache/dev-python/gitdb-4.0.7
index e1e6fc86add4..676674bbcd0e 100644
--- a/metadata/md5-cache/dev-python/gitdb-4.0.7
+++ b/metadata/md5-cache/dev-python/gitdb-4.0.7
@@ -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/g/gitdb/gitdb-4.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0569d50af5c14fadd1710aa81e3a2292
diff --git a/metadata/md5-cache/dev-python/github3-1.3.0 b/metadata/md5-cache/dev-python/github3-1.3.0
index d40f9b65e563..9674f06caf9f 100644
--- a/metadata/md5-cache/dev-python/github3-1.3.0
+++ b/metadata/md5-cache/dev-python/github3-1.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/sigmavirus24/github3.py/archive/1.3.0.tar.gz -> github3-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e069a54dedd7adc899c24a41cd20ce0
diff --git a/metadata/md5-cache/dev-python/glooey-0.3.4-r1 b/metadata/md5-cache/dev-python/glooey-0.3.4-r1
index 5d8ff4405d35..f9e51aabfdff 100644
--- a/metadata/md5-cache/dev-python/glooey-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/glooey-0.3.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/glooey/glooey-0.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=153e335a171643d037272f0723adb8ac
diff --git a/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5 b/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
index 39602cad19ad..6b4abb8b2c45 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
+++ b/metadata/md5-cache/dev-python/gmpy-2.1.0_beta5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp:0= python_ta
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.1.0b5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69b5bc52dca1456ebc08204848a03830
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.31.2 b/metadata/md5-cache/dev-python/google-api-core-1.31.2
index bf93a22c4fdd..ae854f30f7da 100644
--- a/metadata/md5-cache/dev-python/google-api-core-1.31.2
+++ b/metadata/md5-cache/dev-python/google-api-core-1.31.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/googleapis/python-api-core/archive/v1.31.2.tar.gz -> google-api-core-1.31.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3625f4be06f0bdc7bfc16d3d73df2d8
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.0.0 b/metadata/md5-cache/dev-python/google-api-core-2.0.0
index 7ded4358feab..4ca53f150064 100644
--- a/metadata/md5-cache/dev-python/google-api-core-2.0.0
+++ b/metadata/md5-cache/dev-python/google-api-core-2.0.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/googleapis/python-api-core/archive/v2.0.0.tar.gz -> google-api-core-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc2ad44787b469c4c06d3905329a0298
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.0.1 b/metadata/md5-cache/dev-python/google-api-core-2.0.1
index 5960148c3d66..83c8de2c5e9c 100644
--- a/metadata/md5-cache/dev-python/google-api-core-2.0.1
+++ b/metadata/md5-cache/dev-python/google-api-core-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/python-api-core/archive/v2.0.1.tar.gz -> google-api-core-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc2ad44787b469c4c06d3905329a0298
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.14.1 b/metadata/md5-cache/dev-python/google-api-python-client-2.14.1
deleted file mode 100644
index f2b903bf7733..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.14.1.tar.gz -> google-api-python-client-2.14.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7bcd958f069573ad4a8a6399efd32d7
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.18.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.18.0
deleted file mode 100644
index 843ede2d3005..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.18.0.tar.gz -> google-api-python-client-2.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.19.1 b/metadata/md5-cache/dev-python/google-api-python-client-2.19.1
index fa188827f32b..dcbc3cd4e775 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.19.1
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.19.1
@@ -4,12 +4,12 @@ DESCRIPTION=Google API Client for Python
 EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-api-python-client
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.19.1.tar.gz -> google-api-python-client-2.19.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=519f5e2c7aa7b5ca36ba406f7d94b040
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.20.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.20.0
index 8431b7096e1b..a3274574c7e0 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.20.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.20.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/googleapis/google-api-python-client/archive/v2.20.0.tar.gz -> google-api-python-client-2.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.21.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.21.0
index b9873c06b29b..6bc9d8064a8e 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.21.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.21.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/googleapis/google-api-python-client/archive/v2.21.0.tar.gz -> google-api-python-client-2.21.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.22.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.22.0
index 10956339c94f..4a0791f7634e 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.22.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.22.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/googleapis/google-api-python-client/archive/v2.22.0.tar.gz -> google-api-python-client-2.22.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.23.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.23.0
new file mode 100644
index 000000000000..ce982eb99da2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.23.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.23.0.tar.gz -> google-api-python-client-2.23.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.31 b/metadata/md5-cache/dev-python/google-apitools-0.5.31
index f43bde96e869..966c3869f86f 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.31
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.31
@@ -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/google/apitools/archive/v0.5.31.tar.gz -> google-apitools-0.5.31.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b50b68dd42b2aee035b49a8e5c8a5326
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.32 b/metadata/md5-cache/dev-python/google-apitools-0.5.32
index 3d25e96d35d8..bf3023126d35 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.32
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.32
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.32.tar.gz -> google-apitools-0.5.32.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f80159060133e2adce95707beb2e4c8a
diff --git a/metadata/md5-cache/dev-python/google-auth-1.34.0 b/metadata/md5-cache/dev-python/google-auth-1.34.0
deleted file mode 100644
index 792a2faa6311..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.34.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.34.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35aac36ea3b027fc1589314f8c24e25e
diff --git a/metadata/md5-cache/dev-python/google-auth-2.0.1 b/metadata/md5-cache/dev-python/google-auth-2.0.1
deleted file mode 100644
index 8dfc91cd136b..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.0.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/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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/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/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f4be6b82d9bf907acde91702ae062c0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.0.2 b/metadata/md5-cache/dev-python/google-auth-2.0.2
index e875f6b64038..fa0f19d69d86 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.0.2
+++ b/metadata/md5-cache/dev-python/google-auth-2.0.2
@@ -4,12 +4,12 @@ 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/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f4be6b82d9bf907acde91702ae062c0
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fe145752b61ec75a8a03df40e32209d0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.1.0 b/metadata/md5-cache/dev-python/google-auth-2.1.0
index e562bd20650b..6d5cee035758 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f4be6b82d9bf907acde91702ae062c0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.2.0 b/metadata/md5-cache/dev-python/google-auth-2.2.0
new file mode 100644
index 000000000000..b6aff0115331
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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/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/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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-2.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1f4be6b82d9bf907acde91702ae062c0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.2.1 b/metadata/md5-cache/dev-python/google-auth-2.2.1
new file mode 100644
index 000000000000..b5d87d561fbd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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/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/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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-2.2.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1f4be6b82d9bf907acde91702ae062c0
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0
index 90a6c9b43f28..3fcd0600a2e9 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-auth-library-python-httplib2/archive/v0.1.0.tar.gz -> google-auth-library-python-httplib2-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fb282fb9c65b4d76a6debed8ade4cb1
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
index 8d243ed658d1..2c8e29c04d0c 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/google-auth-oauthlib/google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a45cfda6ac04226a0af3f02aa2f3c92
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3
index bb6a2b7239b7..c78cf8537fdb 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.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/googleapis/google-auth-library-python-oauthlib/archive/v0.4.3.tar.gz -> google-auth-library-python-oauthlib-0.4.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b57072adfbef0f4985a82f7cce1f5cd2
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4
index e80641c9f714..d59e958043ed 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.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/googleapis/google-auth-library-python-oauthlib/archive/v0.4.4.tar.gz -> google-auth-library-python-oauthlib-0.4.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b57072adfbef0f4985a82f7cce1f5cd2
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
index d5143316840d..39bbb9cede39 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.5.tar.gz -> google-auth-library-python-oauthlib-0.4.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4f76d464ca2b993ee8ad0032f090ec3
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6
index 14c7180386dd..70a4f317ab5d 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.6.tar.gz -> google-auth-library-python-oauthlib-0.4.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4f76d464ca2b993ee8ad0032f090ec3
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.2.0 b/metadata/md5-cache/dev-python/google-pasta-0.2.0
index 9a3840f2077b..f57d31b9e01e 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.2.0
+++ b/metadata/md5-cache/dev-python/google-pasta-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? (
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6fb90e6f19af1d9178fde98062b852f
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.2.0-r1 b/metadata/md5-cache/dev-python/google-pasta-0.2.0-r1
index 7c412c2911e7..12acc916f231 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/google-pasta-0.2.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/g/google-pasta/google-pasta-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9528cc95a0fb8d19c0e57f3fdc0171f
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
index f6bf28119b4c..ed096a866bd0 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cab9889d9d5ccaeab094131a926a1ee8
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.1 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.1
index 60ed5a2e31fd..6a4b1e419a99 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.1
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.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/google/google-reauth-python/archive/0.1.1.tar.gz -> google-reauth-python-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58f9f8ecc2c03da478a0c9fb753c1dbb
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.53.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.53.0
index 572977d7aa87..f6713a2980ac 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.53.0
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.53.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.53.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=915bf7f975e9c97bd6f903609ac8f2a3
diff --git a/metadata/md5-cache/dev-python/graphviz-0.17 b/metadata/md5-cache/dev-python/graphviz-0.17
index 4586a493bfbc..5c8f1255dd6a 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.17
+++ b/metadata/md5-cache/dev-python/graphviz-0.17
@@ -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/g/graphviz/graphviz-0.17.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9eae885630b9c3f424eae6fc941c4906
diff --git a/metadata/md5-cache/dev-python/greenlet-1.1.0 b/metadata/md5-cache/dev-python/greenlet-1.1.0
index 1d66941068e6..d82682e5a78e 100644
--- a/metadata/md5-cache/dev-python/greenlet-1.1.0
+++ b/metadata/md5-cache/dev-python/greenlet-1.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/g/greenlet/greenlet-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc8b0ba4d8724c8b5b21fbe47081f4b0
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5b6c0dc379c424cc6657548b987677e
diff --git a/metadata/md5-cache/dev-python/greenlet-1.1.2 b/metadata/md5-cache/dev-python/greenlet-1.1.2
new file mode 100644
index 000000000000..43dad0e1dd0c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/greenlet-1.1.2
@@ -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(-)] ) ) ) 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=Lightweight in-process concurrent programming
+EAPI=8
+HOMEPAGE=https://pypi.org/project/greenlet/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/greenlet/greenlet-1.1.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dda14948bcf247c4f46ba33f50a959d2
diff --git a/metadata/md5-cache/dev-python/greenstalk-1.0.1 b/metadata/md5-cache/dev-python/greenstalk-1.0.1
index 4b5b8fae51ac..8b8df3b94652 100644
--- a/metadata/md5-cache/dev-python/greenstalk-1.0.1
+++ b/metadata/md5-cache/dev-python/greenstalk-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/justinmayhew/greenstalk/archive/v1.0.1.tar.gz -> greenstalk-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb65e3f7e8447fa1690f95a8d1eb069b
diff --git a/metadata/md5-cache/dev-python/grpcio-1.38.1 b/metadata/md5-cache/dev-python/grpcio-1.38.1
index 36b19eb43826..5e7577d32e29 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.38.1
+++ b/metadata/md5-cache/dev-python/grpcio-1.38.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist(-)] >=dev-libs/re2-0.2021.04.01:= >
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.38.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81641df13b048b69e3a1f1abce88620d
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.38.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.38.1
index b5972304d850..ea892c74b2ed 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.38.1
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.38.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.38.1[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.38.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60e15bcc08fb07d559e8f3f53208e32b
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.38.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.38.1
index 264188da8b06..c689394e03b4 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.38.1
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.38.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.38.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=320ea4e70a29232ff5a994aa35d8364c
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.1 b/metadata/md5-cache/dev-python/gsd-2.4.1
index ce2dfca766bb..2a07539f39e2 100644
--- a/metadata/md5-cache/dev-python/gsd-2.4.1
+++ b/metadata/md5-cache/dev-python/gsd-2.4.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/glotzerlab/gsd/releases/download/v2.4.1/gsd-v2.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=041dd536d1959172b1be85d62cd62759
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.2 b/metadata/md5-cache/dev-python/gsd-2.4.2
index 12dbbe8bdd1f..beaef3501577 100644
--- a/metadata/md5-cache/dev-python/gsd-2.4.2
+++ b/metadata/md5-cache/dev-python/gsd-2.4.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/glotzerlab/gsd/releases/download/v2.4.2/gsd-v2.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26fd2315d87fa43ec619097ecfe396eb
diff --git a/metadata/md5-cache/dev-python/gssapi-1.6.12 b/metadata/md5-cache/dev-python/gssapi-1.6.12
index 0042a05dbd2a..c30f82e91d71 100644
--- a/metadata/md5-cache/dev-python/gssapi-1.6.12
+++ b/metadata/md5-cache/dev-python/gssapi-1.6.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gssapi/gssapi-1.6.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc41ca5b07576531d98451b0cc3dee90
diff --git a/metadata/md5-cache/dev-python/guessit-3.3.1 b/metadata/md5-cache/dev-python/guessit-3.3.1
index b7d64ef960cf..f57556f3f379 100644
--- a/metadata/md5-cache/dev-python/guessit-3.3.1
+++ b/metadata/md5-cache/dev-python/guessit-3.3.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/g/guessit/guessit-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b070cdd99b98220b6a620be8a07d9fd7
diff --git a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1 b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
index 5c726b2f74f3..5215736bf279 100644
--- a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
+++ b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca8f8de0bbb90ab9c4ab6fddb9a88817
diff --git a/metadata/md5-cache/dev-python/h11-0.12.0 b/metadata/md5-cache/dev-python/h11-0.12.0
index 5b13d30af746..d64afbdd3c26 100644
--- a/metadata/md5-cache/dev-python/h11-0.12.0
+++ b/metadata/md5-cache/dev-python/h11-0.12.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/h/h11/h11-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0be4cb0d333bc0de7019f44291f3eeb2
diff --git a/metadata/md5-cache/dev-python/h5py-3.3.0 b/metadata/md5-cache/dev-python/h5py-3.3.0
index ed98ad70f748..1d23b91c65b1 100644
--- a/metadata/md5-cache/dev-python/h5py-3.3.0
+++ b/metadata/md5-cache/dev-python/h5py-3.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=mirror://pypi/h/h5py/h5py-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f6b1d326c21407212807120fde8377d
diff --git a/metadata/md5-cache/dev-python/hacking-4.1.0 b/metadata/md5-cache/dev-python/hacking-4.1.0
index 621c86d18462..ea494b9e06a8 100644
--- a/metadata/md5-cache/dev-python/hacking-4.1.0
+++ b/metadata/md5-cache/dev-python/hacking-4.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/h/hacking/hacking-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=accbe8a8f0ed8d3d40f542e00028c182
diff --git a/metadata/md5-cache/dev-python/happybase-0.9_p20210701 b/metadata/md5-cache/dev-python/happybase-0.9_p20210701
index 57233f1e52d6..17841a2e63a5 100644
--- a/metadata/md5-cache/dev-python/happybase-0.9_p20210701
+++ b/metadata/md5-cache/dev-python/happybase-0.9_p20210701
@@ -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/python-happybase/happybase/archive/f5b6d104140c2be93e4175c0c844aaf094eb43da.tar.gz -> happybase-0.9_p20210701.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed98749cbb42e1fd961d89029089e848
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.16.0 b/metadata/md5-cache/dev-python/hcloud-python-1.16.0
index 587585104c02..b374827e8192 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.16.0
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.16.0.tar.gz -> hcloud-python-1.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9dd0a88cd95b9e6a586c0674ad0b8fb
diff --git a/metadata/md5-cache/dev-python/helpdev-0.7.1 b/metadata/md5-cache/dev-python/helpdev-0.7.1
index cf6bdc48df3b..9d584a4df3b7 100644
--- a/metadata/md5-cache/dev-python/helpdev-0.7.1
+++ b/metadata/md5-cache/dev-python/helpdev-0.7.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/h/helpdev/helpdev-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54a4bbba78815eff26d41d9a6a9e14a2
diff --git a/metadata/md5-cache/dev-python/hiredis-2.0.0 b/metadata/md5-cache/dev-python/hiredis-2.0.0
index 00205525a613..ad4861b1b2f8 100644
--- a/metadata/md5-cache/dev-python/hiredis-2.0.0
+++ b/metadata/md5-cache/dev-python/hiredis-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=system-libs? ( dev-libs/hiredis:0/1.0.0 ) python_targets_pypy3? ( >=dev-
 REQUIRED_USE=|| ( python_targets_pypy3 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4fd65b48016af1b2e81fb00355b047e
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index 6af8dba1664e..f987239e5214 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31ee861144ded91773516edad166c9d4
diff --git a/metadata/md5-cache/dev-python/hpack-4.0.0 b/metadata/md5-cache/dev-python/hpack-4.0.0
index 30c813e7c716..0ba08286aa58 100644
--- a/metadata/md5-cache/dev-python/hpack-4.0.0
+++ b/metadata/md5-cache/dev-python/hpack-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v4.0.0.tar.gz -> hpack-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3cfbe16b9ef90ddaf6180288cfb274b
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
index f7e868850e8a..f526b1620890 100644
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
@@ -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/h/html2text/html2text-2020.1.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e090e3d091c52b462674f900858b769
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.10 b/metadata/md5-cache/dev-python/html5-parser-0.4.10
index 5ae819d22813..34c44988f660 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.10
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.10
@@ -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/h/html5-parser/html5-parser-0.4.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba4040b5a4346cc245ba5e8159070a3c
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.9 b/metadata/md5-cache/dev-python/html5-parser-0.4.9
index 04f955bf3559..dfca9c6af00f 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.9
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.9
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python3_8(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b039ef5924c20ed10ce73bfab4dab96
diff --git a/metadata/md5-cache/dev-python/html5lib-1.1 b/metadata/md5-cache/dev-python/html5lib-1.1
index d3d805f005b8..d87dd958f315 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.1
@@ -4,12 +4,12 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=7
 HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[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/h/html5lib/html5lib-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=13f0b4459160301dd2b9818ece96727f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=46239e55ebbed7c1b50c4a2efd4b8910
diff --git a/metadata/md5-cache/dev-python/httmock-1.4.0 b/metadata/md5-cache/dev-python/httmock-1.4.0
index ed82cd50d48f..c990f06dfaee 100644
--- a/metadata/md5-cache/dev-python/httmock-1.4.0
+++ b/metadata/md5-cache/dev-python/httmock-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patrys/httmock/archive/1.4.0.tar.gz -> httmock-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f45f4b4f4bdcaa0adbca41ef6cb72b86
diff --git a/metadata/md5-cache/dev-python/http-parser-0.9.0 b/metadata/md5-cache/dev-python/http-parser-0.9.0
index b9c44aa6b801..00adb5db05b6 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.9.0
+++ b/metadata/md5-cache/dev-python/http-parser-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benoitc/http-parser/archive/0.9.0.tar.gz -> http-parser-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8be7d75a1fd42f82e43871412c6dee6f
diff --git a/metadata/md5-cache/dev-python/httpauth-0.3 b/metadata/md5-cache/dev-python/httpauth-0.3
index f6931f877c12..225d93a922d9 100644
--- a/metadata/md5-cache/dev-python/httpauth-0.3
+++ b/metadata/md5-cache/dev-python/httpauth-0.3
@@ -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/h/httpauth/httpauth-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bedc8058204a80b8be586f0d46b51186
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
index 1958ba982d87..0aaa00aa86e0 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
@@ -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/h/httpbin/httpbin-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=06d0ffb88071d7bcd8e22d15a0356a94
diff --git a/metadata/md5-cache/dev-python/httpcore-0.12.3 b/metadata/md5-cache/dev-python/httpcore-0.12.3
index ddf7185c2fa1..af23982ca4e8 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.12.3
+++ b/metadata/md5-cache/dev-python/httpcore-0.12.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/encode/httpcore/archive/0.12.3.tar.gz -> httpcore-0.12.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c92ea31825f485c048c1023d043d97d
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.0 b/metadata/md5-cache/dev-python/httpcore-0.13.0
index 0f37ea8726c7..98e714ada206 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.0
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.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/encode/httpcore/archive/0.13.0.tar.gz -> httpcore-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.1 b/metadata/md5-cache/dev-python/httpcore-0.13.1
index 72e4f9fe124c..538026490f7e 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.1
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.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/encode/httpcore/archive/0.13.1.tar.gz -> httpcore-0.13.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.2 b/metadata/md5-cache/dev-python/httpcore-0.13.2
index 2e2cce8ed8ae..4278964f3f46 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.2
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.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/encode/httpcore/archive/0.13.2.tar.gz -> httpcore-0.13.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.3 b/metadata/md5-cache/dev-python/httpcore-0.13.3
index 94a4f34b9aef..cc0e5c0b5794 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.3
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.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/encode/httpcore/archive/0.13.3.tar.gz -> httpcore-0.13.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4dc33d12b9499cd13d40376539a52995
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.6 b/metadata/md5-cache/dev-python/httpcore-0.13.6
index 7f642b852f3a..89d5be017007 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.6
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.6
@@ -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/encode/httpcore/archive/0.13.6.tar.gz -> httpcore-0.13.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a17ee04dfa021873be7c944d4a8265a
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.7 b/metadata/md5-cache/dev-python/httpcore-0.13.7
index 1db951e1e142..131e8588b28f 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.7
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.7
@@ -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/encode/httpcore/archive/0.13.7.tar.gz -> httpcore-0.13.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a4002636fb5f64767cc33371f715b9a
diff --git a/metadata/md5-cache/dev-python/httplib2-0.19.1 b/metadata/md5-cache/dev-python/httplib2-0.19.1
index af4cdf37b911..f185aaa3feaa 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.19.1
+++ b/metadata/md5-cache/dev-python/httplib2-0.19.1
@@ -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/h/httplib2/httplib2-0.19.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ae65884cee25514f90808c091dd7c4e
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.4 b/metadata/md5-cache/dev-python/httpretty-1.1.4
index f0bd1a29de23..f991db5af57e 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.1.4
+++ b/metadata/md5-cache/dev-python/httpretty-1.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a43bb4fd25671e7c38de3d5715cb0fea
diff --git a/metadata/md5-cache/dev-python/httpx-0.19.0 b/metadata/md5-cache/dev-python/httpx-0.19.0
index 297ca1cec1dc..734329f999df 100644
--- a/metadata/md5-cache/dev-python/httpx-0.19.0
+++ b/metadata/md5-cache/dev-python/httpx-0.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.19.0.tar.gz -> httpx-0.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=761ff1d8b93c5810e453004194b45aa5
diff --git a/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18 b/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
deleted file mode 100644
index 48ede234d59f..000000000000
--- a/metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/dicttoxml[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/xmltodict[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=API For huawei LAN/WAN LTE Modems
-EAPI=7
-HOMEPAGE=https://github.com/Salamek/huawei-lte-api
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/dicttoxml[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/xmltodict[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/Salamek/huawei-lte-api/archive/1.4.18.tar.gz -> huawei-lte-api-1.4.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82e25b8e709e7eb9adfdf28cc51d77a6
diff --git a/metadata/md5-cache/dev-python/huawei-lte-api-1.5 b/metadata/md5-cache/dev-python/huawei-lte-api-1.5
deleted file mode 100644
index 5a1f503829f5..000000000000
--- a/metadata/md5-cache/dev-python/huawei-lte-api-1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[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/xmltodict[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=API For huawei LAN/WAN LTE Modems
-EAPI=8
-HOMEPAGE=https://github.com/Salamek/huawei-lte-api
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/pycryptodome[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/xmltodict[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/Salamek/huawei-lte-api/archive/1.5.tar.gz -> huawei-lte-api-1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cdd9724652cfdc554e653d22a9f52688
diff --git a/metadata/md5-cache/dev-python/huawei-lte-api-1.5.2 b/metadata/md5-cache/dev-python/huawei-lte-api-1.5.2
index 06a69ede08db..d96674b6ec22 100644
--- a/metadata/md5-cache/dev-python/huawei-lte-api-1.5.2
+++ b/metadata/md5-cache/dev-python/huawei-lte-api-1.5.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/Salamek/huawei-lte-api/archive/1.5.2.tar.gz -> huawei-lte-api-1.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fabbd29f69f38ab20e8a599127e861f5
diff --git a/metadata/md5-cache/dev-python/humanfriendly-10.0 b/metadata/md5-cache/dev-python/humanfriendly-10.0
index 13b71340dd3d..5d84b1dc3ab0 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-10.0
+++ b/metadata/md5-cache/dev-python/humanfriendly-10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=727a5b9761d5338db8ce3f52681f18b9
diff --git a/metadata/md5-cache/dev-python/humanfriendly-8.2 b/metadata/md5-cache/dev-python/humanfriendly-8.2
index 95de7b7c2638..444d24c2b84f 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-8.2
+++ b/metadata/md5-cache/dev-python/humanfriendly-8.2
@@ -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/h/humanfriendly/humanfriendly-8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30bda4208e8e382ffbd9261d2ab5e470
diff --git a/metadata/md5-cache/dev-python/humanfriendly-9.1 b/metadata/md5-cache/dev-python/humanfriendly-9.1
index 4c8409c98b93..0b82924a9bdc 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-9.1
+++ b/metadata/md5-cache/dev-python/humanfriendly-9.1
@@ -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/h/humanfriendly/humanfriendly-9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=018ba1599ba5abc71c7b6289d73f4bff
diff --git a/metadata/md5-cache/dev-python/humanfriendly-9.2 b/metadata/md5-cache/dev-python/humanfriendly-9.2
index 040d48f52c54..f6647bf927f4 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-9.2
+++ b/metadata/md5-cache/dev-python/humanfriendly-9.2
@@ -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/h/humanfriendly/humanfriendly-9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c1c5e829ba62a7b6a8e6663a09bf4b1
diff --git a/metadata/md5-cache/dev-python/humanize-3.11.0 b/metadata/md5-cache/dev-python/humanize-3.11.0
index a76bb9d9ac90..2cba3350796d 100644
--- a/metadata/md5-cache/dev-python/humanize-3.11.0
+++ b/metadata/md5-cache/dev-python/humanize-3.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanize/humanize-3.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0223c79852d3a5bb1b58dbac8f248429
diff --git a/metadata/md5-cache/dev-python/hvac-0.11.2 b/metadata/md5-cache/dev-python/hvac-0.11.2
index 7a621b9cbfae..ae4716166e96 100644
--- a/metadata/md5-cache/dev-python/hvac-0.11.2
+++ b/metadata/md5-cache/dev-python/hvac-0.11.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/hvac/hvac/archive/v0.11.2.tar.gz -> hvac-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=141860b4e65930390ac39685106b1237
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.2.0 b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
index 37840e7d3aa0..ce3a90c43230 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.2.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.2.0.tar.gz -> hyper-h2-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db9a3e9a307d73dc8d2937f93052a451
diff --git a/metadata/md5-cache/dev-python/hyper-h2-4.0.0 b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
index be146a916b14..0882ff243c2a 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-4.0.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v4.0.0.tar.gz -> hyper-h2-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fff70342a3da06df1ae3d1801bcd3ab
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.2.0 b/metadata/md5-cache/dev-python/hyperframe-5.2.0
index 57ed95584f3b..1a2efc188e54 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.2.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.2.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/h/hyperframe/hyperframe-5.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6b4cccb5a9e4843d8fb366bf063fc77
diff --git a/metadata/md5-cache/dev-python/hyperframe-6.0.1 b/metadata/md5-cache/dev-python/hyperframe-6.0.1
index 57564ec4a809..bdf769b5311e 100644
--- a/metadata/md5-cache/dev-python/hyperframe-6.0.1
+++ b/metadata/md5-cache/dev-python/hyperframe-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-6.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6b4cccb5a9e4843d8fb366bf063fc77
diff --git a/metadata/md5-cache/dev-python/hyperlink-21.0.0 b/metadata/md5-cache/dev-python/hyperlink-21.0.0
index 70a927649557..37124db14ee4 100644
--- a/metadata/md5-cache/dev-python/hyperlink-21.0.0
+++ b/metadata/md5-cache/dev-python/hyperlink-21.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-21.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=715d2007a2ff061841d208af1ac3cfee
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.5 b/metadata/md5-cache/dev-python/hypothesis-6.14.5
deleted file mode 100644
index 36d2e2e30c30..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d9c3b1785003b5afbfa20d665f253e1
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.9 b/metadata/md5-cache/dev-python/hypothesis-6.14.9
deleted file mode 100644
index 48d748864065..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cdaecf1681a7634538ca5e9b47917683
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.17.4 b/metadata/md5-cache/dev-python/hypothesis-6.17.4
index a3c4ea104a95..961b3b2f4c28 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.17.4
+++ b/metadata/md5-cache/dev-python/hypothesis-6.17.4
@@ -4,12 +4,12 @@ DESCRIPTION=A library for property based testing
 EAPI=8
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.17.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b123675b63bca072c5d90e163a8637ab
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e786c523988d9b183fcf7458994740b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.21.6 b/metadata/md5-cache/dev-python/hypothesis-6.21.6
index 471593b7455d..cbfee372c038 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.21.6
+++ b/metadata/md5-cache/dev-python/hypothesis-6.21.6
@@ -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.21.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.22.0 b/metadata/md5-cache/dev-python/hypothesis-6.22.0
index 2dd946902a5d..081e1ee6ef09 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.22.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.22.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/HypothesisWorks/hypothesis/archive/hypothesis-python-6.22.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.23.0 b/metadata/md5-cache/dev-python/hypothesis-6.23.0
new file mode 100644
index 000000000000..66bf325231a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.23.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.23.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.23.1 b/metadata/md5-cache/dev-python/hypothesis-6.23.1
new file mode 100644
index 000000000000..89fbcfd87994
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.23.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.23.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.7 b/metadata/md5-cache/dev-python/icalendar-4.0.7
index ef5dd16fc489..0c9fda32c387 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.0.7
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.7
@@ -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/icalendar/icalendar-4.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63d15e476e6ecbaff4528c9219e1312b
diff --git a/metadata/md5-cache/dev-python/identify-2.2.13 b/metadata/md5-cache/dev-python/identify-2.2.13
index ee7080785788..9b0df017aa51 100644
--- a/metadata/md5-cache/dev-python/identify-2.2.13
+++ b/metadata/md5-cache/dev-python/identify-2.2.13
@@ -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/pre-commit/identify/archive/refs/tags/v2.2.13.tar.gz -> identify-2.2.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=255cfdb74c8cb5f9ee70d7cd6e8bf865
diff --git a/metadata/md5-cache/dev-python/identify-2.2.14 b/metadata/md5-cache/dev-python/identify-2.2.14
index f8d3273d63a2..21f1ada62876 100644
--- a/metadata/md5-cache/dev-python/identify-2.2.14
+++ b/metadata/md5-cache/dev-python/identify-2.2.14
@@ -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/pre-commit/identify/archive/refs/tags/v2.2.14.tar.gz -> identify-2.2.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c4fcef28f7f81e53a4da71116ec01ce
diff --git a/metadata/md5-cache/dev-python/identify-2.2.15 b/metadata/md5-cache/dev-python/identify-2.2.15
index 0a16acb416fa..bad195a89593 100644
--- a/metadata/md5-cache/dev-python/identify-2.2.15
+++ b/metadata/md5-cache/dev-python/identify-2.2.15
@@ -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/pre-commit/identify/archive/refs/tags/v2.2.15.tar.gz -> identify-2.2.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c4fcef28f7f81e53a4da71116ec01ce
diff --git a/metadata/md5-cache/dev-python/idna-3.2 b/metadata/md5-cache/dev-python/idna-3.2
index f306a286e39c..500c12aea5db 100644
--- a/metadata/md5-cache/dev-python/idna-3.2
+++ b/metadata/md5-cache/dev-python/idna-3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dd108850f5d044bf8acce6996df5338
diff --git a/metadata/md5-cache/dev-python/ifaddr-0.1.7 b/metadata/md5-cache/dev-python/ifaddr-0.1.7
index cbe8889285ff..9379a306544e 100644
--- a/metadata/md5-cache/dev-python/ifaddr-0.1.7
+++ b/metadata/md5-cache/dev-python/ifaddr-0.1.7
@@ -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/i/ifaddr/ifaddr-0.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6165e5b696b1fcf092fee571d726a616
diff --git a/metadata/md5-cache/dev-python/ijson-3.1.4 b/metadata/md5-cache/dev-python/ijson-3.1.4
index c4b380306bbb..4f3c3230e756 100644
--- a/metadata/md5-cache/dev-python/ijson-3.1.4
+++ b/metadata/md5-cache/dev-python/ijson-3.1.4
@@ -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/ICRAR/ijson/archive/v3.1.4.tar.gz -> ijson-3.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40650b2214148f606ec5e15ab25696b3
diff --git a/metadata/md5-cache/dev-python/imageio-2.6.1 b/metadata/md5-cache/dev-python/imageio-2.6.1
index 5339bf06016f..3d4d0f9d0de4 100644
--- a/metadata/md5-cache/dev-python/imageio-2.6.1
+++ b/metadata/md5-cache/dev-python/imageio-2.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[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/imageio/imageio/archive/v2.6.1.tar.gz -> imageio-2.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=535937e768e212542bec7db65aac00a0
diff --git a/metadata/md5-cache/dev-python/imageio-2.9.0 b/metadata/md5-cache/dev-python/imageio-2.9.0
index 1d17c7bc1ca2..178054f0f35d 100644
--- a/metadata/md5-cache/dev-python/imageio-2.9.0
+++ b/metadata/md5-cache/dev-python/imageio-2.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.9.0.tar.gz -> imageio-2.9.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07fc96aed63c96804599e33211a9c670
diff --git a/metadata/md5-cache/dev-python/imagesize-1.2.0 b/metadata/md5-cache/dev-python/imagesize-1.2.0
index 00cd7c709a4e..06f37905d6e9 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.2.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Pure Python module for getting image size from png/jpeg/jpeg2000/gif
 EAPI=7
 HOMEPAGE=https://github.com/shibukawa/imagesize_py
 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-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6fdd9594a4b2c40c6d7ea77588f67941
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=793c123530c604300533503ffae0ad64
diff --git a/metadata/md5-cache/dev-python/imapclient-2.2.0 b/metadata/md5-cache/dev-python/imapclient-2.2.0
index d682fdec4715..b0d19332eb1a 100644
--- a/metadata/md5-cache/dev-python/imapclient-2.2.0
+++ b/metadata/md5-cache/dev-python/imapclient-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mjs/imapclient/archive/2.2.0.tar.gz -> imapclient-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8221271824e062630fbd430c57dfc5a5
diff --git a/metadata/md5-cache/dev-python/iminuit-2.7.0 b/metadata/md5-cache/dev-python/iminuit-2.7.0
index 32fd0027ff94..6bacef6a1e66 100644
--- a/metadata/md5-cache/dev-python/iminuit-2.7.0
+++ b/metadata/md5-cache/dev-python/iminuit-2.7.0
@@ -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=mirror://pypi/i/iminuit/iminuit-2.7.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d10859366cf30d4620e2d3ab82323896
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.0 b/metadata/md5-cache/dev-python/iminuit-2.8.0
index c52942b70163..17f8d15f9eaf 100644
--- a/metadata/md5-cache/dev-python/iminuit-2.8.0
+++ b/metadata/md5-cache/dev-python/iminuit-2.8.0
@@ -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=mirror://pypi/i/iminuit/iminuit-2.8.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d10859366cf30d4620e2d3ab82323896
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.2 b/metadata/md5-cache/dev-python/iminuit-2.8.2
index 211093457a73..e20b4dd611e5 100644
--- a/metadata/md5-cache/dev-python/iminuit-2.8.2
+++ b/metadata/md5-cache/dev-python/iminuit-2.8.2
@@ -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=mirror://pypi/i/iminuit/iminuit-2.8.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4ffaa8440b0b8f8af91eed63024edc83
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.3 b/metadata/md5-cache/dev-python/iminuit-2.8.3
index 0adb3a1eb28f..ff9d85be0cd1 100644
--- a/metadata/md5-cache/dev-python/iminuit-2.8.3
+++ b/metadata/md5-cache/dev-python/iminuit-2.8.3
@@ -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=mirror://pypi/i/iminuit/iminuit-2.8.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4dc221cc6b17b1368427e703efae44fd
diff --git a/metadata/md5-cache/dev-python/immutables-0.15 b/metadata/md5-cache/dev-python/immutables-0.15
index 8d05a5ec2de9..c90691bb18fe 100644
--- a/metadata/md5-cache/dev-python/immutables-0.15
+++ b/metadata/md5-cache/dev-python/immutables-0.15
@@ -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/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a2daba2bebc4aed7f4c751e852bf540
diff --git a/metadata/md5-cache/dev-python/immutables-0.15-r1 b/metadata/md5-cache/dev-python/immutables-0.15-r1
index be5d5252c9bb..55601257701d 100644
--- a/metadata/md5-cache/dev-python/immutables-0.15-r1
+++ b/metadata/md5-cache/dev-python/immutables-0.15-r1
@@ -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/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=636e03475ffd79f1b8a22d7128129d11
diff --git a/metadata/md5-cache/dev-python/immutables-0.16 b/metadata/md5-cache/dev-python/immutables-0.16
index 8b0fa2a8d7c5..84a0b09d6090 100644
--- a/metadata/md5-cache/dev-python/immutables-0.16
+++ b/metadata/md5-cache/dev-python/immutables-0.16
@@ -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/MagicStack/immutables/archive/v0.16.tar.gz -> immutables-0.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01342caeb5b013dd8352653cbc0ed944
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.6.4 b/metadata/md5-cache/dev-python/importlib_metadata-4.6.4
index 196bf742c0bb..b1c7d83ce5e0 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.6.4
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.6.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/i/importlib_metadata/importlib_metadata-4.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f45fdc5e9d8cad100de8190605686477
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.8.1 b/metadata/md5-cache/dev-python/importlib_metadata-4.8.1
index 2198cbb3412f..0be50d71c033 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.8.1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.8.1
@@ -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/i/importlib_metadata/importlib_metadata-4.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=734bd07cfb02a7e0e20d58f30c8e2a71
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 f49cedc463d0..20e616496444 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-5.2.2
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.2.2
@@ -11,5 +11,5 @@ 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.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6bea7eca27b2d4498a8d499ad63ce774
diff --git a/metadata/md5-cache/dev-python/imread-0.7.3-r1 b/metadata/md5-cache/dev-python/imread-0.7.3-r1
index 15ae4e0f959a..c76d2199315b 100644
--- a/metadata/md5-cache/dev-python/imread-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/imread-0.7.3-r1
@@ -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/luispedro/imread/archive/v0.7.3.tar.gz -> imread-0.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb1af82d5fbb92b6e7a8db9a4965e80e
diff --git a/metadata/md5-cache/dev-python/incremental-21.3.0 b/metadata/md5-cache/dev-python/incremental-21.3.0
index ef3e98faa1c7..57dee300d2d4 100644
--- a/metadata/md5-cache/dev-python/incremental-21.3.0
+++ b/metadata/md5-cache/dev-python/incremental-21.3.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/i/incremental/incremental-21.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69c115946829a37b7b79261dc2df24e7
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10 b/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
index c61923e8b9b1..7882b5adcbaa 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
+++ b/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
@@ -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/pauldmccarthy/indexed_gzip/archive/v0.8.10.tar.gz -> indexed_gzip-0.8.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=24b1ee04c36852815bf4d7b75855e691
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.0 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.0
index 7cb20ea1aec7..9a50c742f5d9 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.0
+++ b/metadata/md5-cache/dev-python/indexed_gzip-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.0.tar.gz -> indexed_gzip-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=53b1c744825c137f32b172f3ebf36ef4
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.1 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.1
index 6dce00d8f09d..7383044aa07e 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.1
+++ b/metadata/md5-cache/dev-python/indexed_gzip-1.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.1.tar.gz -> indexed_gzip-1.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=86fb184814029b14ed0944d1a8d2c9e5
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.2 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.2
index 8ffc5be0b3ce..d508c3e9e27d 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.2
+++ b/metadata/md5-cache/dev-python/indexed_gzip-1.6.2
@@ -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/pauldmccarthy/indexed_gzip/archive/v1.6.2.tar.gz -> indexed_gzip-1.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ae4caad13428568f799e3152d72260c
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.3 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.3
index 0884e700563e..e627a26ad8df 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.3
+++ b/metadata/md5-cache/dev-python/indexed_gzip-1.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.3.tar.gz -> indexed_gzip-1.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ae4caad13428568f799e3152d72260c
diff --git a/metadata/md5-cache/dev-python/inflect-5.3.0 b/metadata/md5-cache/dev-python/inflect-5.3.0
index 149bc6901c83..59a52fef8777 100644
--- a/metadata/md5-cache/dev-python/inflect-5.3.0
+++ b/metadata/md5-cache/dev-python/inflect-5.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-5.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86ae5fbcf834730c4a07dcfaa6676039
diff --git a/metadata/md5-cache/dev-python/inflection-0.5.1 b/metadata/md5-cache/dev-python/inflection-0.5.1
index e303e8fdc1e4..62b0114af122 100644
--- a/metadata/md5-cache/dev-python/inflection-0.5.1
+++ b/metadata/md5-cache/dev-python/inflection-0.5.1
@@ -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/i/inflection/inflection-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5efe245bcdb4820b79e9a67d6dd1af1
diff --git a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1 b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
index 4c9a5f66fef1..b8c728f76615 100644
--- a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
+++ b/metadata/md5-cache/dev-python/influxdb-5.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/influxdb/influxdb-5.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74ecb2975e5e979574a387bb2a38c64c
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.1.1 b/metadata/md5-cache/dev-python/iniconfig-1.1.1
index 67d422522f56..d8d2953385dd 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.1.1
+++ b/metadata/md5-cache/dev-python/iniconfig-1.1.1
@@ -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/i/iniconfig/iniconfig-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e83387e7b2aaf15b395037f0d8508c3d
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r2 b/metadata/md5-cache/dev-python/iniparse-0.4-r2
index c2e31f7ab5a2..98cacdd45460 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r2
+++ b/metadata/md5-cache/dev-python/iniparse-0.4-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?] python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=442b7e10f102b4b04a5cd5a3e6d7bf7f
diff --git a/metadata/md5-cache/dev-python/iniparse-0.5 b/metadata/md5-cache/dev-python/iniparse-0.5
index 69003ab03c22..444c32752ce7 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.5
+++ b/metadata/md5-cache/dev-python/iniparse-0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3def2bbc91e9984d9309e805965a1fe8
diff --git a/metadata/md5-cache/dev-python/intelhex-2.3.0 b/metadata/md5-cache/dev-python/intelhex-2.3.0
index d37a65e0f4c7..f461da850e7a 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.3.0
+++ b/metadata/md5-cache/dev-python/intelhex-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IntelHex/intelhex-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a43cbf0ebc7d270729c9121440b5a7d4
diff --git a/metadata/md5-cache/dev-python/intervaltree-3.1.0 b/metadata/md5-cache/dev-python/intervaltree-3.1.0
index c6d713c4596a..f39c1cfe9350 100644
--- a/metadata/md5-cache/dev-python/intervaltree-3.1.0
+++ b/metadata/md5-cache/dev-python/intervaltree-3.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/i/intervaltree/intervaltree-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=76a313e04de46138285aa112f176f4da
diff --git a/metadata/md5-cache/dev-python/intreehooks-1.0 b/metadata/md5-cache/dev-python/intreehooks-1.0
index 16d3694a3f49..39dfeb7ddeb9 100644
--- a/metadata/md5-cache/dev-python/intreehooks-1.0
+++ b/metadata/md5-cache/dev-python/intreehooks-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=mirror://pypi/i/intreehooks/intreehooks-1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83d2f88dbcfd1fa7a5dafc4a9d41a45a
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
index 66977536b322..2f1e40bb65cd 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
@@ -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/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3cc2a542fe663df15442132d8a9239be
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.2 b/metadata/md5-cache/dev-python/ioflo-2.0.2
index 998bea7bff4d..ef73074455d5 100644
--- a/metadata/md5-cache/dev-python/ioflo-2.0.2
+++ b/metadata/md5-cache/dev-python/ioflo-2.0.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/ioflo/ioflo/archive/v2.0.2.tar.gz -> ioflo-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbef1e4c0c051696193617c8fd1aa92f
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1 b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
index bdc06318d02a..e17635a93b02 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b9ffa56d1da3d71c80bf31d010ebdf7
diff --git a/metadata/md5-cache/dev-python/ipdb-0.13.9-r1 b/metadata/md5-cache/dev-python/ipdb-0.13.9-r1
index bd7408f141e8..1f4998526fc5 100644
--- a/metadata/md5-cache/dev-python/ipdb-0.13.9-r1
+++ b/metadata/md5-cache/dev-python/ipdb-0.13.9-r1
@@ -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/i/ipdb/ipdb-0.13.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4efcae57d96df785823dd93ffd169ef
diff --git a/metadata/md5-cache/dev-python/ipy-1.01 b/metadata/md5-cache/dev-python/ipy-1.01
index df622820ee09..15c06d59476c 100644
--- a/metadata/md5-cache/dev-python/ipy-1.01
+++ b/metadata/md5-cache/dev-python/ipy-1.01
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-1.01.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e908543e9af425d0516f8767e55b783
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1 b/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
index 75a6b0dfe1e7..36784e2b855a 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
+++ b/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
@@ -4,12 +4,12 @@ DESCRIPTION=IPython Kernel for Jupyter
 EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_client-6.2[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/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[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/i/ipykernel/ipykernel-5.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15f49d66c87cfab9d877e1684ab699c4
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d31c99d9d2a0174391402f3dadd6bddc
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.2.0 b/metadata/md5-cache/dev-python/ipykernel-6.2.0
index 5febd301dfef..eeb0fa7db0bb 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.2.0
+++ b/metadata/md5-cache/dev-python/ipykernel-6.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dc0187aacc91ffb390be9fe6c2265a7
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 960a9f0298cb..f12960e77d4d 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c1d1f3d341e6154bf584b2033728eed
diff --git a/metadata/md5-cache/dev-python/ipython-7.26.0 b/metadata/md5-cache/dev-python/ipython-7.26.0
index 3d8423d25ecd..d28e37bef348 100644
--- a/metadata/md5-cache/dev-python/ipython-7.26.0
+++ b/metadata/md5-cache/dev-python/ipython-7.26.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 ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 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.26.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=07624d76f9b84ff65a6cee3a8f97034d
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=8a99ce9dd490e3ab79a10b915fa25ae9
diff --git a/metadata/md5-cache/dev-python/ipython-7.28.0 b/metadata/md5-cache/dev-python/ipython-7.28.0
index 72858c4092db..5c14362cc908 100644
--- a/metadata/md5-cache/dev-python/ipython-7.28.0
+++ b/metadata/md5-cache/dev-python/ipython-7.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.28.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=95e5f922aa1f236369f0d46047b951b3
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
index 0c522875bd00..2cfb9c90715a 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
@@ -4,12 +4,12 @@ DESCRIPTION=Vestigial utilities from IPython
 EAPI=7
 HOMEPAGE=https://github.com/ipython/ipython_genutils
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f105043ca4c8186e3f3f3d279a58dc2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8365dc43e5319b8b119e17d4bf935f10
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1 b/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
index 4fb90134dccd..aef6702f5b17 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.5.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/i/ipywidgets/ipywidgets-7.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1041604a1292b6755e59b3f4a4bb6940
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.6.2 b/metadata/md5-cache/dev-python/ipywidgets-7.6.2
index 9331707f481e..88af6a9921ce 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.6.2
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1df6ca614d8129f9b775d87f44ff5a91
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.6.3 b/metadata/md5-cache/dev-python/ipywidgets-7.6.3
index b6ae8cdda38c..d29aa44316a0 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.6.3
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.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=mirror://pypi/i/ipywidgets/ipywidgets-7.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=beb158bba09626613cb37fb6df311fb7
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.6.4 b/metadata/md5-cache/dev-python/ipywidgets-7.6.4
index 953711446422..30f276a9e03f 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.6.4
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.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=mirror://pypi/i/ipywidgets/ipywidgets-7.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71d822afaebe20eb71cba2ae5658b57b
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.6.5 b/metadata/md5-cache/dev-python/ipywidgets-7.6.5
index e4ae2e5aecd3..1e3c33140243 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.6.5
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.6.5
@@ -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/ipywidgets/ipywidgets-7.6.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71d822afaebe20eb71cba2ae5658b57b
diff --git a/metadata/md5-cache/dev-python/irc-19.0.1 b/metadata/md5-cache/dev-python/irc-19.0.1
index 4a30f6501c1a..33d2452b292b 100644
--- a/metadata/md5-cache/dev-python/irc-19.0.1
+++ b/metadata/md5-cache/dev-python/irc-19.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-19.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0396b702d622cf31a328e8c096e6d88
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.16 b/metadata/md5-cache/dev-python/iso8601-0.1.16
index 779c10665af1..96273188557e 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.16
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.16
@@ -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/i/iso8601/iso8601-0.1.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7cc5e671f917fc72a34e1654d38c98c
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0-r2 b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
index 62936707d38e..30d84f9ab692 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0-r2
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0-r2
@@ -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/i/isodate/isodate-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cfba1339bfc005623ea8a2420f44a0b
diff --git a/metadata/md5-cache/dev-python/isoduration-20.11.0 b/metadata/md5-cache/dev-python/isoduration-20.11.0
new file mode 100644
index 000000000000..063b65e5ebdb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/isoduration-20.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/arrow-0.15.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(-)?] ) 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=Operations with ISO 8601 durations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/isoduration/ https://github.com/bolsote/isoduration/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-python/arrow-0.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bolsote/isoduration/archive/20.11.0.tar.gz -> isoduration-20.11.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9686afecb6c99a5b353ff429ff93202b
diff --git a/metadata/md5-cache/dev-python/isort-5.9.2 b/metadata/md5-cache/dev-python/isort-5.9.2
deleted file mode 100644
index 5c5be381d417..000000000000
--- a/metadata/md5-cache/dev-python/isort-5.9.2
+++ /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-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-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
-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.2.tar.gz -> isort-5.9.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=354b7630ac87e8f0969685d750ed2796
diff --git a/metadata/md5-cache/dev-python/isort-5.9.3 b/metadata/md5-cache/dev-python/isort-5.9.3
index e43a6946f6c5..299fe1806dfb 100644
--- a/metadata/md5-cache/dev-python/isort-5.9.3
+++ b/metadata/md5-cache/dev-python/isort-5.9.3
@@ -4,12 +4,12 @@ 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 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=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(-)?]
 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/isort/archive/5.9.3.tar.gz -> isort-5.9.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d198cb246bdd3d59e465c477a1ee5a5
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8584e51a8592f35c10ee9716ed694e23
diff --git a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1 b/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
index 68ec5e46a042..2fc525534f2a 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/itsdangerous-1.1.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=mirror://pypi/i/itsdangerous/itsdangerous-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2e586eadec16d263655e21d87f179d6
diff --git a/metadata/md5-cache/dev-python/itsdangerous-2.0.1 b/metadata/md5-cache/dev-python/itsdangerous-2.0.1
index 2a10fe5bf96b..8bd17f1a70ad 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-2.0.1
+++ b/metadata/md5-cache/dev-python/itsdangerous-2.0.1
@@ -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/i/itsdangerous/itsdangerous-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2b5743606ec430596f3f986d6b995fa
diff --git a/metadata/md5-cache/dev-python/itypes-1.1.0 b/metadata/md5-cache/dev-python/itypes-1.1.0
index 02668d16e662..cceeb95d2aff 100644
--- a/metadata/md5-cache/dev-python/itypes-1.1.0
+++ b/metadata/md5-cache/dev-python/itypes-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PavanTatikonda/itypes/archive/1.1.0.tar.gz -> itypes-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4590558177a8b24c2c1f526faa7664eb
diff --git a/metadata/md5-cache/dev-python/itypes-1.2.0 b/metadata/md5-cache/dev-python/itypes-1.2.0
index e375ad6d389a..c31a0eb6d17e 100644
--- a/metadata/md5-cache/dev-python/itypes-1.2.0
+++ b/metadata/md5-cache/dev-python/itypes-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PavanTatikonda/itypes/archive/1.2.0.tar.gz -> itypes-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d84f2d2d9a5c12a2d20c9f2fe421282a
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.2.1 b/metadata/md5-cache/dev-python/jaraco-classes-3.2.1
index dec6bb1b93d5..2d365fd48f23 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.2.1
+++ b/metadata/md5-cache/dev-python/jaraco-classes-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=mirror://pypi/j/jaraco.classes/jaraco.classes-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=697ff5df80d7843578a5de44d2b65d66
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.3.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.3.0
index cfe4d27e61d1..aab7be25deaa 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.3.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.3.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/j/jaraco.collections/jaraco.collections-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=678f867b11511a983a221ad6969b751c
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.4.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.4.0
index 51b9ad282e95..b436986b2d2a 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.4.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.4.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/j/jaraco.collections/jaraco.collections-3.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72e8f989538e8dd736311f7bb9603b63
diff --git a/metadata/md5-cache/dev-python/jaraco-context-4.0.0 b/metadata/md5-cache/dev-python/jaraco-context-4.0.0
index 04b5bc1ffcdd..05b78653c8f9 100644
--- a/metadata/md5-cache/dev-python/jaraco-context-4.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-context-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.context/jaraco.context-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3a7997fa9045a124ed737a5cfafb134
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.1.1 b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
index 51bfea5c97ca..30d05e3b36c3 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ca99a0c37b52e589f86304c2c00e123
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.3.0 b/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
index 74f7f186cb18..e8b31cec9e63 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8f7bb210818106bdfd6ecf2fda8afa3
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1 b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1
index ddf781355dc4..6c78b4927ccd 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.1
@@ -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/j/jaraco.itertools/jaraco.itertools-6.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=102091f99119c9c48e95f90d51098ab0
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-6.0.3 b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.3
index 133ad9780223..a05bda415af0 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-6.0.3
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-6.0.3
@@ -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/j/jaraco.itertools/jaraco.itertools-6.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79319d8d2e73c73a7fa04fc9c1a0a326
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0 b/metadata/md5-cache/dev-python/jaraco-logging-3.1.0
index 9787467d3154..a378b37a88d8 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-logging-3.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=mirror://pypi/j/jaraco.logging/jaraco.logging-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1dcd33024fe7bd74342e873f22944e45
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1 b/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1
index 8a76cdbbf386..3719a6976e0b 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-8.2.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-8.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=mirror://pypi/j/jaraco.packaging/jaraco.packaging-8.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=099477144a416fb3f19932ab16ba2c9e
diff --git a/metadata/md5-cache/dev-python/jaraco-path-3.3.1 b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
index 7c99568e3371..79237d6bc6bb 100644
--- a/metadata/md5-cache/dev-python/jaraco-path-3.3.1
+++ b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
@@ -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/j/jaraco.path/jaraco.path-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc327c5f9bca4ccbfeabc815d084b3b5
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1
index 7b69ba7edfa8..3f084aa918fc 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.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=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=689447d45305037221937d3754187266
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.2 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.2
index 8ed41a643131..c726e7ce0aeb 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.2
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.2
@@ -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/j/jaraco.stream/jaraco.stream-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=614eae668492d00ca09a03f5015606d6
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.5.1 b/metadata/md5-cache/dev-python/jaraco-text-3.5.1
index ed8b2bc3a07d..56ad7a06ced7 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.5.1
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.5.1
@@ -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/j/jaraco.text/jaraco.text-3.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe9bc1efbc4de62c876adb91e224ef69
diff --git a/metadata/md5-cache/dev-python/jc-1.16.0 b/metadata/md5-cache/dev-python/jc-1.16.0
index d69239758af5..e9507eccc763 100644
--- a/metadata/md5-cache/dev-python/jc-1.16.0
+++ b/metadata/md5-cache/dev-python/jc-1.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.16.0.tar.gz -> jc-1.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5feaaa841fd4a97e6838111f0a230ac6
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4.1 b/metadata/md5-cache/dev-python/jdcal-1.4.1
index 117f8b5a265d..87692f28f210 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.4.1
+++ b/metadata/md5-cache/dev-python/jdcal-1.4.1
@@ -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/j/jdcal/jdcal-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=954964ef598784b12e84cd929ba97f91
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.2-r1 b/metadata/md5-cache/dev-python/jedi-0.17.2-r1
index 0aed443a1118..e274bf974bf8 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.2-r1
+++ b/metadata/md5-cache/dev-python/jedi-0.17.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=https://github.com/davidhalter/jedi/archive/v0.17.2.tar.gz -> jedi-0.17.2.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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db67bfb6786202cea177474108e64415
diff --git a/metadata/md5-cache/dev-python/jedi-0.18.0 b/metadata/md5-cache/dev-python/jedi-0.18.0
index 38e5517ac1c1..de15cc77601f 100644
--- a/metadata/md5-cache/dev-python/jedi-0.18.0
+++ b/metadata/md5-cache/dev-python/jedi-0.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7751be0487ad6e092d2e4d8fccd79dd6
diff --git a/metadata/md5-cache/dev-python/jeepney-0.6.0 b/metadata/md5-cache/dev-python/jeepney-0.6.0
index 5632a71b95c8..e8d96b30e275 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.6.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8462d06d6a5056f50cabb68b7fcb452
diff --git a/metadata/md5-cache/dev-python/jeepney-0.7.0 b/metadata/md5-cache/dev-python/jeepney-0.7.0
index e13d528e8d60..3c63ee91cf96 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.7.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac74324cc9781badcfbc6b955b3961f8
diff --git a/metadata/md5-cache/dev-python/jeepney-0.7.1 b/metadata/md5-cache/dev-python/jeepney-0.7.1
index bce94a3a5fe7..e0142a7a3dee 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.7.1
+++ b/metadata/md5-cache/dev-python/jeepney-0.7.1
@@ -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/j/jeepney/jeepney-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87de2b46220abcd29d3d16f0d465ff41
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.8.8 b/metadata/md5-cache/dev-python/jellyfish-0.8.8
index 3fe319eb8916..207898f9381c 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.8.8
+++ b/metadata/md5-cache/dev-python/jellyfish-0.8.8
@@ -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/j/jellyfish/jellyfish-0.8.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97c6c0b7055206d6b789ef14d9c83199
diff --git a/metadata/md5-cache/dev-python/jikanpy-4.3.1 b/metadata/md5-cache/dev-python/jikanpy-4.3.1
index 676fa89e0cf6..ee1e5957528f 100644
--- a/metadata/md5-cache/dev-python/jikanpy-4.3.1
+++ b/metadata/md5-cache/dev-python/jikanpy-4.3.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/abhinavk99/jikanpy/archive/v4.3.1.tar.gz -> jikanpy-4.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89004999019fa82d7accea1f8e4a992f
diff --git a/metadata/md5-cache/dev-python/jikanpy-4.3.2 b/metadata/md5-cache/dev-python/jikanpy-4.3.2
index 9cedb1f8bae9..df2c342669a8 100644
--- a/metadata/md5-cache/dev-python/jikanpy-4.3.2
+++ b/metadata/md5-cache/dev-python/jikanpy-4.3.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/abhinavk99/jikanpy/archive/v4.3.2.tar.gz -> jikanpy-4.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d3010377cd8acdd21474c77b821d24e
diff --git a/metadata/md5-cache/dev-python/jinja-2.11.3 b/metadata/md5-cache/dev-python/jinja-2.11.3
index 39192da1b381..ae8f1801bfa5 100644
--- a/metadata/md5-cache/dev-python/jinja-2.11.3
+++ b/metadata/md5-cache/dev-python/jinja-2.11.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/pallets/jinja/archive/2.11.3.tar.gz -> jinja-2.11.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb7c5a11342d7f655ea589aff35f9f7b
diff --git a/metadata/md5-cache/dev-python/jinja-3.0.1 b/metadata/md5-cache/dev-python/jinja-3.0.1
index 70c799dfce63..754eb403bc3f 100644
--- a/metadata/md5-cache/dev-python/jinja-3.0.1
+++ b/metadata/md5-cache/dev-python/jinja-3.0.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/pallets/jinja/archive/3.0.1.tar.gz -> jinja-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65fc8357788a99d2fe5f25023506a231
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
index ca7b4725f0d5..1549ce5b9d8b 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.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/j/jinja2-time/jinja2-time-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d881967a96a0290c3606babf2fa1bc5
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
index ceaa16eeb706..24b9770d7e6c 100644
--- a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+++ b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.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/j/jinja2_pluralize/jinja2_pluralize-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1db670eb9f89d353f078de045b16985a
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index e914a621c769..195b900a9b9b 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.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/jmespath/jmespath.py/archive/0.10.0.tar.gz -> jmespath.py-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8986ff4dbc9efc40445377dd46200ec
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.1 b/metadata/md5-cache/dev-python/joblib-1.0.1
index aaa3e887936b..acfd64bd61b7 100644
--- a/metadata/md5-cache/dev-python/joblib-1.0.1
+++ b/metadata/md5-cache/dev-python/joblib-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/1.0.1.tar.gz -> joblib-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed0e5dab521188890f61c706d41829e1
diff --git a/metadata/md5-cache/dev-python/josepy-1.10.0 b/metadata/md5-cache/dev-python/josepy-1.10.0
new file mode 100644
index 000000000000..78ff66f79320
--- /dev/null
+++ b/metadata/md5-cache/dev-python/josepy-1.10.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[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=JOSE protocol implementation in Python
+EAPI=8
+HOMEPAGE=https://github.com/certbot/josepy
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[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(-)?]
+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/josepy/josepy-1.10.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=add7768a73f17405f005af3cfa52ce53
diff --git a/metadata/md5-cache/dev-python/josepy-1.8.0 b/metadata/md5-cache/dev-python/josepy-1.8.0
index e26c10e8e22b..3e5fd9de56b7 100644
--- a/metadata/md5-cache/dev-python/josepy-1.8.0
+++ b/metadata/md5-cache/dev-python/josepy-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6126733cbe12b009f89d68d1dbdee8f
diff --git a/metadata/md5-cache/dev-python/josepy-1.9.0 b/metadata/md5-cache/dev-python/josepy-1.9.0
index 59aae6a49bda..a4be984038e9 100644
--- a/metadata/md5-cache/dev-python/josepy-1.9.0
+++ b/metadata/md5-cache/dev-python/josepy-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=add7768a73f17405f005af3cfa52ce53
diff --git a/metadata/md5-cache/dev-python/jq-1.1.2 b/metadata/md5-cache/dev-python/jq-1.1.2
index e7e99d38ba5f..cbeb81979cd2 100644
--- a/metadata/md5-cache/dev-python/jq-1.1.2
+++ b/metadata/md5-cache/dev-python/jq-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jq/jq-1.1.2.tar.gz https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=058d3f36fc2fecc89f9a8601a0e28ad8
diff --git a/metadata/md5-cache/dev-python/jq-1.1.3 b/metadata/md5-cache/dev-python/jq-1.1.3
index 6d07273fe8cb..fa94097a7fdd 100644
--- a/metadata/md5-cache/dev-python/jq-1.1.3
+++ b/metadata/md5-cache/dev-python/jq-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jq/jq-1.1.3.tar.gz https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=058d3f36fc2fecc89f9a8601a0e28ad8
diff --git a/metadata/md5-cache/dev-python/jq-1.2.1 b/metadata/md5-cache/dev-python/jq-1.2.1
index 010f3315bd4b..15fdd8b742a9 100644
--- a/metadata/md5-cache/dev-python/jq-1.2.1
+++ b/metadata/md5-cache/dev-python/jq-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.2.1.tar.gz -> jq-1.2.1.gh.tar.gz https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf69b966921adf84367e5b4a34966093
diff --git a/metadata/md5-cache/dev-python/js2py-0.70_p20210218 b/metadata/md5-cache/dev-python/js2py-0.70_p20210218
index 43238cd2c245..8177fbf45db7 100644
--- a/metadata/md5-cache/dev-python/js2py-0.70_p20210218
+++ b/metadata/md5-cache/dev-python/js2py-0.70_p20210218
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/ea16b519a0f72e17416859a57890b8388fce6e39.tar.gz -> Js2Py-0.70_p20210218.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f06f772a0fd5f15b6b0c29019c9f7b26
diff --git a/metadata/md5-cache/dev-python/js2py-0.71 b/metadata/md5-cache/dev-python/js2py-0.71
index 086d8c3a2b39..f92f1ed030ec 100644
--- a/metadata/md5-cache/dev-python/js2py-0.71
+++ b/metadata/md5-cache/dev-python/js2py-0.71
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/5f665f60083a9796ec33861240ce31d6d2b844b6.tar.gz -> Js2Py-0.71.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=85ddc161300152320c2ab32cd35d870c
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index 26ec5e3246fb..46aa5c3ee1d1 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.2
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98d80f98387b8e9e517cd0ef4365b3c2
diff --git a/metadata/md5-cache/dev-python/jsmin-3.0.0 b/metadata/md5-cache/dev-python/jsmin-3.0.0
index f1d512e81865..e65610535179 100644
--- a/metadata/md5-cache/dev-python/jsmin-3.0.0
+++ b/metadata/md5-cache/dev-python/jsmin-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b13024eb74ab79d957a38b2eca623354
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.13.0 b/metadata/md5-cache/dev-python/json-rpc-1.13.0
index e41cc7b057c4..9fa80b3e2d04 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.13.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.13.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/j/json-rpc/json-rpc-1.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ed2887c9ba3d03158fdcd9ddc4a9a51
diff --git a/metadata/md5-cache/dev-python/json5-0.9.6 b/metadata/md5-cache/dev-python/json5-0.9.6
index 915e12db21d6..8728f4a47cd4 100644
--- a/metadata/md5-cache/dev-python/json5-0.9.6
+++ b/metadata/md5-cache/dev-python/json5-0.9.6
@@ -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/dpranke/pyjson5/archive/refs/tags/v0.9.6.tar.gz -> json5-0.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60f9c1057f141b5fe50dd01544f8a174
diff --git a/metadata/md5-cache/dev-python/jsondiff-1.3.0 b/metadata/md5-cache/dev-python/jsondiff-1.3.0
index 5a7f6a3602bd..1d9463cd542e 100644
--- a/metadata/md5-cache/dev-python/jsondiff-1.3.0
+++ b/metadata/md5-cache/dev-python/jsondiff-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xlwings/jsondiff/archive/1.3.0.tar.gz -> jsondiff-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0d4228e7be3c3d93e77f9c6cb4f5c3a
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
index b187ae7adc41..69299fa3111a 100644
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonext-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonext/jsonext-0.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70e7a2d7d680ff124226237eea0fb963
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.8.0 b/metadata/md5-cache/dev-python/jsonmerge-1.8.0
index d66a833e384c..1ab79155696c 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.8.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.8.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/j/jsonmerge/jsonmerge-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c1c3cc741ceec10f34a08f7ce54569d
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.32 b/metadata/md5-cache/dev-python/jsonpatch-1.32
index 3e4f334bfd0f..f9ef1602efca 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.32
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.32
@@ -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/stefankoegl/python-json-patch/archive/v1.32.tar.gz -> jsonpatch-1.32.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a46cbe58f4f2cc94c9741f0d2c87a5e
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.0.0 b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
index 0eb9edd49053..540167701491 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-2.0.0
+++ b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=782d4027983c57bb233c1a7bdbe655b6
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.1 b/metadata/md5-cache/dev-python/jsonpointer-2.1
index b891dc578d81..20dea8e6a4e3 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.1
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=611ffc319c66a562b6f54df5ef03062e
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index 69b34924842d..a49c7d066985 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonref/jsonref-0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b57fec4c61a8bfa056d213b850cc3d10
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2 b/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
index 567b23d1ac5e..224ac4700c2b 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.4.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/tcalmant/jsonrpclib/archive/v0.4.2.tar.gz -> jsonrpclib-0.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d6845d715afcd5955030842da25772a
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index 80b0e9499686..8c5bb8171362 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d56d13254b82af26e27d592e377b8279
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 70aacc0ba8f1..728dfa973ccb 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.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/j/jsonschema/jsonschema-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=299198c304efc74cd02b929beb97dc86
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.0.0 b/metadata/md5-cache/dev-python/jsonschema-4.0.0
new file mode 100644
index 000000000000..c141c5eefaff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[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/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/jsonschema/jsonschema-4.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=feef7110a478cfa5144f6658af85a165
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
index a7b795ad63a5..26ece49e1017 100644
--- a/metadata/md5-cache/dev-python/jsonxs-0.6
+++ b/metadata/md5-cache/dev-python/jsonxs-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc02ca1d670597553ecdb506ce0cc955
diff --git a/metadata/md5-cache/dev-python/junit-xml-1.9 b/metadata/md5-cache/dev-python/junit-xml-1.9
index 56979ae1ed28..0585163c40aa 100644
--- a/metadata/md5-cache/dev-python/junit-xml-1.9
+++ b/metadata/md5-cache/dev-python/junit-xml-1.9
@@ -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/kyrus/python-junit-xml/archive/19d3cc333d35dfd2d17d75c506336c15e5c6685a.tar.gz -> junit-xml-1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ce206433b220496f9fc01aac172e3e8
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0-r3 b/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
index 4119dc59f21a..810135ddd8e7 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter/jupyter-1.0.0.tar.gz https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> jupyter-1.0.0-file-colision.patch
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7bed0c83c3e42e0fd98881dc2b5be402
diff --git a/metadata/md5-cache/dev-python/jupyter-lsp-1.4.1 b/metadata/md5-cache/dev-python/jupyter-lsp-1.4.1
index 9a23458ff7e0..eb8c0656253c 100644
--- a/metadata/md5-cache/dev-python/jupyter-lsp-1.4.1
+++ b/metadata/md5-cache/dev-python/jupyter-lsp-1.4.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/j/jupyter-lsp/jupyter-lsp-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7721b86e421e310903f80818ea1df4ec
diff --git a/metadata/md5-cache/dev-python/jupyter_client-6.1.12 b/metadata/md5-cache/dev-python/jupyter_client-6.1.12
index e7fd4177510a..b0749f08b2c3 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-6.1.12
+++ b/metadata/md5-cache/dev-python/jupyter_client-6.1.12
@@ -4,12 +4,12 @@ DESCRIPTION=Jupyter protocol implementation and client libraries
 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 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/async_generator[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/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[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(-)?] www-servers/tornado[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/j/jupyter_client/jupyter_client-6.1.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=74bebe1862b4c9c01060d70580bbfb8e
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a96e89d097cac5ae3d7c130e75a20a88
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.1 b/metadata/md5-cache/dev-python/jupyter_client-7.0.1
index b9ce0746bb62..808fdba2b8e0 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.1
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=774fa22fcf3f985efe6932953f0c7855
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.2 b/metadata/md5-cache/dev-python/jupyter_client-7.0.2
index b043f8ec0c5f..49bce201e296 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.2
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.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/j/jupyter_client/jupyter_client-7.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4946311808368ccd18652f303d0ee5a3
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.3 b/metadata/md5-cache/dev-python/jupyter_client-7.0.3
index 1af6b25ec74a..85076df006a8 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.3
@@ -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/j/jupyter_client/jupyter_client-7.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.4 b/metadata/md5-cache/dev-python/jupyter_client-7.0.4
new file mode 100644
index 000000000000..8256f57c984b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ipykernel[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/pytest-asyncio[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(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[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/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=Jupyter protocol implementation and client libraries
+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 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[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/j/jupyter_client/jupyter_client-7.0.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.5 b/metadata/md5-cache/dev-python/jupyter_client-7.0.5
new file mode 100644
index 000000000000..0196e025978d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.0.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ipykernel[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/pytest-asyncio[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(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[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/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=Jupyter protocol implementation and client libraries
+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 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[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/j/jupyter_client/jupyter_client-7.0.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.4.0 b/metadata/md5-cache/dev-python/jupyter_console-6.4.0
index 7aa74500b000..55faa8b4bb29 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.4.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.4.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/j/jupyter_console/jupyter_console-6.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a684abe89c5ddb92b7d467df864dd7c8
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.7.1 b/metadata/md5-cache/dev-python/jupyter_core-4.7.1
index 6d95863a6442..0705e915358e 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.7.1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.7.1
@@ -4,12 +4,12 @@ DESCRIPTION=Core common functionality of Jupyter projects
 EAPI=8
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=efeff63d0c3a76253360211d453e36b8
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b2a3c3bc85b8b29884d632cd5d8eaf7f
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.8.1 b/metadata/md5-cache/dev-python/jupyter_core-4.8.1
index 88cd2c4cba96..2c63ae13997b 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.8.1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.8.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/j/jupyter_core/jupyter_core-4.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9d802beb91654bb2ced1429242ea711
diff --git a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.2 b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.2
deleted file mode 100644
index 59c7822d1152..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/deprecation[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=Tools to help build and install Jupyter Python packages
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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/j/jupyter_packaging/jupyter_packaging-0.10.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70bb82509c7e20891be7b9f6a1f5069a
diff --git a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.3 b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.3
deleted file mode 100644
index 6a09156b9802..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[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 help build and install Jupyter Python packages
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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/j/jupyter_packaging/jupyter_packaging-0.10.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=464a3b4f332a6db214e0bc87c7137866
diff --git a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4 b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4
index f7eb55e8896f..b3860e0c741b 100644
--- a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4
+++ b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4
@@ -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/j/jupyter_packaging/jupyter_packaging-0.10.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c2fdd54082caa5e6d41e0fc2306bc98
diff --git a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.6 b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.6
new file mode 100644
index 000000000000..0209570615e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[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 help build and install Jupyter Python packages
+EAPI=8
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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/j/jupyter_packaging/jupyter_packaging-0.10.6.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c2fdd54082caa5e6d41e0fc2306bc98
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.11.0 b/metadata/md5-cache/dev-python/jupyter_server-1.11.0
index c22da462313c..f80f04f24d6e 100644
--- a/metadata/md5-cache/dev-python/jupyter_server-1.11.0
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.11.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/j/jupyter_server/jupyter_server-1.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5ef4c731e5cfc199ad56eb6d4288805
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.8.0 b/metadata/md5-cache/dev-python/jupyter_server-1.8.0
index 68cb0ae380f5..cf83509d3bba 100644
--- a/metadata/md5-cache/dev-python/jupyter_server-1.8.0
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=547e343b7d5351e798d74e0b304475cf
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.3 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.3
index eeab3e21a3a7..2d5ec9b80284 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.3
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.3
@@ -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/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be0e000a8efbe53ecc4fa3ab583899cc
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.1.10-r1 b/metadata/md5-cache/dev-python/jupyterlab-3.1.10-r1
index 6aa4c88af390..fdd067eaab15 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-3.1.10-r1
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.1.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyterlab/jupyterlab-3.1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc64fd3ac855926970417eade2e2bedc
diff --git a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.8.1 b/metadata/md5-cache/dev-python/jupyterlab-lsp-3.8.1
index 4d82234b02bc..dd2f96b010b7 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.8.1
+++ b/metadata/md5-cache/dev-python/jupyterlab-lsp-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jupyterlab-3.0.0[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyterlab-lsp/jupyterlab-lsp-3.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8f0313492e5908bb3740c9c524d9c44
diff --git a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2 b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
index bb973720dede..2f51b04a47b0 100644
--- a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
+++ b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jupyterlab/jupyterlab_pygments/archive/0.1.2.tar.gz -> jupyterlab_pygments-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=50b32bded14ebea35758b2ab28c73568
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.7.2 b/metadata/md5-cache/dev-python/jupyterlab_server-2.7.2
index 0fe8ac38538d..e876d2e0eb14 100644
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.7.2
+++ b/metadata/md5-cache/dev-python/jupyterlab_server-2.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d952b123240bc6c19a29fa7e7516037a
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.0.0 b/metadata/md5-cache/dev-python/jwcrypto-1.0.0
index d3d2a8e6b8d9..3a15833fa18e 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-1.0.0
+++ b/metadata/md5-cache/dev-python/jwcrypto-1.0.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/latchset/jwcrypto/archive/v1.0.0.tar.gz -> jwcrypto-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5440e5640ab2a7359010a336542ab7aa
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.4.7 b/metadata/md5-cache/dev-python/kafka-python-1.4.7
index 685133b2967d..ba05a701781c 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.4.7
+++ b/metadata/md5-cache/dev-python/kafka-python-1.4.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.4.7.tar.gz -> kafka-python-1.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da56f9fd42f535824ff7897f036fa93c
diff --git a/metadata/md5-cache/dev-python/kafka-python-2.0.2 b/metadata/md5-cache/dev-python/kafka-python-2.0.2
index 381772d4c533..7e837fc32cd8 100644
--- a/metadata/md5-cache/dev-python/kafka-python-2.0.2
+++ b/metadata/md5-cache/dev-python/kafka-python-2.0.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/dpkp/kafka-python/archive/2.0.2.tar.gz -> kafka-python-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=979e6027f9354e2e3796c953307dde0a
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.9 b/metadata/md5-cache/dev-python/kaitaistruct-0.9
index 49b4b711f706..b96bdff449cc 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.9
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2609997570a2bdbba966111d35d8b1b
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
index 792798d15d40..a6a0c935962e 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
@@ -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/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2be830dd68e480ee5f728abfac4db0f8
diff --git a/metadata/md5-cache/dev-python/kazoo-2.8.0 b/metadata/md5-cache/dev-python/kazoo-2.8.0
index b2f72c8aa8b9..b1bd859fe7cc 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.8.0
+++ b/metadata/md5-cache/dev-python/kazoo-2.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf01bdf11952089e86c57c376ed2ffe0
diff --git a/metadata/md5-cache/dev-python/kconfiglib-14.1.0 b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
index 29faa3ed0851..5ff3fa849969 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-14.1.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v14.1.0.tar.gz -> kconfiglib-14.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58cbe8e14376e666b9b2ffe38e454629
diff --git a/metadata/md5-cache/dev-python/keep-2.10.1 b/metadata/md5-cache/dev-python/keep-2.10.1
index 48eeec302752..e24a1a9b6546 100644
--- a/metadata/md5-cache/dev-python/keep-2.10.1
+++ b/metadata/md5-cache/dev-python/keep-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keep/keep-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2c22e62fce0855e3ba2696994be12fa
diff --git a/metadata/md5-cache/dev-python/keyring-23.1.0 b/metadata/md5-cache/dev-python/keyring-23.1.0
index 95b3bd8b0dae..5e294a16b431 100644
--- a/metadata/md5-cache/dev-python/keyring-23.1.0
+++ b/metadata/md5-cache/dev-python/keyring-23.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/jaraco/keyring/archive/v23.1.0.tar.gz -> keyring-23.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79d7c8ed6c1c624fb9fc94b5ead56b55
diff --git a/metadata/md5-cache/dev-python/keyring-23.2.1 b/metadata/md5-cache/dev-python/keyring-23.2.1
index 8a798e9aead8..acd1f64f264d 100644
--- a/metadata/md5-cache/dev-python/keyring-23.2.1
+++ b/metadata/md5-cache/dev-python/keyring-23.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/jaraco/keyring/archive/v23.2.1.tar.gz -> keyring-23.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c3b2343b089e62e455a9894dc0892b4
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.2.1-r1 b/metadata/md5-cache/dev-python/keystoneauth-4.2.1-r1
index fdd786a7998c..82b9ce46e11c 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.2.1-r1
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.2.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/k/keystoneauth1/keystoneauth1-4.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fcbcf066b7835dc5a4ae270e94a084e
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.4.0 b/metadata/md5-cache/dev-python/keystoneauth-4.4.0
index 2d1b009ba5fb..67e81bfb2b12 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.4.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9614557f4a32a614c810f8d4180cbda3
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.1 b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
index 0f846326b89f..d020d1d8a40b 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.3.1.tar.gz -> kiwisolver-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=038b0de0f1cf0705fa8b1f3d8262850c
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.2 b/metadata/md5-cache/dev-python/kiwisolver-1.3.2
index dc75c814dcea..9420b803babd 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.2
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.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/nucleic/kiwi/archive/1.3.2.rc1.tar.gz -> kiwisolver-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15b0066d6562dc151b21c6993c80cc89
diff --git a/metadata/md5-cache/dev-python/klein-20.6.0 b/metadata/md5-cache/dev-python/klein-20.6.0
index a1358b330951..6731cc90bbc0 100644
--- a/metadata/md5-cache/dev-python/klein-20.6.0
+++ b/metadata/md5-cache/dev-python/klein-20.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/klein/klein-20.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8d63639b9c609757c82c266036f36b7
diff --git a/metadata/md5-cache/dev-python/klein-21.8.0 b/metadata/md5-cache/dev-python/klein-21.8.0
index d9e4b0db4d32..8540cc33a17f 100644
--- a/metadata/md5-cache/dev-python/klein-21.8.0
+++ b/metadata/md5-cache/dev-python/klein-21.8.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/k/klein/klein-21.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=760aba0836b16ceee5221a74e1700177
diff --git a/metadata/md5-cache/dev-python/kombu-5.1.0 b/metadata/md5-cache/dev-python/kombu-5.1.0
index daea14c60a10..8e9887182ccc 100644
--- a/metadata/md5-cache/dev-python/kombu-5.1.0
+++ b/metadata/md5-cache/dev-python/kombu-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e7da99280b7d949099023ab13ffcb9e
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.11.2 b/metadata/md5-cache/dev-python/lark-parser-0.11.2
index 8df9e976ef8c..fe752bdb1e97 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.11.2
+++ b/metadata/md5-cache/dev-python/lark-parser-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92bb02b3538eb01a1b36813c35b74684
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 530470b8a81e..449c8cfa08d2 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.11.3
+++ b/metadata/md5-cache/dev-python/lark-parser-0.11.3
@@ -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/l/lark-parser/lark-parser-0.11.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f55413a2e3871d9e1e1730ae9a6df1c9
diff --git a/metadata/md5-cache/dev-python/latexcodec-2.0.1 b/metadata/md5-cache/dev-python/latexcodec-2.0.1
index fb37a09abe7c..1b3d20d8fcdb 100644
--- a/metadata/md5-cache/dev-python/latexcodec-2.0.1
+++ b/metadata/md5-cache/dev-python/latexcodec-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/latexcodec/latexcodec-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a7f2e6670f1a747042fd2630ee9abe95
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.2 b/metadata/md5-cache/dev-python/lazr-config-2.2.2
index 8e62ec6bbde4..4c0fce0f74f0 100644
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.2
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.2.tar.gz -> lazr-config-2.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6508f0303c618881297389affc6a36b
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.3 b/metadata/md5-cache/dev-python/lazr-config-2.2.3
index d3cd3ec6b975..3ca45f277511 100644
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.3
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.3
@@ -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/l/lazr.config/lazr.config-2.2.3.tar.gz -> lazr-config-2.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=573bf314fa2bfcf54df541235dadbf17
diff --git a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4 b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
index c57fd727936a..dbd39707e978 100644
--- a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+++ b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
@@ -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/l/lazr.delegates/lazr.delegates-2.0.4.tar.gz -> lazr-delegates-2.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f4b3ccb4fcb6ec1d7b708c857b47cc4
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
index 78ef541b4292..d64f555d38c4 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
@@ -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/l/lazy-object-proxy/lazy-object-proxy-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e3d9ba5fd0f8af6432d952bec52af2a
diff --git a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508 b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
index efe4d4365c1b..c00e2eac720a 100644
--- a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
+++ b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
@@ -10,5 +10,5 @@ RDEPEND=app-misc/lcdproc python_targets_python3_8? ( dev-lang/python:3.8 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jinglemansweep/lcdproc/archive/973628fc326177c9deaf3f2e1a435159eb565ae0.tar.gz -> lcdproc-0.03_p20150508.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1af92bc6820f26d28712b585bcd974b
diff --git a/metadata/md5-cache/dev-python/ldap3-2.8.1 b/metadata/md5-cache/dev-python/ldap3-2.8.1
index fbb2615be039..c9fc9fcec75f 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.8.1
+++ b/metadata/md5-cache/dev-python/ldap3-2.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cannatag/ldap3/archive/v2.8.1.tar.gz -> ldap3-2.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8a5b11203a56f2265401ba7b80a2435
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 3ddb72f81068..837544275090 100644
--- a/metadata/md5-cache/dev-python/leather-0.3.3-r2
+++ b/metadata/md5-cache/dev-python/leather-0.3.3-r2
@@ -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/wireservice/leather/archive/refs/tags/0.3.3.tar.gz -> leather-0.3.3-src.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d857f4de0e1345ff472bfc87c25fd25a
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.14.0 b/metadata/md5-cache/dev-python/lesscpy-0.14.0
index 79ed08b33a80..45158eeb74bb 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.14.0
+++ b/metadata/md5-cache/dev-python/lesscpy-0.14.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/l/lesscpy/lesscpy-0.14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1dee570ff44aa2d417383441eb20e606
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.15.0 b/metadata/md5-cache/dev-python/lesscpy-0.15.0
index 3e65f7f19cf6..d36fbc2b3341 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.15.0
+++ b/metadata/md5-cache/dev-python/lesscpy-0.15.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/l/lesscpy/lesscpy-0.15.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c70f750d954a6da4b89248effa211612
diff --git a/metadata/md5-cache/dev-python/libarchive-c-3.1 b/metadata/md5-cache/dev-python/libarchive-c-3.1
index 099e3dc64579..2699a131e82f 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-3.1
+++ b/metadata/md5-cache/dev-python/libarchive-c-3.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive python_targets_python3_8? ( dev-lang/python:3.8 ) py
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99f07503c0d5898e33cd9d3757568d5c
diff --git a/metadata/md5-cache/dev-python/libcloud-3.3.0 b/metadata/md5-cache/dev-python/libcloud-3.3.0
index 127a88aea1e0..e46f4a524638 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.3.0
+++ b/metadata/md5-cache/dev-python/libcloud-3.3.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://apache/libcloud/apache-libcloud-3.3.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de852b4f913796f7d1894b9d786e680f
diff --git a/metadata/md5-cache/dev-python/liblarch-3.0.1 b/metadata/md5-cache/dev-python/liblarch-3.0.1
index 37f6e221efc2..fb18b0361fb4 100644
--- a/metadata/md5-cache/dev-python/liblarch-3.0.1
+++ b/metadata/md5-cache/dev-python/liblarch-3.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=https://github.com/getting-things-gnome/liblarch/archive/v3.0.1.tar.gz -> liblarch-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=2cd71f275a9fb6cf4356a05d27b5fa64
diff --git a/metadata/md5-cache/dev-python/liblarch-3.1.0 b/metadata/md5-cache/dev-python/liblarch-3.1.0
index 49f4b5c72889..e14b2f878f1e 100644
--- a/metadata/md5-cache/dev-python/liblarch-3.1.0
+++ b/metadata/md5-cache/dev-python/liblarch-3.1.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/getting-things-gnome/liblarch/archive/v3.1.0.tar.gz -> liblarch-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=95d15c00c2d3831892273b60577baa02
diff --git a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1 b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
index f256c1fb155b..1d36830a9be7 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
+++ b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/libnacl/archive/v1.7.2.tar.gz -> libnacl-1.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0229c5916e025c44332dd9bd41cf709
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.3.0 b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
index 93d1ff2531e6..6dee81ed0c3c 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.3.0
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f84202eb6c6087ae920bacb7cbbd494
diff --git a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0 b/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
index 5226278efe20..f965cad05056 100644
--- a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
+++ b/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gerrymanoim/libpy_simdjson/archive/0.4.0.tar.gz -> libpy_simdjson-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7496bead4e82499922f333543c729b0c
diff --git a/metadata/md5-cache/dev-python/libsass-0.21.0 b/metadata/md5-cache/dev-python/libsass-0.21.0
index 7e49b38f21ce..958a5017112c 100644
--- a/metadata/md5-cache/dev-python/libsass-0.21.0
+++ b/metadata/md5-cache/dev-python/libsass-0.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sass/libsass-python/archive/0.21.0.tar.gz -> libsass-python-0.21.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d0bccbd0fb64fad648955679a7e03e2
diff --git a/metadata/md5-cache/dev-python/libtmux-0.10.1 b/metadata/md5-cache/dev-python/libtmux-0.10.1
index 5c546905556b..3666164774cc 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.10.1
+++ b/metadata/md5-cache/dev-python/libtmux-0.10.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/tmux-python/libtmux/archive/v0.10.1.tar.gz -> libtmux-v0.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bebf3f1065e5209e145fa879bb357322
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.5 b/metadata/md5-cache/dev-python/libtmux-0.8.5
index bb6080cce0ee..5e3083f97c66 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.5
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.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/tmux-python/libtmux/archive/v0.8.5.tar.gz -> libtmux-v0.8.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bea788aa9c23c29e83aefab4778967aa
diff --git a/metadata/md5-cache/dev-python/libtmux-0.9.0 b/metadata/md5-cache/dev-python/libtmux-0.9.0
index 7f7570a9b676..421377fc90eb 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.9.0
+++ b/metadata/md5-cache/dev-python/libtmux-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.9.0.tar.gz -> libtmux-v0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4fbea9f89dbe8c366eda60ee9cde10b
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.0.0 b/metadata/md5-cache/dev-python/libvirt-python-7.0.0
index ae0aca449dad..316430950eb6 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.0.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.0.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.0.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=1df427d5652d99f21188d030a8445189
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.1.0 b/metadata/md5-cache/dev-python/libvirt-python-7.1.0
index 5e53126fe3d8..5acc6d19fbd2 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.1.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=eed9b74cb2d5785d1739fcf1b9536791
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.2.0 b/metadata/md5-cache/dev-python/libvirt-python-7.2.0
index b76f7a8d3172..5d72a7989223 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.2.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.2.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.2.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=eed9b74cb2d5785d1739fcf1b9536791
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.3.0 b/metadata/md5-cache/dev-python/libvirt-python-7.3.0
index 8825cb45962f..9a9869e4def8 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.3.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.3.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.3.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=c05aba5c0f551123c7c72fdc5c9c913f
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.4.0 b/metadata/md5-cache/dev-python/libvirt-python-7.4.0
index 1f40079b6a49..10daf3103787 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.4.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.4.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.4.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.5.0 b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
index 183b6491c1c3..61853b95ddf7 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.5.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.7.0 b/metadata/md5-cache/dev-python/libvirt-python-7.7.0
index ac2ed502e7e0..fda10a208ff3 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.7.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz.asc )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 58e99b016365..f466fe479a77 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python3_8? ( dev-lang
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.3.0 b/metadata/md5-cache/dev-python/line_profiler-3.3.0
index 42c90c95840d..b2c7637e1fad 100644
--- a/metadata/md5-cache/dev-python/line_profiler-3.3.0
+++ b/metadata/md5-cache/dev-python/line_profiler-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyutils/line_profiler/archive/3.3.0.tar.gz -> line_profiler-3.3.0.gh.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9a92bdd8f5d8756707ca8d498353b2aa
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.3.1 b/metadata/md5-cache/dev-python/line_profiler-3.3.1
index 538c1e29cc7c..70370031471a 100644
--- a/metadata/md5-cache/dev-python/line_profiler-3.3.1
+++ b/metadata/md5-cache/dev-python/line_profiler-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyutils/line_profiler/archive/3.3.1.tar.gz -> line_profiler-3.3.1.gh.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9b8c73452d282c59d87f655d73533741
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index beb87c5e5eb1..2a244f14454d 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c0e6b953776c78466294364e7772ca6
diff --git a/metadata/md5-cache/dev-python/lit-11.1.0 b/metadata/md5-cache/dev-python/lit-11.1.0
index f49359546e1e..bbede3c096c8 100644
--- a/metadata/md5-cache/dev-python/lit-11.1.0
+++ b/metadata/md5-cache/dev-python/lit-11.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee4f5cdb01bb3ba49e38903725e3ad88
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1 b/metadata/md5-cache/dev-python/lit-12.0.1
index 2d94f502d422..4a3d91df8d99 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1
+++ b/metadata/md5-cache/dev-python/lit-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a261ed353d0ece43eb281a780c594484
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0 b/metadata/md5-cache/dev-python/lit-13.0.0
new file mode 100644
index 000000000000..f5b992a4ae70
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-13.0.0
@@ -0,0 +1,15 @@
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=26d5a8028365bd3f1219b503572d455a
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0.9999 b/metadata/md5-cache/dev-python/lit-13.0.0.9999
index 35cfa4cab6a4..0b9409741c20 100644
--- a/metadata/md5-cache/dev-python/lit-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-13.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0_rc2 b/metadata/md5-cache/dev-python/lit-13.0.0_rc2
deleted file mode 100644
index 96db516951e2..000000000000
--- a/metadata/md5-cache/dev-python/lit-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-rc2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0_rc3 b/metadata/md5-cache/dev-python/lit-13.0.0_rc3
deleted file mode 100644
index e2c6d5974457..000000000000
--- a/metadata/md5-cache/dev-python/lit-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-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-rc3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0_rc4 b/metadata/md5-cache/dev-python/lit-13.0.0_rc4
deleted file mode 100644
index 12b2fe82647b..000000000000
--- a/metadata/md5-cache/dev-python/lit-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-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-rc4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-14.0.0.9999 b/metadata/md5-cache/dev-python/lit-14.0.0.9999
index 35cfa4cab6a4..0b9409741c20 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-14.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/livereload-2.6.3 b/metadata/md5-cache/dev-python/livereload-2.6.3
index 8c32f203efb4..c32b05aa9e3b 100644
--- a/metadata/md5-cache/dev-python/livereload-2.6.3
+++ b/metadata/md5-cache/dev-python/livereload-2.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/lepture/python-livereload/archive/2.6.3.tar.gz -> livereload-2.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a96d8338b9f410f5797741ef7a947b3
diff --git a/metadata/md5-cache/dev-python/llfuse-1.4.1 b/metadata/md5-cache/dev-python/llfuse-1.4.1
index c88a2e875b81..653bd232d025 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.4.1
+++ b/metadata/md5-cache/dev-python/llfuse-1.4.1
@@ -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/l/llfuse/llfuse-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83c82d70e51f9027c7aedd6d14aaebc5
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.37.0 b/metadata/md5-cache/dev-python/llvmlite-0.37.0
index cea0818d37ff..a66ebbc5c268 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.37.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.37.0
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:11 sys-libs/zlib:0= python_targets_python3_8? ( dev-lang/
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.37.0.tar.gz -> llvmlite-0.37.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4eb55c2e3dc4d35c642730d45f9e69ac
diff --git a/metadata/md5-cache/dev-python/lmdb-1.2.0-r1 b/metadata/md5-cache/dev-python/lmdb-1.2.0-r1
index 31f98811b487..b5bf452dcdcf 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/lmdb-1.2.0-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/l/lmdb/lmdb-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac2bd78a275e533cd72b725b59a79747
diff --git a/metadata/md5-cache/dev-python/lmdb-1.2.1 b/metadata/md5-cache/dev-python/lmdb-1.2.1
index 59c2a7efcaa5..9409b54e6244 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.2.1
+++ b/metadata/md5-cache/dev-python/lmdb-1.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=mirror://pypi/l/lmdb/lmdb-1.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab240e2214a6f93f1862dc166b7f90df
diff --git a/metadata/md5-cache/dev-python/lmfit-1.0.2 b/metadata/md5-cache/dev-python/lmfit-1.0.2
index e6287981c0f6..acc15b4ac50a 100644
--- a/metadata/md5-cache/dev-python/lmfit-1.0.2
+++ b/metadata/md5-cache/dev-python/lmfit-1.0.2
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.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=>=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.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=Non-Linear Least-Squares Minimization and Curve-Fitting for Python
-EAPI=7
+EAPI=8
 HOMEPAGE=https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/
-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=BSD
-RDEPEND=>=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.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/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.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=mirror://pypi/l/lmfit/lmfit-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd99844bbf4ef13470b5833c6ba4b88c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=adb0d0891796cec5b659d4d8490782c2
diff --git a/metadata/md5-cache/dev-python/locket-0.2.1 b/metadata/md5-cache/dev-python/locket-0.2.1
index e0b8bd6cae41..d31e414b638d 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.1
+++ b/metadata/md5-cache/dev-python/locket-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/locket.py/archive/0.2.1.tar.gz -> locket.py-0.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59fe5b437b72d955f9ef109f4ac90cce
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 461e23a50199..e26956c80a65 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -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/l/lockfile/lockfile-0.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dc39a3b889bd258778bfec14c185539
diff --git a/metadata/md5-cache/dev-python/logbook-1.5.3 b/metadata/md5-cache/dev-python/logbook-1.5.3
index 0b71cffe20b4..7744e0169724 100644
--- a/metadata/md5-cache/dev-python/logbook-1.5.3
+++ b/metadata/md5-cache/dev-python/logbook-1.5.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/getlogbook/logbook/archive/1.5.3.tar.gz -> logbook-1.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=73ca535301d642d2d37841beb199e62a
diff --git a/metadata/md5-cache/dev-python/logfury-0.1.2-r1 b/metadata/md5-cache/dev-python/logfury-0.1.2-r1
index f144ac6017e9..6d6bc7c3038d 100644
--- a/metadata/md5-cache/dev-python/logfury-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/logfury-0.1.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=https://github.com/ppolewicz/logfury/archive/0.1.2.tar.gz -> logfury-0.1.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9491433d6a4a91d0c1a0f05d4b357f99
diff --git a/metadata/md5-cache/dev-python/loguru-0.5.3 b/metadata/md5-cache/dev-python/loguru-0.5.3
index 500b6ad73074..27ac4e3cd2c7 100644
--- a/metadata/md5-cache/dev-python/loguru-0.5.3
+++ b/metadata/md5-cache/dev-python/loguru-0.5.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/Delgan/loguru/archive/0.5.3.tar.gz -> loguru-0.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=097954ead76739c4b0930556c08b6b69
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.5 b/metadata/md5-cache/dev-python/logutils-0.3.5
index 1795debed827..601d1026adb0 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.5
+++ b/metadata/md5-cache/dev-python/logutils-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e56537268b07f21ef51f2ea49028c85
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
index e2a3c34476c8..2498048d388e 100644
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ b/metadata/md5-cache/dev-python/loky-2.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c57cd7d33a348da8e7ee1c0cbe81613
diff --git a/metadata/md5-cache/dev-python/loky-3.0.0 b/metadata/md5-cache/dev-python/loky-3.0.0
index c7e9858481b4..cdf08d10affa 100644
--- a/metadata/md5-cache/dev-python/loky-3.0.0
+++ b/metadata/md5-cache/dev-python/loky-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/3.0.0.tar.gz -> loky-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d72b25521d4bb6eedff586783669252e
diff --git a/metadata/md5-cache/dev-python/lunr-0.6.0 b/metadata/md5-cache/dev-python/lunr-0.6.0
index 23beffe20e64..689f562244b1 100644
--- a/metadata/md5-cache/dev-python/lunr-0.6.0
+++ b/metadata/md5-cache/dev-python/lunr-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yeraydiazdiaz/lunr.py/archive/0.6.0.tar.gz -> lunr-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54709475eff3fb6ffc2518cca3191c32
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.3 b/metadata/md5-cache/dev-python/lxml-4.6.3
index 76424211dd5e..96829e404813 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.3
+++ b/metadata/md5-cache/dev-python/lxml-4.6.3
@@ -5,12 +5,12 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_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 ~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=BSD ElementTree GPL-2 PSF-2
 RDEPEND=<dev-libs/libxml2-2.9.12 >=dev-libs/libxslt-1.1.28 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/lxml/lxml/archive/lxml-4.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a1edd1e11749ab98e6fd6610f61d316
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b293e2c22722ffa4eea96673a3bca374
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 520f65598b28..63dd09c375ca 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbd7bd571f2c0c769a073bd30aa58c49
diff --git a/metadata/md5-cache/dev-python/lz4-3.1.3 b/metadata/md5-cache/dev-python/lz4-3.1.3
index ac526ce5d97a..038b773dea9a 100644
--- a/metadata/md5-cache/dev-python/lz4-3.1.3
+++ b/metadata/md5-cache/dev-python/lz4-3.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-3.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae52353875f16cd95abe27598f51da67
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.38.0 b/metadata/md5-cache/dev-python/m2crypto-0.38.0
index 030237d7063a..6bfe3f102fc9 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.38.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.38.0
@@ -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/M/M2Crypto/M2Crypto-0.38.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7faaf3536e1318d6693bea820db4324
diff --git a/metadata/md5-cache/dev-python/m2r-0.2.1 b/metadata/md5-cache/dev-python/m2r-0.2.1
index 1a076588cea7..8859002d5ec8 100644
--- a/metadata/md5-cache/dev-python/m2r-0.2.1
+++ b/metadata/md5-cache/dev-python/m2r-0.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/miyakogi/m2r/archive/v0.2.1.tar.gz -> m2r-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9b06d8866b06013a923c0a00eb27ee9
diff --git a/metadata/md5-cache/dev-python/mako-1.1.4 b/metadata/md5-cache/dev-python/mako-1.1.4
deleted file mode 100644
index 12d2d60d3baa..000000000000
--- a/metadata/md5-cache/dev-python/mako-1.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/markupsafe-0.9.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 postinst prepare test
-DESCRIPTION=A Python templating language
-EAPI=7
-HOMEPAGE=https://www.makotemplates.org/ https://pypi.org/project/Mako/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/markupsafe-0.9.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/M/Mako/Mako-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8936fd14b9485c56b7a958edcb49e8fb
diff --git a/metadata/md5-cache/dev-python/mako-1.1.5 b/metadata/md5-cache/dev-python/mako-1.1.5
index 2cee93827f98..cfab58b7ac0a 100644
--- a/metadata/md5-cache/dev-python/mako-1.1.5
+++ b/metadata/md5-cache/dev-python/mako-1.1.5
@@ -4,12 +4,12 @@ DESCRIPTION=A Python templating language
 EAPI=8
 HOMEPAGE=https://www.makotemplates.org/ https://pypi.org/project/Mako/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.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/M/Mako/Mako-1.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=331630969d6a84584bcb5688ecaf168b
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=69ced58de00f30c6439845e4eb0b3ba4
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.2 b/metadata/md5-cache/dev-python/mamba-0.11.2
index 404c011fe37a..89328bed846f 100644
--- a/metadata/md5-cache/dev-python/mamba-0.11.2
+++ b/metadata/md5-cache/dev-python/mamba-0.11.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/nestorsalceda/mamba/archive/v0.11.2.tar.gz -> mamba-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7bcaa031e2587bf3666de31f8ab03dbe
diff --git a/metadata/md5-cache/dev-python/mando-0.6.4-r1 b/metadata/md5-cache/dev-python/mando-0.6.4-r1
index 6fdec1bf005b..91c3ec69add2 100644
--- a/metadata/md5-cache/dev-python/mando-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/mando-0.6.4-r1
@@ -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/rubik/mando/archive/v0.6.4.tar.gz -> mando-0.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ada574307ea8315e5f6c4e303d606c1f
diff --git a/metadata/md5-cache/dev-python/manuel-1.10.1 b/metadata/md5-cache/dev-python/manuel-1.10.1
index 9a35f60f985e..8859bf1f2b87 100644
--- a/metadata/md5-cache/dev-python/manuel-1.10.1
+++ b/metadata/md5-cache/dev-python/manuel-1.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/m/manuel/manuel-1.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1de83a8b89e49f43cbd1d260d3a69da4
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index 1378c3d090d4..8a29df655a76 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a41266be8c7aee6f55a155eaec59b183
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.4 b/metadata/md5-cache/dev-python/markdown-3.3.4
index f2326f7afc59..3e170f640cf3 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.4
+++ b/metadata/md5-cache/dev-python/markdown-3.3.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/Markdown/Markdown-3.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=009ea120b3f87bb2076399fce0137a63
diff --git a/metadata/md5-cache/dev-python/markdown2-2.4.1 b/metadata/md5-cache/dev-python/markdown2-2.4.1
index 132179ab0988..7d2e01827359 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.4.1
+++ b/metadata/md5-cache/dev-python/markdown2-2.4.1
@@ -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/markdown2/markdown2-2.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d63c3676320a48f641aeea6fa1f097dd
diff --git a/metadata/md5-cache/dev-python/markups-3.1.1 b/metadata/md5-cache/dev-python/markups-3.1.1
index a776453d7730..0110e2e52c64 100644
--- a/metadata/md5-cache/dev-python/markups-3.1.1
+++ b/metadata/md5-cache/dev-python/markups-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b5fa1edcab4dbdabd5a1934cf5b92a6
diff --git a/metadata/md5-cache/dev-python/markups-3.1.2 b/metadata/md5-cache/dev-python/markups-3.1.2
index e3656aac4a9b..ca952057c005 100644
--- a/metadata/md5-cache/dev-python/markups-3.1.2
+++ b/metadata/md5-cache/dev-python/markups-3.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=mirror://pypi/M/Markups/Markups-3.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b5a586db817a7a8489493562f4391d0
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1 b/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
index 68c695588724..e3f8d1850940 100644
--- a/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
@@ -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/MarkupSafe/MarkupSafe-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f29adae07790c1608dc1357e49e66ff
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.0.0 b/metadata/md5-cache/dev-python/markupsafe-2.0.0
index 24b733a8de2d..78aefcc0bebe 100644
--- a/metadata/md5-cache/dev-python/markupsafe-2.0.0
+++ b/metadata/md5-cache/dev-python/markupsafe-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99f790b07e34cc5e967a943207e2a32a
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.0.1 b/metadata/md5-cache/dev-python/markupsafe-2.0.1
index ce78932f7861..f13d046f3529 100644
--- a/metadata/md5-cache/dev-python/markupsafe-2.0.1
+++ b/metadata/md5-cache/dev-python/markupsafe-2.0.1
@@ -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/MarkupSafe/MarkupSafe-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=029037c1f791220b8ec5c6c583beca10
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.11.1 b/metadata/md5-cache/dev-python/marshmallow-3.11.1
index 6a66889d8303..89ae99d8ae98 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.11.1
+++ b/metadata/md5-cache/dev-python/marshmallow-3.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=218557aa78a8e89d586c8247df5e1b32
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.0 b/metadata/md5-cache/dev-python/marshmallow-3.12.0
index aeba7ca1faba..1f16aaa9953a 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.0
+++ b/metadata/md5-cache/dev-python/marshmallow-3.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=218557aa78a8e89d586c8247df5e1b32
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.1 b/metadata/md5-cache/dev-python/marshmallow-3.12.1
index 452e85b88500..33c1c8412e1c 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.1
+++ b/metadata/md5-cache/dev-python/marshmallow-3.12.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/m/marshmallow/marshmallow-3.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8582cadcb13bb7d95f1aea42e710337
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.2 b/metadata/md5-cache/dev-python/marshmallow-3.12.2
index 72b8505b4e12..d0eb562d9dac 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.2
+++ b/metadata/md5-cache/dev-python/marshmallow-3.12.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/m/marshmallow/marshmallow-3.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c11c88881b537a769efd03ffbe270ec
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.13.0 b/metadata/md5-cache/dev-python/marshmallow-3.13.0
index a63b14074db4..4fb6da5f90f0 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.13.0
+++ b/metadata/md5-cache/dev-python/marshmallow-3.13.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/m/marshmallow/marshmallow-3.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c11c88881b537a769efd03ffbe270ec
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.4.2 b/metadata/md5-cache/dev-python/matplotlib-3.4.2
index 4869ec6bddd7..c93f6e7f73f9 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.4.2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.4.2
@@ -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=mirror://pypi/m/matplotlib/matplotlib-3.4.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=09ee13fa4d3ef06c088a792b35a49c8d
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.4.3 b/metadata/md5-cache/dev-python/matplotlib-3.4.3
index 1c1a21d3ce74..4f42e776f9fc 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.4.3
+++ b/metadata/md5-cache/dev-python/matplotlib-3.4.3
@@ -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=mirror://pypi/m/matplotlib/matplotlib-3.4.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d44db2e41702cf2ae0193ad07d5d2fd8
diff --git a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2 b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
index e0444cbda9b1..acf903292e52 100644
--- a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
+++ b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Inline Matplotlib backend for Jupyter
 EAPI=8
 HOMEPAGE=https://github.com/ipython/matplotlib-inline/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ipython/matplotlib-inline/archive/0.1.2.tar.gz -> matplotlib-inline-0.1.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=725565b76283cd229c2cf4897c7d0106
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ebb0e3c75239947345693b1f9a588b28
diff --git a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3 b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
index 9faa1500730a..2345ef472a12 100644
--- a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
+++ b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ipython/matplotlib-inline/archive/0.1.3.tar.gz -> matplotlib-inline-0.1.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=192e68e500193895c28adb380e6d317f
diff --git a/metadata/md5-cache/dev-python/matterhook-0.2-r1 b/metadata/md5-cache/dev-python/matterhook-0.2-r1
index fc98d2011bd6..b5476b1ccaa5 100644
--- a/metadata/md5-cache/dev-python/matterhook-0.2-r1
+++ b/metadata/md5-cache/dev-python/matterhook-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matterhook/matterhook-0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ce04ec3a317ed7a795f3bdc51b95315
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2 b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
index 5c5c36d7e7f9..0aab87eeff76 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
@@ -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/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e43bf55bc711d15b6ef2b8851893cda
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
index aefb72e79d53..f976c6f65f64 100644
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2
+++ b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14112366bf4bcf228b52ddfd5c183d06
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.996 b/metadata/md5-cache/dev-python/mecab-python-0.996
index b4840342596d..f4b1437577b2 100644
--- a/metadata/md5-cache/dev-python/mecab-python-0.996
+++ b/metadata/md5-cache/dev-python/mecab-python-0.996
@@ -11,5 +11,5 @@ RDEPEND=~app-text/mecab-0.996 python_targets_python3_8? ( dev-lang/python:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-python-0.996.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afb43c7b74abf2e5ac3893613f32479f
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.5-r1 b/metadata/md5-cache/dev-python/mechanize-0.4.5-r1
index 844ae438801b..e3fe00b1e72c 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.5-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/m/mechanize/mechanize-0.4.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43f8c419212875abd92c037fda8f1de9
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.6 b/metadata/md5-cache/dev-python/mechanize-0.4.6
index 4dba015328bf..e4aa1b39058b 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.4.6
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.6
@@ -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/m/mechanize/mechanize-0.4.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd54191deac70851d55b64b97fe5dbbe
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.7 b/metadata/md5-cache/dev-python/mechanize-0.4.7
index 2ce270ae0827..48742c504a59 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.4.7
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.7
@@ -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/m/mechanize/mechanize-0.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd54191deac70851d55b64b97fe5dbbe
diff --git a/metadata/md5-cache/dev-python/mediafile-0.6.0 b/metadata/md5-cache/dev-python/mediafile-0.6.0
index 3b131c2b1c13..e2771ffc6e08 100644
--- a/metadata/md5-cache/dev-python/mediafile-0.6.0
+++ b/metadata/md5-cache/dev-python/mediafile-0.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/mediafile/archive/v0.6.0.tar.gz -> mediafile-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e748cc1b71075ea50438275df288652
diff --git a/metadata/md5-cache/dev-python/mediafile-0.7.0 b/metadata/md5-cache/dev-python/mediafile-0.7.0
index 2e4c50c546ab..b76f585fc6fb 100644
--- a/metadata/md5-cache/dev-python/mediafile-0.7.0
+++ b/metadata/md5-cache/dev-python/mediafile-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/mediafile/archive/v0.7.0.tar.gz -> mediafile-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/mediafile-0.8.0 b/metadata/md5-cache/dev-python/mediafile-0.8.0
index 5064490c3225..7847abb14c1d 100644
--- a/metadata/md5-cache/dev-python/mediafile-0.8.0
+++ b/metadata/md5-cache/dev-python/mediafile-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/mediafile/archive/v0.8.0.tar.gz -> mediafile-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/mediafile-0.8.1 b/metadata/md5-cache/dev-python/mediafile-0.8.1
new file mode 100644
index 000000000000..c921eeb2b9c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mediafile-0.8.1
@@ -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(-)] ) ) ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[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/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read and write audio files' tags in Python
+EAPI=8
+HOMEPAGE=https://github.com/beetbox/mediafile
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.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/beetbox/mediafile/archive/v0.8.1.tar.gz -> mediafile-0.8.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.57 b/metadata/md5-cache/dev-python/memory_profiler-0.57
index 34c8376b7d23..b2e89d2fcc62 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.57
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.57
@@ -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/pythonprofilers/memory_profiler/archive/v0.57.tar.gz -> memory_profiler-0.57.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8cbd1bf4f6cbb98278458a282a2e4705
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.58.0 b/metadata/md5-cache/dev-python/memory_profiler-0.58.0
index 02daab7eab68..5233abc0a893 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.58.0
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.58.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pythonprofilers/memory_profiler/archive/0.58.0.tar.gz -> memory_profiler-0.58.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbb9a82592eb37888e1c45aeac4d2ec7
diff --git a/metadata/md5-cache/dev-python/mergedeep-1.3.4 b/metadata/md5-cache/dev-python/mergedeep-1.3.4
index fccf8f71eb6e..0adeb2c55c6c 100644
--- a/metadata/md5-cache/dev-python/mergedeep-1.3.4
+++ b/metadata/md5-cache/dev-python/mergedeep-1.3.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/clarketm/mergedeep/archive/refs/tags/v1.3.4.tar.gz -> mergedeep-1.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4424d96b71bc5e9808416a6277af6cc1
diff --git a/metadata/md5-cache/dev-python/mergedict-1.0.0 b/metadata/md5-cache/dev-python/mergedict-1.0.0
index 508be36e5fdf..0301dfeab114 100644
--- a/metadata/md5-cache/dev-python/mergedict-1.0.0
+++ b/metadata/md5-cache/dev-python/mergedict-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48e186a9275b6461d8dbfc87b26fce30
diff --git a/metadata/md5-cache/dev-python/metakernel-0.25.0-r1 b/metadata/md5-cache/dev-python/metakernel-0.25.0-r1
index 06ca1272c1cb..ffe06508569d 100644
--- a/metadata/md5-cache/dev-python/metakernel-0.25.0-r1
+++ b/metadata/md5-cache/dev-python/metakernel-0.25.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/m/metakernel/metakernel-0.25.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b18dceb26adc40dd281a1c458572eab
diff --git a/metadata/md5-cache/dev-python/micawber-0.5.4 b/metadata/md5-cache/dev-python/micawber-0.5.4
index 6ab44efed33a..f133cb64fbdd 100644
--- a/metadata/md5-cache/dev-python/micawber-0.5.4
+++ b/metadata/md5-cache/dev-python/micawber-0.5.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/coleifer/micawber/archive/0.5.4.tar.gz -> micawber-0.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b11035ec3f61b22db5b150f9b5eab1a7
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0 b/metadata/md5-cache/dev-python/mimerender-0.6.0
index faf2ef2b7106..9c6e749998c9 100644
--- a/metadata/md5-cache/dev-python/mimerender-0.6.0
+++ b/metadata/md5-cache/dev-python/mimerender-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinblech/mimerender/archive/v0.6.0.tar.gz -> mimerender-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c0d549e787ecdebb030263bfc11e32ab
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.5 b/metadata/md5-cache/dev-python/minidb-2.0.5
index 09bcc155dcc3..04a6f05d057b 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.5
+++ b/metadata/md5-cache/dev-python/minidb-2.0.5
@@ -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/m/minidb/minidb-2.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=856e450e09023c453be831796293e058
diff --git a/metadata/md5-cache/dev-python/minimock-1.3.0 b/metadata/md5-cache/dev-python/minimock-1.3.0
index 7f148f547a26..ee29d7800c4f 100644
--- a/metadata/md5-cache/dev-python/minimock-1.3.0
+++ b/metadata/md5-cache/dev-python/minimock-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lowks/minimock/archive/v1.3.0.tar.gz -> minimock-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9dd2cc65cf2c9d64ac3f29743cd1892
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.1 b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
index 963019bb8775..6a2d7122ebc5 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.1
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.1:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz.sig )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0879fd9f105cb0bf581815d0ed4d21ab
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.2 b/metadata/md5-cache/dev-python/miniupnpc-2.2.2
index bd988c0a8b3e..ec0102ba0d59 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.2
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.2:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz.sig )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0879fd9f105cb0bf581815d0ed4d21ab
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.3 b/metadata/md5-cache/dev-python/miniupnpc-2.2.3
new file mode 100644
index 000000000000..849e532f0eef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.3
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=net-libs/miniupnpc-2.2.3:0=
+DESCRIPTION=Python bindings for UPnP client library
+EAPI=8
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/miniupnpc-2.2.3:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz.sig )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=523022c6eb4620bd44159d79490c15f9
diff --git a/metadata/md5-cache/dev-python/misaka-2.1.1 b/metadata/md5-cache/dev-python/misaka-2.1.1
index e5b736d9093e..eb5fed520c59 100644
--- a/metadata/md5-cache/dev-python/misaka-2.1.1
+++ b/metadata/md5-cache/dev-python/misaka-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi[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/FSX/misaka/archive/v2.1.1.tar.gz -> misaka-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aafc74d21f798c2ccd840f4245649634
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.4-r1 b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
index ebf37a210e60..04b079500e35 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.4-r1
+++ b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
@@ -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/mistune/mistune-0.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c5a84dfad046613cf1d9686c9178568
diff --git a/metadata/md5-cache/dev-python/mkautodoc-0.1.0 b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
index 88d969fee9f2..6e2eeacc7580 100644
--- a/metadata/md5-cache/dev-python/mkautodoc-0.1.0
+++ b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomchristie/mkautodoc/archive/0.1.0.tar.gz -> mkautodoc-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36cc5c62cd591db590072f7726d54258
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.2.2 b/metadata/md5-cache/dev-python/mkdocs-1.2.2
index 1f6cf4d6a28a..d266167c9615 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.2.2
+++ b/metadata/md5-cache/dev-python/mkdocs-1.2.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/mkdocs/mkdocs/archive/1.2.2.tar.gz -> mkdocs-1.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3fcd4720d67a6f42e48803667b2b16b
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
index b5f43977e6c9..7700036c4c9a 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mkdocs python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootstrap/archive/1.1.tar.gz -> mkdocs-bootstrap-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cd81062165daa3ca9ae8d2c5e3a608d
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
index 668d092dfa98..56d14359cb9a 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mkdocs python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootswatch/archive/1.1.tar.gz -> mkdocs-bootswatch-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=650c27e58f339b12397b4850084cf039
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
index b2ff0915c7ce..b256a6fc1f99 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.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/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.10.0.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5bea986dfe1b423e4a0268b38bb90fd
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
index 6d1df854aabe..88979e751373 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.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/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.2.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8089f0e98f506c34f9816eb7e696915
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3
index 9b3df08377ac..fb65f6f36ed9 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.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/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.3.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ebe5ef4407d590437a8f8d39a4164c55
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.2 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.2
deleted file mode 100644
index 2d42b23ea765..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-7.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78a58bdca439738f6b891fd05c8e1606
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.4 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.4
index 6c77ce6bdaac..50290342bea8 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-7.2.4
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.2.4
@@ -4,11 +4,11 @@ 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
+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.4.tar.gz -> mkdocs-material-7.2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2569a46fee919f91e8dfd3490039592
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=78a58bdca439738f6b891fd05c8e1606
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.6 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.6
index d64c2956338f..7bc8d3c11748 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-7.2.6
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.2.6.tar.gz -> mkdocs-material-7.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=565ab7838efa76eda4dd4f269e025587
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
index b83f6868e263..97ff03b77bbd 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs-material-extensions/archive/1.0.1.tar.gz -> mkdocs-material-extensions-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a08d7671a97a3263c6cf4c94f8383da
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
index 8fae59acd59b..16d70ddce812 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
+++ b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
@@ -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/facelessuser/mkdocs-material-extensions/archive/1.0.3.tar.gz -> mkdocs-material-extensions-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fee25f268899a05231ddc8905dbd005c
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
index c58c99144a86..e6f406a25360 100644
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8eae481aba18b285127819d97109f5f
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1
index 49608e3b2b46..a81337f388c1 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/datarobot/mkdocs-redirects/archive/v1.0.1.tar.gz -> mkdocs-redirects-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9553433072d214ee22cb1f78be7520be
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
index 2c9090cf6819..f5a8ad17fbce 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-redirects/mkdocs-redirects-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7baf2e3f0fd329ae9c856edc55454c48
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
index 31780da03f86..7093ee943924 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
@@ -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/datarobot/mkdocs-redirects/archive/07ef89796ec97be3c6ea2681441992d5d4bfa87b.tar.gz -> mkdocs-redirects-1.0.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59b4810c4692bb300dac01b1fc956436
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
index 83c9bddb7be7..a454a43f1542 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?] python_
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.0.7.tar.gz -> mkdocs_pymdownx_material_extras-1.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d70b0eeb31dbfc2e676acafcbcf2bc1f
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
index 0e1332d2e8bf..9e44db08ca19 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?] python_
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.1.3.tar.gz -> mkdocs_pymdownx_material_extras-1.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d70b0eeb31dbfc2e676acafcbcf2bc1f
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
index 9d1d4aafe387..7b8802fdd4f7 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.4.0.tar.gz -> mkdocs_pymdownx_material_extras-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f03f78723e4511f71101c884e97e6cf
diff --git a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1 b/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
index 6ee35f3df084..1d0dc5959990 100644
--- a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/mmtf-python-1.1.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/m/mmtf-python/mmtf-python-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d2c8ed850e5f3e9b298adc476a460c7
diff --git a/metadata/md5-cache/dev-python/mock-4.0.3 b/metadata/md5-cache/dev-python/mock-4.0.3
index af6dbcbdd1a4..908bdfde7c4e 100644
--- a/metadata/md5-cache/dev-python/mock-4.0.3
+++ b/metadata/md5-cache/dev-python/mock-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/testing-cabal/mock/archive/4.0.3.tar.gz -> mock-4.0.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b1192b7febe0e9a60d16c03752a301d
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.23.1 b/metadata/md5-cache/dev-python/mongoengine-0.23.1
index 94f8148ccfb9..0688a70528bc 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.23.1
+++ b/metadata/md5-cache/dev-python/mongoengine-0.23.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/MongoEngine/mongoengine/archive/v0.23.1.tar.gz -> mongoengine-0.23.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db5509062d1eb728663f0a7304890019
diff --git a/metadata/md5-cache/dev-python/mongomock-3.23.0 b/metadata/md5-cache/dev-python/mongomock-3.23.0
index ec644291a713..93256d3eed6f 100644
--- a/metadata/md5-cache/dev-python/mongomock-3.23.0
+++ b/metadata/md5-cache/dev-python/mongomock-3.23.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mongomock/mongomock-3.23.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4bfef17d45e64ec29fe387c00b8e5b3
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.10.0 b/metadata/md5-cache/dev-python/more-itertools-8.10.0
index cbcde1e8d4df..1d16b75d3e53 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.10.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8d1bf0f2c48b5f05839ca45d3a77ddb
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.8.0 b/metadata/md5-cache/dev-python/more-itertools-8.8.0
index 1f3596d8db28..0948e972bd6e 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.8.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f2247a76effd2e09271ffe1e0d23f47
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.9.0 b/metadata/md5-cache/dev-python/more-itertools-8.9.0
index 3b4c00e520ed..463cf6d72e15 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.9.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8d1bf0f2c48b5f05839ca45d3a77ddb
diff --git a/metadata/md5-cache/dev-python/moto-2.0.10-r1 b/metadata/md5-cache/dev-python/moto-2.0.10-r1
index 4df22bc1fd6c..0823acba023f 100644
--- a/metadata/md5-cache/dev-python/moto-2.0.10-r1
+++ b/metadata/md5-cache/dev-python/moto-2.0.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.0.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b84c9bbd5a3fa1032da529eb58c6092d
diff --git a/metadata/md5-cache/dev-python/moto-2.0.5-r1 b/metadata/md5-cache/dev-python/moto-2.0.5-r1
index bff9cd073d23..9b56601481e1 100644
--- a/metadata/md5-cache/dev-python/moto-2.0.5-r1
+++ b/metadata/md5-cache/dev-python/moto-2.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=510ba8b7c81b8dcd0912b95a924bc97c
diff --git a/metadata/md5-cache/dev-python/moto-2.2.0-r1 b/metadata/md5-cache/dev-python/moto-2.2.0-r1
index 0ee861981d62..57d9b34f4416 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/moto-2.2.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/m/moto/moto-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=619abd790af5e89902cc5acd5e143e58
diff --git a/metadata/md5-cache/dev-python/moto-2.2.2-r1 b/metadata/md5-cache/dev-python/moto-2.2.2-r1
index cd9ef5a80574..74a022f0ac9a 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/moto-2.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/moto-2.2.3-r1 b/metadata/md5-cache/dev-python/moto-2.2.3-r1
index 1718638ceeb5..ff257ca20068 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.3-r1
+++ b/metadata/md5-cache/dev-python/moto-2.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/moto-2.2.4-r1 b/metadata/md5-cache/dev-python/moto-2.2.4-r1
index bf3749a044f7..008b3ccd64f3 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.4-r1
+++ b/metadata/md5-cache/dev-python/moto-2.2.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ef9cab908e4e0fab6f7879dab7f4ebc
diff --git a/metadata/md5-cache/dev-python/moto-2.2.5 b/metadata/md5-cache/dev-python/moto-2.2.5
index c21aec1f5673..5041d8f7bac2 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.5
+++ b/metadata/md5-cache/dev-python/moto-2.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40888cd5fce79c177870580329d768da
diff --git a/metadata/md5-cache/dev-python/moto-2.2.6 b/metadata/md5-cache/dev-python/moto-2.2.6
index befc01f97cc8..9501741db5b4 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.6
+++ b/metadata/md5-cache/dev-python/moto-2.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40888cd5fce79c177870580329d768da
diff --git a/metadata/md5-cache/dev-python/mpdlcd-0.5.2 b/metadata/md5-cache/dev-python/mpdlcd-0.5.2
index 6425ece7679d..058c9704b4ec 100644
--- a/metadata/md5-cache/dev-python/mpdlcd-0.5.2
+++ b/metadata/md5-cache/dev-python/mpdlcd-0.5.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/rbarrois/mpdlcd/archive/mpdlcd-0.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8e3591c193536278bf2e4fceb1a2b8d
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.3 b/metadata/md5-cache/dev-python/mpi4py-3.0.3
index efcd052611a8..ac8d264bef8a 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.3
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-3.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=906e5073d03523f71462489c373eed33
diff --git a/metadata/md5-cache/dev-python/mpmath-1.2.1 b/metadata/md5-cache/dev-python/mpmath-1.2.1
index 43628682c1bc..1e3a0d305bb6 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.2.1
+++ b/metadata/md5-cache/dev-python/mpmath-1.2.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/fredrik-johansson/mpmath/archive/1.2.1.tar.gz -> mpmath-1.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=aa3efc9ec3695dd163f7ed1f95a534f5
diff --git a/metadata/md5-cache/dev-python/msgpack-0.6.2 b/metadata/md5-cache/dev-python/msgpack-0.6.2
index 003cdd22a62c..97ad9aed4f3b 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.6.2
+++ b/metadata/md5-cache/dev-python/msgpack-0.6.2
@@ -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/m/msgpack/msgpack-0.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfff5040a40defa2bc6af8ae5d875924
diff --git a/metadata/md5-cache/dev-python/msgpack-1.0.2 b/metadata/md5-cache/dev-python/msgpack-1.0.2
index aa3aaa104617..c2eb9bf349f8 100644
--- a/metadata/md5-cache/dev-python/msgpack-1.0.2
+++ b/metadata/md5-cache/dev-python/msgpack-1.0.2
@@ -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/msgpack/msgpack-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ff868a5a98be4f268fab0a85058a5ef
diff --git a/metadata/md5-cache/dev-python/mss-6.1.0 b/metadata/md5-cache/dev-python/mss-6.1.0
index e79bfab0411c..2fb75b393c46 100644
--- a/metadata/md5-cache/dev-python/mss-6.1.0
+++ b/metadata/md5-cache/dev-python/mss-6.1.0
@@ -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/BoboTiG/python-mss/archive/v6.1.0.tar.gz -> mss-6.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6d33ef155ec31650eea1f7d86c838f4f
diff --git a/metadata/md5-cache/dev-python/multidict-5.1.0 b/metadata/md5-cache/dev-python/multidict-5.1.0
index 07ad391bd463..2a62df1ed9c5 100644
--- a/metadata/md5-cache/dev-python/multidict-5.1.0
+++ b/metadata/md5-cache/dev-python/multidict-5.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/aio-libs/multidict/archive/v5.1.0.tar.gz -> multidict-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=026be36453146d61fce52f286995d00c
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index e86f3d11144e..8b897324f9c5 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.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=mirror://pypi/m/munch/munch-2.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f945df7fc8bdfecf9977a8c3e1ff1c37
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.2 b/metadata/md5-cache/dev-python/munkres-1.1.2
index ca5c2cd4a7ec..f8b5ca6b8cb3 100644
--- a/metadata/md5-cache/dev-python/munkres-1.1.2
+++ b/metadata/md5-cache/dev-python/munkres-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/bmc/munkres/archive/release-1.1.2.tar.gz -> munkres-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b4fc4243089879df54b26bb0da9a0ba
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.4 b/metadata/md5-cache/dev-python/munkres-1.1.4
index 9fd89498678a..00e6338d15fd 100644
--- a/metadata/md5-cache/dev-python/munkres-1.1.4
+++ b/metadata/md5-cache/dev-python/munkres-1.1.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/bmc/munkres/archive/release-1.1.4.tar.gz -> munkres-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f0ad04293686f0702347f84a9e58893
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.8 b/metadata/md5-cache/dev-python/mygpoclient-1.8
index 34ce811ac7b6..fab457cac0bf 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.8
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.8.tar.gz -> mygpoclient-1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4eb197a13de71b73fb70d519b6ad1b32
diff --git a/metadata/md5-cache/dev-python/mypy-0.910 b/metadata/md5-cache/dev-python/mypy-0.910
index df811a774ceb..fc6739aec3e3 100644
--- a/metadata/md5-cache/dev-python/mypy-0.910
+++ b/metadata/md5-cache/dev-python/mypy-0.910
@@ -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/python/mypy/archive/v0.910.tar.gz -> mypy-0.910.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3da039fcfcb07ca00c385d3a95b4c64c
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index 69bba504ee3b..b8cd52c6b922 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -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/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c13b6fd794aa204418e61b153b28830f
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
index 97cd054c3675..7fd33293d7c4 100644
--- a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.26
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.26
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af0a6b5ba496f20104272697c2cf74ee
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1 b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
index 150da8f8a6d8..058ba7a6244f 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python dev-db/mysql-connector-c:0= python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.4.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d8ea9ca03e1b0c29f457765067d30369
diff --git a/metadata/md5-cache/dev-python/mysqlclient-2.0.3 b/metadata/md5-cache/dev-python/mysqlclient-2.0.3
index 1418b4d47bbe..b2d3c52e9761 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-2.0.3
+++ b/metadata/md5-cache/dev-python/mysqlclient-2.0.3
@@ -5,12 +5,12 @@ DESCRIPTION=Fork of MySQL-python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-db/mysql-connector-c: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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48823596c9af446f00d9eb031c46e8b3
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9912052e4bec5e2d77d6851c5eea612f
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
index 0ba33a08097d..ce8ca7c48b08 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nagiosplugin/nagiosplugin-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05e888c9a3e2f6851d41ac0e2efd7bae
diff --git a/metadata/md5-cache/dev-python/natsort-7.1.1 b/metadata/md5-cache/dev-python/natsort-7.1.1
index 66d1253a6f4b..b01c5b20a64b 100644
--- a/metadata/md5-cache/dev-python/natsort-7.1.1
+++ b/metadata/md5-cache/dev-python/natsort-7.1.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/n/natsort/natsort-7.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44d6524ac8cd3c2c4ebac3fd690cfa05
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.3.1 b/metadata/md5-cache/dev-python/nbclassic-0.3.1
index b70354f3abf4..fc305378591e 100644
--- a/metadata/md5-cache/dev-python/nbclassic-0.3.1
+++ b/metadata/md5-cache/dev-python/nbclassic-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyterlab/nbclassic/archive/refs/tags/0.3.1.tar.gz -> nbclassic-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4606eb150497901f8af49a24ae026f4f
diff --git a/metadata/md5-cache/dev-python/nbclient-0.5.3 b/metadata/md5-cache/dev-python/nbclient-0.5.3
index 1c9fc188eb8e..ec2e4e34f9ee 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.5.3
+++ b/metadata/md5-cache/dev-python/nbclient-0.5.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/jupyter/nbclient/archive/0.5.3.tar.gz -> nbclient-0.5.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=946bbe7670b5ffc8512ad2a527bdd64d
diff --git a/metadata/md5-cache/dev-python/nbclient-0.5.4 b/metadata/md5-cache/dev-python/nbclient-0.5.4
index 23a3024bee01..6cbe1e8fb802 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.5.4
+++ b/metadata/md5-cache/dev-python/nbclient-0.5.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/jupyter/nbclient/archive/0.5.4.tar.gz -> nbclient-0.5.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=995678cffa92bef934b101dc173b67b1
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.0.7 b/metadata/md5-cache/dev-python/nbconvert-6.0.7
index a5730e2f2689..2dd6d2c25cdd 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.0.7
+++ b/metadata/md5-cache/dev-python/nbconvert-6.0.7
@@ -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/n/nbconvert/nbconvert-6.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e609c86f3520ecc7bf71739ac8be3c76
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.2.0 b/metadata/md5-cache/dev-python/nbconvert-6.2.0
index 4a6ad9112ade..3c83d6d1583b 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.2.0
+++ b/metadata/md5-cache/dev-python/nbconvert-6.2.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/n/nbconvert/nbconvert-6.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7809166f37d5fd7213e9c6b5078dbc4b
diff --git a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1 b/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
index be4086d6abbc..d548ce21ccc7 100644
--- a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/nbdime-2.0.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/n/nbdime/nbdime-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca964cbb64bfc1aaf25489b02e7610c5
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.0 b/metadata/md5-cache/dev-python/nbdime-3.1.0
index 2015e70c063c..ecf507eafc72 100644
--- a/metadata/md5-cache/dev-python/nbdime-3.1.0
+++ b/metadata/md5-cache/dev-python/nbdime-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55a8684ddf39304c65ec1294abfdcf64
diff --git a/metadata/md5-cache/dev-python/nbformat-5.1.3 b/metadata/md5-cache/dev-python/nbformat-5.1.3
index e272fade13b4..879f361d8233 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.1.3
+++ b/metadata/md5-cache/dev-python/nbformat-5.1.3
@@ -4,12 +4,12 @@ DESCRIPTION=Reference implementation of the Jupyter Notebook format
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-2.4.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.1[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(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbformat/archive/5.1.3.tar.gz -> nbformat-5.1.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2db4937aede414f3216a63e9b42ced8e
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dfff49128cc24fea0dd4d3aae224fa67
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.7 b/metadata/md5-cache/dev-python/nbsphinx-0.8.7
index 1e2ccd1b710a..ada36864b532 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.7
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.8.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.8.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d287d4ce55e4df00fc46da7587431ee4
diff --git a/metadata/md5-cache/dev-python/nbval-0.9.6 b/metadata/md5-cache/dev-python/nbval-0.9.6
index d73187449976..d4a6538ed485 100644
--- a/metadata/md5-cache/dev-python/nbval-0.9.6
+++ b/metadata/md5-cache/dev-python/nbval-0.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3d5440d6629628b51b4f706f5076fee
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
index 3a2612698fd5..1617d80652f1 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
@@ -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/n/ndg-httpsclient/ndg_httpsclient-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f842f11d8f90187a86d6c497993e60f
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.4.0 b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
index c3bd34e31839..0ef9a66b04f9 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.4.0
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.4.0.tar.gz -> neovim-remote-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51f34409bd6eb0fd9cf9afa5ae8d26cf
diff --git a/metadata/md5-cache/dev-python/neovim-remote-9999 b/metadata/md5-cache/dev-python/neovim-remote-9999
index d2402cb9dcc0..005da235fc6e 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-9999
+++ b/metadata/md5-cache/dev-python/neovim-remote-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pynvim[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00f8dfb788126e5556533e09d91fd42c
diff --git a/metadata/md5-cache/dev-python/nest_asyncio-1.5.1 b/metadata/md5-cache/dev-python/nest_asyncio-1.5.1
index 7a775e9c286c..2b8de3640f31 100644
--- a/metadata/md5-cache/dev-python/nest_asyncio-1.5.1
+++ b/metadata/md5-cache/dev-python/nest_asyncio-1.5.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/n/nest_asyncio/nest_asyncio-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae61670aee33594a3a22926cbf0a7020
diff --git a/metadata/md5-cache/dev-python/netaddr-0.8.0 b/metadata/md5-cache/dev-python/netaddr-0.8.0
index 13cdcf5b4113..4f8723d00e12 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.8.0
+++ b/metadata/md5-cache/dev-python/netaddr-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netaddr/netaddr/archive/0.8.0.tar.gz -> netaddr-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=828e854dde297766d11d3b16af64edd3
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 7ac24ed4a275..b0496d670ca3 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 80981ed748d8..45534daf6f29 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92a6a2ec08d29c67297f17060a5561d1
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0 b/metadata/md5-cache/dev-python/netifaces-0.11.0
index e29bb19393c9..cf3029d98db2 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0
+++ b/metadata/md5-cache/dev-python/netifaces-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72b36e50bfffc09643cda69ebdc0bdad
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.2 b/metadata/md5-cache/dev-python/networkx-2.6.2
index 3fb421618969..97994d530bd7 100644
--- a/metadata/md5-cache/dev-python/networkx-2.6.2
+++ b/metadata/md5-cache/dev-python/networkx-2.6.2
@@ -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=mirror://pypi/n/networkx/networkx-2.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=84df5861d01a301d70787c45f9114948
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.3 b/metadata/md5-cache/dev-python/networkx-2.6.3
index 5352d94c778c..0ea70d04a2ed 100644
--- a/metadata/md5-cache/dev-python/networkx-2.6.3
+++ b/metadata/md5-cache/dev-python/networkx-2.6.3
@@ -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=mirror://pypi/n/networkx/networkx-2.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d7526c2162443efa3d1208bad1bba887
diff --git a/metadata/md5-cache/dev-python/nltk-3.6.2-r1 b/metadata/md5-cache/dev-python/nltk-3.6.2-r1
index 9ce3580770f6..0063a78c1617 100644
--- a/metadata/md5-cache/dev-python/nltk-3.6.2-r1
+++ b/metadata/md5-cache/dev-python/nltk-3.6.2-r1
@@ -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/nltk/nltk/archive/3.6.2.tar.gz -> nltk-3.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b5f57a80843695202375460dca10d45
diff --git a/metadata/md5-cache/dev-python/nltk-3.6.3 b/metadata/md5-cache/dev-python/nltk-3.6.3
index b4f4b6709173..29895ca8ea4b 100644
--- a/metadata/md5-cache/dev-python/nltk-3.6.3
+++ b/metadata/md5-cache/dev-python/nltk-3.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nltk/nltk/archive/3.6.3.tar.gz -> nltk-3.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=016258f458b8210ea6aac7675100ca13
diff --git a/metadata/md5-cache/dev-python/nltk-3.6.4 b/metadata/md5-cache/dev-python/nltk-3.6.4
new file mode 100644
index 000000000000..4b34911daa46
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nltk-3.6.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nltk-data-20200312-r1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[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/twython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[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(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[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/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,tk?,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=Natural Language Toolkit
+EAPI=8
+HOMEPAGE=https://www.nltk.org/ https://github.com/nltk/nltk/
+IUSE=tk test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=Apache-2.0
+PDEPEND=dev-python/nltk-data
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[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/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,tk?,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=https://github.com/nltk/nltk/archive/3.6.4.tar.gz -> nltk-3.6.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=016258f458b8210ea6aac7675100ca13
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.2 b/metadata/md5-cache/dev-python/nnpy-1.4.2
index c0d5e457e83e..b7028304597b 100644
--- a/metadata/md5-cache/dev-python/nnpy-1.4.2
+++ b/metadata/md5-cache/dev-python/nnpy-1.4.2
@@ -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/nanomsg/nnpy/archive/1.4.2.tar.gz -> nnpy-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d39bd67f9becf9cb9c8c2bbeee347de2
diff --git a/metadata/md5-cache/dev-python/node-semver-0.8.0 b/metadata/md5-cache/dev-python/node-semver-0.8.0
index 061556bc04e3..7a1a2d2ddeb3 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.8.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.8.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/podhmo/python-semver/archive/0.8.0.tar.gz -> node-semver-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be6f92445566024ac9c6ab13fcc0a579
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.6.0 b/metadata/md5-cache/dev-python/nodeenv-1.6.0
index 7c2d80515d91..4ea455b8b67a 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.6.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.6.0.tar.gz -> nodeenv-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=684fa5f558df4c77f39d82495690c364
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r8 b/metadata/md5-cache/dev-python/nose-1.3.7-r8
index 7b37305e83e5..9e0687db4fc7 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r8
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r8
@@ -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/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26133a79d4de1c68e16b3b3748f33c77
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1 b/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
index 25a142114566..6967655a7746 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.5.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=mirror://pypi/n/nose-exclude/nose-exclude-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ae515c210bf1e23b75f5ff0ebeaa63b
diff --git a/metadata/md5-cache/dev-python/nose-random-1.0.0 b/metadata/md5-cache/dev-python/nose-random-1.0.0
index 3cf6ab40097c..7891fc35daaa 100644
--- a/metadata/md5-cache/dev-python/nose-random-1.0.0
+++ b/metadata/md5-cache/dev-python/nose-random-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fzumstein/nose-random/archive/1.0.0.tar.gz -> nose-random-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b8085d47e451937b2ed14df7642df57
diff --git a/metadata/md5-cache/dev-python/nose2-0.10.0 b/metadata/md5-cache/dev-python/nose2-0.10.0
index 833b20626633..64cfd3435210 100644
--- a/metadata/md5-cache/dev-python/nose2-0.10.0
+++ b/metadata/md5-cache/dev-python/nose2-0.10.0
@@ -1,16 +1,14 @@
-BDEPEND=doc? ( >=dev-python/sphinx-1.0.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(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=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
-DEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Next generation unittest with plugins
 EAPI=7
 HOMEPAGE=https://github.com/nose-devs/nose2
-IUSE=doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-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
+RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/nose-devs/nose2/archive/0.10.0.tar.gz -> nose2-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2938ac71be328363c90e2b8b5bda7603
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b8fa7e500d00e88a55716fa046aa049b
diff --git a/metadata/md5-cache/dev-python/nose_fixes-1.3 b/metadata/md5-cache/dev-python/nose_fixes-1.3
index 081e57c2f264..47422f9ebaed 100644
--- a/metadata/md5-cache/dev-python/nose_fixes-1.3
+++ b/metadata/md5-cache/dev-python/nose_fixes-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_fixes/nose_fixes-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d54bd846f6020007bb99fa5722b99617
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
index ecdc147b25aa..9de03b29f6fc 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
@@ -4,12 +4,12 @@ DESCRIPTION=A python module to inject warning filters during nosetest
 EAPI=7
 HOMEPAGE=https://github.com/Carreau/nose_warnings_filters
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=344419ab5dbc98508a014fd4a2208e38
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20019b8380790d63697a1ae684cb2ca5
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.2 b/metadata/md5-cache/dev-python/notebook-6.4.2
index fc2a6c4ab911..8fda44dede92 100644
--- a/metadata/md5-cache/dev-python/notebook-6.4.2
+++ b/metadata/md5-cache/dev-python/notebook-6.4.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/n/notebook/notebook-6.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bfdddffc3beec14b63ff485a686e1467
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.3 b/metadata/md5-cache/dev-python/notebook-6.4.3
index 2f84c7e6ed33..fe23f154efd9 100644
--- a/metadata/md5-cache/dev-python/notebook-6.4.3
+++ b/metadata/md5-cache/dev-python/notebook-6.4.3
@@ -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/n/notebook/notebook-6.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2cbe2da7162cb48ec802bd12120bf52c
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.4 b/metadata/md5-cache/dev-python/notebook-6.4.4
index 6d24a34a3082..b6d63ffbfcb6 100644
--- a/metadata/md5-cache/dev-python/notebook-6.4.4
+++ b/metadata/md5-cache/dev-python/notebook-6.4.4
@@ -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/n/notebook/notebook-6.4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2cbe2da7162cb48ec802bd12120bf52c
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r2 b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
index 9e9688f28513..dc206f6dc1e6 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r2
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
@@ -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=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=aab22f89e653c153a62784d7615e68f6
diff --git a/metadata/md5-cache/dev-python/nototools-0.2.13 b/metadata/md5-cache/dev-python/nototools-0.2.13
index 6db07e8ec387..d69ea767818a 100644
--- a/metadata/md5-cache/dev-python/nototools-0.2.13
+++ b/metadata/md5-cache/dev-python/nototools-0.2.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notofonttools/notofonttools-0.2.13.tar.gz -> nototools-0.2.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1994a8188a3d358fb5a347f6faa4758e
diff --git a/metadata/md5-cache/dev-python/nototools-0.2.16 b/metadata/md5-cache/dev-python/nototools-0.2.16
index a4cd97e1f820..3b4ed64018e8 100644
--- a/metadata/md5-cache/dev-python/nototools-0.2.16
+++ b/metadata/md5-cache/dev-python/nototools-0.2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notofonttools/notofonttools-0.2.16.tar.gz -> nototools-0.2.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34c17dee5b26ec88fa81334582914a82
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
index 644cd02f0920..12d114740d4f 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.5.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/jborean93/ntlm-auth/archive/v1.5.0.tar.gz -> ntlm-auth-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d15607d97e7101fc4c7e9a7a3422f09
diff --git a/metadata/md5-cache/dev-python/ntplib-0.3.3 b/metadata/md5-cache/dev-python/ntplib-0.3.3
index f719a2c9eedf..a59af6becb10 100644
--- a/metadata/md5-cache/dev-python/ntplib-0.3.3
+++ b/metadata/md5-cache/dev-python/ntplib-0.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=408e12304b9158dc692b38aa517e1483
diff --git a/metadata/md5-cache/dev-python/ntplib-0.4.0 b/metadata/md5-cache/dev-python/ntplib-0.4.0
index 8be52818d6bd..6b6dc74c7449 100644
--- a/metadata/md5-cache/dev-python/ntplib-0.4.0
+++ b/metadata/md5-cache/dev-python/ntplib-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cf-natali/ntplib/archive/0.4.0.tar.gz -> ntplib-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0643f7f39e076697fa96aa577d5527d8
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16.3 b/metadata/md5-cache/dev-python/nuitka-0.6.16.3
index d21a8e0f41ef..cb8dd4b1d0ce 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16.3
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.16.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.16.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16.4 b/metadata/md5-cache/dev-python/nuitka-0.6.16.4
index d4d0f5d3f870..6234c5961061 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16.4
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.16.4
@@ -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.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17 b/metadata/md5-cache/dev-python/nuitka-0.6.17
new file mode 100644
index 000000000000..0b4dd0fb832b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.17
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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 to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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://nuitka.net/releases/Nuitka-0.6.17.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17.1 b/metadata/md5-cache/dev-python/nuitka-0.6.17.1
new file mode 100644
index 000000000000..e33140a35ee9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.17.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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 to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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://nuitka.net/releases/Nuitka-0.6.17.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.3 b/metadata/md5-cache/dev-python/numexpr-2.7.3
index 3ee2f0b9c5db..c2a5f50024a4 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.3
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.3.tar.gz -> numexpr-2.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1d47e129d4f7a83f675a870b24c495b
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.1 b/metadata/md5-cache/dev-python/numpy-1.21.1
index 49e14852a2ad..e96d872d5223 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.1
+++ b/metadata/md5-cache/dev-python/numpy-1.21.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=351790df3d061f35bb3907211c4977cc
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.2 b/metadata/md5-cache/dev-python/numpy-1.21.2
index e431bd36c088..481062da055e 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.2
+++ b/metadata/md5-cache/dev-python/numpy-1.21.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.2.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.2.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.2.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.2.pdf )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b60a0d053b4e5aa64bee8c6a5844069
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.1.0 b/metadata/md5-cache/dev-python/numpydoc-1.1.0
index 0a8c7ccceeb2..b9ade56e3686 100644
--- a/metadata/md5-cache/dev-python/numpydoc-1.1.0
+++ b/metadata/md5-cache/dev-python/numpydoc-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7bd9ee677c65db37a21a285fa38372fc
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
index 00ff5cc02986..71e725e2a849 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
@@ -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/o/oauth2/oauth2-1.9.0.post1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd033bef89b9b4ba13faf50577f13f35
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1 b/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
index 52fc0dcd8b41..20c826f554c4 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3-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/googleapis/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd88aee8c8a5e59f8a311252134bea9d
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.1.1 b/metadata/md5-cache/dev-python/oauthlib-3.1.1
index c38100b01e9b..5d3924f77e56 100644
--- a/metadata/md5-cache/dev-python/oauthlib-3.1.1
+++ b/metadata/md5-cache/dev-python/oauthlib-3.1.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/o/oauthlib/oauthlib-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0aa78d2b46569fb06b5fc5d0273d5780
diff --git a/metadata/md5-cache/dev-python/objgraph-3.5.0 b/metadata/md5-cache/dev-python/objgraph-3.5.0
index 9d603cd41b60..b48d9432140c 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.5.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abd285f8600643b909faa853f1297671
diff --git a/metadata/md5-cache/dev-python/oct2py-5.2.0-r1 b/metadata/md5-cache/dev-python/oct2py-5.2.0-r1
index 8b4828b9aa7b..fc5911ae021d 100644
--- a/metadata/md5-cache/dev-python/oct2py-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/oct2py-5.2.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/o/oct2py/oct2py-5.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93b2c2bb1bd4f44cc376b12d61d26b9a
diff --git a/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1 b/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
index 2f83b184f440..e03727843015 100644
--- a/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
+++ b/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/octave_kernel/octave_kernel-0.32.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cffa1dfe19a5de4b2b7083231231183e
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index d339b5b17eed..a5af993740f2 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -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/o/odfpy/odfpy-1.3.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3d2507649273527ba9a9e4dab985c87
diff --git a/metadata/md5-cache/dev-python/olefile-0.46-r1 b/metadata/md5-cache/dev-python/olefile-0.46-r1
index aecdeefb1fa8..db5c97bcae33 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46-r1
+++ b/metadata/md5-cache/dev-python/olefile-0.46-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/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c634cd9689dbd52c6ab483243ba0004
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
index 050020f78b93..c2d0f323e2ae 100644
--- a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docopt-0.4.1[python_targets_python3_8(-)?] dev-python/netif
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=242c42aa32fcb8d68cf07adb740b3448
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1 b/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
index 4bd086ba1148..d0952b972b21 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.7/openpyxl-3.0.7.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab79b82a26d29b2992f1a8428368ab97
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.8 b/metadata/md5-cache/dev-python/openpyxl-3.0.8
index ccda9b45b34e..ba9134885dd7 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.8
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.8/openpyxl-3.0.8.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe75076a6fdbc7c78fe20ee88af3136e
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.9 b/metadata/md5-cache/dev-python/openpyxl-3.0.9
index 335c3a173dca..e7e2a969a674 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.9
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.9/openpyxl-3.0.9.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe75076a6fdbc7c78fe20ee88af3136e
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5 b/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
index ce65506bdd36..d1a06d7f16ea 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-2.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=778cd85fb39e890bbabe8474afbe3d19
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-2.3.1 b/metadata/md5-cache/dev-python/openstackdocstheme-2.3.1
new file mode 100644
index 000000000000..484379aa1732
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-2.3.1
@@ -0,0 +1,14 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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=Theme and extension support for Sphinx documentation
+EAPI=7
+HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-2.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a80b5258e25a6ac3dc2a526a3382f1f6
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.58.0 b/metadata/md5-cache/dev-python/openstacksdk-0.58.0
index fbc7e1e88323..f3df253a1737 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.58.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.58.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.58.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90d6d74750a2d4fd96b21a491c85c554
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.59.0 b/metadata/md5-cache/dev-python/openstacksdk-0.59.0
index cefb9166501e..bfdb64e52cc1 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.59.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.59.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 test? ( >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?] dev-python/hacking[python_targets_python3_8(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_8(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_8(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?] >=dev-python/jsonpatch-1.16[python_targets_python3_8(-)?] !~dev-python/jsonpatch-1.20[python_targets_python3_8(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hacking[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/jsonpatch-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A collection of libraries for building applications to work with OpenStack.
 EAPI=8
 HOMEPAGE=https://github.com/openstack/python-openstacksdk
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?] >=dev-python/jsonpatch-1.16[python_targets_python3_8(-)?] !~dev-python/jsonpatch-1.20[python_targets_python3_8(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/jsonpatch-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.59.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3de2514a027d19be6670af7d63aec390
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b30cc4ff9b191a160fcd9bfc73585142
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.3.0 b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
index 4c9ef015f73e..6363ba4867db 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.3.0
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad7d7154f8985c85bf57aa69aaba89fb
diff --git a/metadata/md5-cache/dev-python/ordered-set-4.0.2 b/metadata/md5-cache/dev-python/ordered-set-4.0.2
index 55b831a5f08c..8a7b7d9f2477 100644
--- a/metadata/md5-cache/dev-python/ordered-set-4.0.2
+++ b/metadata/md5-cache/dev-python/ordered-set-4.0.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/o/ordered-set/ordered-set-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2532e685569feb69680fa825664aa3ba
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0 b/metadata/md5-cache/dev-python/os-client-config-2.1.0
index 6c28f51b3548..c24d27e5d2b0 100644
--- a/metadata/md5-cache/dev-python/os-client-config-2.1.0
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_8(-)?] >=dev-python/openst
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=240056833bea042b6e5781f29b60a9e3
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0-r1 b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r1
new file mode 100644
index 000000000000..a70bff1ed332
--- /dev/null
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hacking[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-glanceclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/subunit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenStack Client Configuation Library
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.13.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/o/os-client-config/os-client-config-2.1.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d7592a5a1d33acc9a9f1e07cd3fa736c
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r1 b/metadata/md5-cache/dev-python/os-service-types-1.7.0-r1
index c8d4e44ace08..057d65b3d42f 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/os-service-types-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=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e79d2b594e896524cfeaa428e6fae54a
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.2.1 b/metadata/md5-cache/dev-python/osc-lib-2.2.1
index f5eea5048e98..92b3898a3ee6 100644
--- a/metadata/md5-cache/dev-python/osc-lib-2.2.1
+++ b/metadata/md5-cache/dev-python/osc-lib-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb42b0e6073e0c877dfcb776a62a6433
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.4.2 b/metadata/md5-cache/dev-python/osc-lib-2.4.2
new file mode 100644
index 000000000000..37ca07d59625
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osc-lib-2.4.2
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A package of common support modules for writing OSC plugins.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/osc-lib
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.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/o/osc-lib/osc-lib-2.4.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2d01a5f5465358d67a10870e3347c518
diff --git a/metadata/md5-cache/dev-python/oset-0.1.3 b/metadata/md5-cache/dev-python/oset-0.1.3
index 7771ca70c4c3..283cb7602b2e 100644
--- a/metadata/md5-cache/dev-python/oset-0.1.3
+++ b/metadata/md5-cache/dev-python/oset-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oset/oset-0.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fdb720cbfbb664db5ff09a33e2f29214
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-4.4.1 b/metadata/md5-cache/dev-python/oslo-concurrency-4.4.1
new file mode 100644
index 000000000000..2e8f815d883b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-4.4.1
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/eventlet-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Oslo Concurrency library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.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/o/oslo.concurrency/oslo.concurrency-4.4.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c0b95ee90742e5b063be429a8a08000e
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.7.1 b/metadata/md5-cache/dev-python/oslo-config-8.7.1
index 55eea22c7809..7b9c208a985f 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.7.1
+++ b/metadata/md5-cache/dev-python/oslo-config-8.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.7.1.tar.gz -> oslo-config-8.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0217c3de08ab410dca6317f5700190f
diff --git a/metadata/md5-cache/dev-python/oslo-context-3.1.1 b/metadata/md5-cache/dev-python/oslo-context-3.1.1
deleted file mode 100644
index fefcb94733d4..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=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/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.context/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-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/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3cf9cbfc4c7db9c8a29a421041be788f
diff --git a/metadata/md5-cache/dev-python/oslo-context-3.3.1 b/metadata/md5-cache/dev-python/oslo-context-3.3.1
index 701effae2024..323753af6cc1 100644
--- a/metadata/md5-cache/dev-python/oslo-context-3.3.1
+++ b/metadata/md5-cache/dev-python/oslo-context-3.3.1
@@ -1,15 +1,15 @@
-BDEPEND=>=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(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=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/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[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 to maintain useful information about a request context
 EAPI=8
 HOMEPAGE=https://pypi.org/project/oslo.context/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+IUSE=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/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/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e1c429dd29ffcc6ca2092cfd7504d32
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d3a85a6c492cbbe48c9f95c6b02a30a0
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1 b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1
index b9193a6c1344..d145699625fd 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.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/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a1ef3b23de4c5b3152e7ab0423ab16b
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0 b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
index d0088bc28239..a81a3b83b317 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
@@ -1,15 +1,15 @@
-BDEPEND=>=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(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=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/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[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=Oslo i18n library
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
-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=>=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(-)?] python_targets_python3_8? ( dev-lang/python: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/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c44ed49e89f7efc917459d33ea5f0bd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=466420568df0aff0f074f3b40022f21e
diff --git a/metadata/md5-cache/dev-python/oslo-log-4.6.0 b/metadata/md5-cache/dev-python/oslo-log-4.6.0
index c014ce3ec897..ef4b061db5f8 100644
--- a/metadata/md5-cache/dev-python/oslo-log-4.6.0
+++ b/metadata/md5-cache/dev-python/oslo-log-4.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-4.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4028832187b0760d8a2e2e68a16a6c57
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-4.0.2 b/metadata/md5-cache/dev-python/oslo-serialization-4.0.2
deleted file mode 100644
index 8c7b4b3209d6..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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(-)?] test? ( >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=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/msgpack-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Oslo Serialization library
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-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/msgpack-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38ae96687390d1977d5d01dbe23992a3
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-4.2.0 b/metadata/md5-cache/dev-python/oslo-serialization-4.2.0
index 26fa15cf2fdf..f690ef049ae0 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-4.2.0
+++ b/metadata/md5-cache/dev-python/oslo-serialization-4.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Oslo Serialization library
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 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/msgpack-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-4.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7b143d56169fb84c56b72248ec1f06b
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a0f2d6a0d1d00b2f0439c6f0de93e661
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.10.0 b/metadata/md5-cache/dev-python/oslo-utils-4.10.0
index b359ae48b058..638046aecf1f 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-4.10.0
+++ b/metadata/md5-cache/dev-python/oslo-utils-4.10.0
@@ -4,12 +4,12 @@ DESCRIPTION=Oslo Utility library
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 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/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-4.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e1f5286c99fc08ca5c075f606631154
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d277db43cb24ace1ada5d1c924094336
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.9.2 b/metadata/md5-cache/dev-python/oslo-utils-4.9.2
deleted file mode 100644
index 1c31180c67b2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-4.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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/eventlet-0.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=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/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Oslo Utility library
-EAPI=8
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-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/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-4.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=818ac8c5d2540793c01ebff2c98108d6
diff --git a/metadata/md5-cache/dev-python/oslotest-4.4.1 b/metadata/md5-cache/dev-python/oslotest-4.4.1
index a2746a2a5d15..9cd1478ac0b7 100644
--- a/metadata/md5-cache/dev-python/oslotest-4.4.1
+++ b/metadata/md5-cache/dev-python/oslotest-4.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-4.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6516aaf144f06853d938c6209458af6b
diff --git a/metadata/md5-cache/dev-python/oslotest-4.5.0 b/metadata/md5-cache/dev-python/oslotest-4.5.0
index ca6804aa6dea..4b15488122e1 100644
--- a/metadata/md5-cache/dev-python/oslotest-4.5.0
+++ b/metadata/md5-cache/dev-python/oslotest-4.5.0
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/pbr-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>=dev-python/pbr-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[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=Oslo test framework
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
-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 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-4.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1eb4382ffec4f91aa71ac8aadba4377b
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e8ca1670e358cb73cff6575042b0565
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
index 5adb3c32b76a..25841d91e9b9 100644
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
@@ -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/osrf/osrf_pycommon/archive/0.1.10.tar.gz -> osrf_pycommon-0.1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=815a033323b9260f6ecdad834a55896c
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
index 729499efc096..642e5d93db80 100644
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.2.1.tar.gz -> osrf_pycommon-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ce8ac4c0338eddcbc7b42fc9e5f4e4d
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0 b/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0
index 2d51d9760c95..c642b09d3739 100644
--- a/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/osrf/osrf_pycommon/archive/1.0.0.tar.gz -> osrf_pycommon-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ce8ac4c0338eddcbc7b42fc9e5f4e4d
diff --git a/metadata/md5-cache/dev-python/outcome-1.1.0 b/metadata/md5-cache/dev-python/outcome-1.1.0
index e2908198bd0b..b26cb19e3b06 100644
--- a/metadata/md5-cache/dev-python/outcome-1.1.0
+++ b/metadata/md5-cache/dev-python/outcome-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/outcome/archive/v1.1.0.tar.gz -> outcome-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6395da40a868551fbc8e0c6391e98d9d
diff --git a/metadata/md5-cache/dev-python/ovs-2.13.0 b/metadata/md5-cache/dev-python/ovs-2.13.0
index fb616d913bc2..913750e01c18 100644
--- a/metadata/md5-cache/dev-python/ovs-2.13.0
+++ b/metadata/md5-cache/dev-python/ovs-2.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bde83bdbe0fa24be806442261a84a0c3
diff --git a/metadata/md5-cache/dev-python/ovs-2.13.3 b/metadata/md5-cache/dev-python/ovs-2.13.3
index 2accbbec9aab..8253c92f65a6 100644
--- a/metadata/md5-cache/dev-python/ovs-2.13.3
+++ b/metadata/md5-cache/dev-python/ovs-2.13.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.13.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ffb450d734cefd4c7fd4b408085893de
diff --git a/metadata/md5-cache/dev-python/owslib-0.20.0 b/metadata/md5-cache/dev-python/owslib-0.20.0
index b33d516ae320..112af7d033e5 100644
--- a/metadata/md5-cache/dev-python/owslib-0.20.0
+++ b/metadata/md5-cache/dev-python/owslib-0.20.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.20.0.tar.gz -> owslib-0.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19e78256c6d7239ce3a4cc0ddce610bf
diff --git a/metadata/md5-cache/dev-python/owslib-0.25.0 b/metadata/md5-cache/dev-python/owslib-0.25.0
index cf5da1a6bf85..75294acf71fb 100644
--- a/metadata/md5-cache/dev-python/owslib-0.25.0
+++ b/metadata/md5-cache/dev-python/owslib-0.25.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.25.0.tar.gz -> owslib-0.25.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ea9848e03639f2f95a4aa2a043eb619
diff --git a/metadata/md5-cache/dev-python/packaging-21.0 b/metadata/md5-cache/dev-python/packaging-21.0
index 47e434a1c769..fd4438d399df 100644
--- a/metadata/md5-cache/dev-python/packaging-21.0
+++ b/metadata/md5-cache/dev-python/packaging-21.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=dev-python/pyparsing-2.1.10[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Core utilities for Python packages
-EAPI=8
+EAPI=7
 HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -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/pypa/packaging/archive/21.0.tar.gz -> packaging-21.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e85d0307acb09b0b8fad7d6ac39a1c14
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9579a118fbe50c809be65f27e4653a38
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.5 b/metadata/md5-cache/dev-python/pafy-0.5.5
index a9b75e4ea76a..f4fddd91311c 100644
--- a/metadata/md5-cache/dev-python/pafy-0.5.5
+++ b/metadata/md5-cache/dev-python/pafy-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pafy/pafy-0.5.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a32007d5997218cc0a12d54aa2409bf7
diff --git a/metadata/md5-cache/dev-python/pafy-9999 b/metadata/md5-cache/dev-python/pafy-9999
index 758eb4b71a5a..824f820860e0 100644
--- a/metadata/md5-cache/dev-python/pafy-9999
+++ b/metadata/md5-cache/dev-python/pafy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a32007d5997218cc0a12d54aa2409bf7
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.5.1 b/metadata/md5-cache/dev-python/paho-mqtt-1.5.1
index f746da64638d..2d458e45abba 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.5.1
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.5.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/eclipse/paho.mqtt.python/archive/v1.5.1.tar.gz -> paho-mqtt-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77034a502b53cd777d9e76505730c3b2
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.1 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.1
index deade665b740..0cd41b6761f4 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.1
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx themes for Pallets and related projects
 EAPI=7
 HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) 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=https://github.com/pallets/pallets-sphinx-themes/archive/2.0.1.tar.gz -> pallets-sphinx-themes-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8945686ed4e7149800d2a8d3f6de0a7a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=affa9d0df08a7cd1b02420eb02c59629
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 c8e4e7bdcba6..9974421186a1 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a567902868953326563f71d21c2731e
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.4 b/metadata/md5-cache/dev-python/pandas-1.2.4
index 3b1f9a6e85de..f05319cbbe73 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=385f333aa56bfa50ca734276c81d82e7
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.5 b/metadata/md5-cache/dev-python/pandas-1.2.5
index 25a36304da42..0061d8a5e639 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d322170f5f8891625853c5fd0295f600
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.0 b/metadata/md5-cache/dev-python/pandas-1.3.0
index 04b31ccc6744..178676a6ed14 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ac98c96568bdddc79476210e5288dfa
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.1 b/metadata/md5-cache/dev-python/pandas-1.3.1
index d97a4bc8f18a..b1c9a7af0f11 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db9e35b6ffd4e206a19a9822e376aa6d
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.2 b/metadata/md5-cache/dev-python/pandas-1.3.2
index 9cc34cbd577e..091b2a85d90b 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.2
+++ b/metadata/md5-cache/dev-python/pandas-1.3.2
@@ -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.2/pandas-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=2b48ae0c69ac0f41cedeb480a350c90a
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.3 b/metadata/md5-cache/dev-python/pandas-1.3.3
index 0e5b6da584bb..274c7842a38b 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.3
+++ b/metadata/md5-cache/dev-python/pandas-1.3.3
@@ -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.3/pandas-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=af1a98a56624b73437fa93a04296a4e4
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.10.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.10.0
index dedc6544f748..8694498de909 100644
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.10.0
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.10.0.tar.gz -> pandas-datareader-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=549951a366330729fb2a63f4d75c23a0
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.9.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.9.0
index a151b20bd52a..84c3339e3605 100644
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.9.0
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.9.0
@@ -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/pydata/pandas-datareader/archive/v0.9.0.tar.gz -> pandas-datareader-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c697261ca9e1315ff4d4d8182b8ac2e9
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.3 b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
index 432d108a1e9b..f68b5a9e694b 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.3
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6eec114ed561cca720d1d7d7da557925
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.5.0 b/metadata/md5-cache/dev-python/pandocfilters-1.5.0
index 7e74bec95ff5..28beccc167c0 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.5.0
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75e3d93ac31ff37a423c7446734f82b6
diff --git a/metadata/md5-cache/dev-python/parallax-1.0.6 b/metadata/md5-cache/dev-python/parallax-1.0.6
index d8abb31eb9fe..d7416b64ae6f 100644
--- a/metadata/md5-cache/dev-python/parallax-1.0.6
+++ b/metadata/md5-cache/dev-python/parallax-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/parallax/parallax-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b9c609d8bb6a987a1f97da6880f280a
diff --git a/metadata/md5-cache/dev-python/parameterized-0.8.1 b/metadata/md5-cache/dev-python/parameterized-0.8.1
index 3557bc8b993c..c1d67f2b100e 100644
--- a/metadata/md5-cache/dev-python/parameterized-0.8.1
+++ b/metadata/md5-cache/dev-python/parameterized-0.8.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/parameterized/parameterized-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64c35bece30f3a8b47a0e277324a1645
diff --git a/metadata/md5-cache/dev-python/paramiko-2.7.2 b/metadata/md5-cache/dev-python/paramiko-2.7.2
index 5a2a784eabc7..326c95cbc614 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.7.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.7.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/paramiko/paramiko/archive/2.7.2.tar.gz -> paramiko-2.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a30bdb280841dd554f029d610a3c1b5a
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.6 b/metadata/md5-cache/dev-python/parsedatetime-2.6
index e7fd109734cb..07caca4ad054 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-2.6
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.6
@@ -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/bear/parsedatetime/archive/v2.6.tar.gz -> parsedatetime-2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a938e5abc09f5204d26fe9486c371dea
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 a9c883417ab7..0aef1827f12a 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/parso-0.7.1-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/davidhalter/parso/archive/v0.7.1.tar.gz -> parso-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2d6bb6261687c0f2434df2ce7a4bf29
diff --git a/metadata/md5-cache/dev-python/parso-0.8.2 b/metadata/md5-cache/dev-python/parso-0.8.2
index 9aca7d7e3058..94d38c24512f 100644
--- a/metadata/md5-cache/dev-python/parso-0.8.2
+++ b/metadata/md5-cache/dev-python/parso-0.8.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/davidhalter/parso/archive/v0.8.2.tar.gz -> parso-0.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=090b7049509d196d65ccccb9b7386636
diff --git a/metadata/md5-cache/dev-python/partd-1.2.0 b/metadata/md5-cache/dev-python/partd-1.2.0
index 4219f6bf64fb..ff4bd0cc965f 100644
--- a/metadata/md5-cache/dev-python/partd-1.2.0
+++ b/metadata/md5-cache/dev-python/partd-1.2.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/partd/partd-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c72364fb508d7643ff7bb13ea6cf6544
diff --git a/metadata/md5-cache/dev-python/parver-0.3.1 b/metadata/md5-cache/dev-python/parver-0.3.1
index 6dd41b32a787..6fa26e19b571 100644
--- a/metadata/md5-cache/dev-python/parver-0.3.1
+++ b/metadata/md5-cache/dev-python/parver-0.3.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/RazerM/parver/archive/0.3.1.tar.gz -> parver-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efcb927d83f0e4bbe6a75c6466e1d1f4
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index c053f34f674e..6d4f05b5ebc1 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.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/p/passlib/passlib-1.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fad47ff46588caf0462c3c427910718f
diff --git a/metadata/md5-cache/dev-python/paste-3.5.0 b/metadata/md5-cache/dev-python/paste-3.5.0
index 7d083cda60fd..1180b7412746 100644
--- a/metadata/md5-cache/dev-python/paste-3.5.0
+++ b/metadata/md5-cache/dev-python/paste-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9600ee0db26d8528d117ffba4bba218d
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.1-r1 b/metadata/md5-cache/dev-python/pastedeploy-2.1.1-r1
index f36e26cde4df..5e4b83af59f8 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.1-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.1.1-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/Pylons/pastedeploy/archive/2.1.1.tar.gz -> pastedeploy-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=593763a6754cb735f9b2337d10609c67
diff --git a/metadata/md5-cache/dev-python/pastel-0.2.1 b/metadata/md5-cache/dev-python/pastel-0.2.1
index 75b94b0f2f2f..03f3ad7a71b3 100644
--- a/metadata/md5-cache/dev-python/pastel-0.2.1
+++ b/metadata/md5-cache/dev-python/pastel-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdispater/pastel/archive/0.2.1.tar.gz -> pastel-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cdf81b4e6956fb4c826b26ad8f1fa15
diff --git a/metadata/md5-cache/dev-python/patch-ng-1.17.4 b/metadata/md5-cache/dev-python/patch-ng-1.17.4
index adda056c7036..54fb3299182b 100644
--- a/metadata/md5-cache/dev-python/patch-ng-1.17.4
+++ b/metadata/md5-cache/dev-python/patch-ng-1.17.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/conan-io/python-patch-ng/archive/1.17.4.tar.gz -> patch-ng-1.17.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc829f1be2b361ffb6effd7346d30528
diff --git a/metadata/md5-cache/dev-python/path-and-address-2.0.1 b/metadata/md5-cache/dev-python/path-and-address-2.0.1
index f2de7caeeb67..7e8f17b3c932 100644
--- a/metadata/md5-cache/dev-python/path-and-address-2.0.1
+++ b/metadata/md5-cache/dev-python/path-and-address-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-2.0.1.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6e86545427fbe44080a75071da6ae74
diff --git a/metadata/md5-cache/dev-python/path-py-16.2.0 b/metadata/md5-cache/dev-python/path-py-16.2.0
index 96a0635244df..4a1e21150ef2 100644
--- a/metadata/md5-cache/dev-python/path-py-16.2.0
+++ b/metadata/md5-cache/dev-python/path-py-16.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path/path-16.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dd944491842bfc33417b100e6d3923a
diff --git a/metadata/md5-cache/dev-python/pathspec-0.9.0 b/metadata/md5-cache/dev-python/pathspec-0.9.0
index 7c999bba1818..8a7d79eaf908 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.9.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5779edccab7e83236946855b05f7494c
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 39fa02d09c40..166159ae415f 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a4a7d4c3d992d1b4a451bc0652b5912
diff --git a/metadata/md5-cache/dev-python/patiencediff-0.2.2 b/metadata/md5-cache/dev-python/patiencediff-0.2.2
index 08b51f7972c9..5f980618def4 100644
--- a/metadata/md5-cache/dev-python/patiencediff-0.2.2
+++ b/metadata/md5-cache/dev-python/patiencediff-0.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patiencediff/patiencediff-0.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b23ce71bf371214d39530ef0346df1a
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.1 b/metadata/md5-cache/dev-python/patsy-0.5.1
index 7ac96af5c10f..d4041a4dd186 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.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/patsy/patsy-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4a5e3c6961e1de5c056d4674639619d
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.2 b/metadata/md5-cache/dev-python/patsy-0.5.2
new file mode 100644
index 000000000000..79665ec16773
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patsy-0.5.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module to describe statistical models and design matrices
+EAPI=8
+HOMEPAGE=https://patsy.readthedocs.io/en/latest/index.html
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/patsy/patsy-0.5.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f64b1e98ec9f98fb429a8bc3e37c3ba
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1 b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
index b4c4eef9335d..e71d559158c7 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0f0876e0a3333b643bf9e913b96e74c
diff --git a/metadata/md5-cache/dev-python/pbr-5.6.0 b/metadata/md5-cache/dev-python/pbr-5.6.0
index 21afd8ca9ab8..8ada212f921a 100644
--- a/metadata/md5-cache/dev-python/pbr-5.6.0
+++ b/metadata/md5-cache/dev-python/pbr-5.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=870adaeab84cf06edd4f868acacce407
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.4_p1 b/metadata/md5-cache/dev-python/pdfrw-0.4_p1
index 0b7e612acea8..447642a91c12 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.4_p1
+++ b/metadata/md5-cache/dev-python/pdfrw-0.4_p1
@@ -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/sarnold/pdfrw/archive/0.4-1.tar.gz -> pdfrw-0.4-1.tar.gz test? ( https://github.com/pmaupin/static_pdfs/archive/d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz -> pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5315e3b8c64d8c899b9ef2007a51f158
diff --git a/metadata/md5-cache/dev-python/pdoc3-0.10.0 b/metadata/md5-cache/dev-python/pdoc3-0.10.0
index 22d06f5b8f73..834501fff8df 100644
--- a/metadata/md5-cache/dev-python/pdoc3-0.10.0
+++ b/metadata/md5-cache/dev-python/pdoc3-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc3/pdoc3-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9665b1b0d82bc5bf5c7d912389e17c7c
diff --git a/metadata/md5-cache/dev-python/pdoc3-0.9.2 b/metadata/md5-cache/dev-python/pdoc3-0.9.2
index 00eee02a3c97..f483a834c6cf 100644
--- a/metadata/md5-cache/dev-python/pdoc3-0.9.2
+++ b/metadata/md5-cache/dev-python/pdoc3-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc3/pdoc3-0.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=545105898c6251b0c204e4711ca1a964
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.1 b/metadata/md5-cache/dev-python/pebble-4.6.1
deleted file mode 100644
index ae4e8739a84f..000000000000
--- a/metadata/md5-cache/dev-python/pebble-4.6.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_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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=Threading and multiprocessing eye-candy
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48b651bac3fd0b6b112329561e6cfaf8
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.2 b/metadata/md5-cache/dev-python/pebble-4.6.2
deleted file mode 100644
index 9a7fa787b1d7..000000000000
--- a/metadata/md5-cache/dev-python/pebble-4.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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=Threading and multiprocessing eye-candy
-EAPI=8
-HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fce9c56586455ca249161489008f93d8
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.3 b/metadata/md5-cache/dev-python/pebble-4.6.3
index 5db53ebbd7f1..cc7be1069a42 100644
--- a/metadata/md5-cache/dev-python/pebble-4.6.3
+++ b/metadata/md5-cache/dev-python/pebble-4.6.3
@@ -4,12 +4,12 @@ DESCRIPTION=Threading and multiprocessing eye-candy
 EAPI=8
 HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5b022150ca2b4fc453b9e63dbd72414
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7023523e60fc5f106fdf6e22a5696bf3
diff --git a/metadata/md5-cache/dev-python/pecan-1.4.0 b/metadata/md5-cache/dev-python/pecan-1.4.0
index f7e79284be3c..96b2ec5441fc 100644
--- a/metadata/md5-cache/dev-python/pecan-1.4.0
+++ b/metadata/md5-cache/dev-python/pecan-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b20e60432a5245372ab38d4e4b57e9eb
diff --git a/metadata/md5-cache/dev-python/peewee-3.14.4 b/metadata/md5-cache/dev-python/peewee-3.14.4
index 33ac1e7d7062..4c169e5818b7 100644
--- a/metadata/md5-cache/dev-python/peewee-3.14.4
+++ b/metadata/md5-cache/dev-python/peewee-3.14.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/coleifer/peewee/archive/3.14.4.tar.gz -> peewee-3.14.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07a9d9ec3d7ee29644e2b49cab493f6b
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9 b/metadata/md5-cache/dev-python/pelican-minify-0.9
index 28008324b014..bb07fac73305 100644
--- a/metadata/md5-cache/dev-python/pelican-minify-0.9
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pelican-minify/pelican-minify-0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a3d2f61528196dbb106e0d6120fc45f
diff --git a/metadata/md5-cache/dev-python/pendulum-2.1.2-r1 b/metadata/md5-cache/dev-python/pendulum-2.1.2-r1
index be2fcbd650a2..c43a7b0dab2c 100644
--- a/metadata/md5-cache/dev-python/pendulum-2.1.2-r1
+++ b/metadata/md5-cache/dev-python/pendulum-2.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sdispater/pendulum/archive/2.1.2.tar.gz -> pendulum-2.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=801ac38c948f710f1b5cbf7e4a34e37a
diff --git a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1 b/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
index 87b2b4ecd357..74f3c5a5e9e1 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
+++ b/metadata/md5-cache/dev-python/pexpect-4.8.0-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/pexpect/pexpect-4.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e52bd5d3b6748849e486fce5efcc779a
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.13.0 b/metadata/md5-cache/dev-python/pgspecial-1.13.0
index aaf4383ba294..3e8c5a433ccb 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.13.0
+++ b/metadata/md5-cache/dev-python/pgspecial-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.13.0.tar.gz -> pgspecial-1.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4250727dd5124ad5596b979dfa9dff06
diff --git a/metadata/md5-cache/dev-python/pgzero-1.2.1-r1 b/metadata/md5-cache/dev-python/pgzero-1.2.1-r1
index cbb58cc83d49..b87c8982caa7 100644
--- a/metadata/md5-cache/dev-python/pgzero-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pgzero-1.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lordmauve/pgzero/archive/1.2.1.tar.gz -> pgzero-1.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=967b59ff158c7ea9b6143db11ff5da97
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.29 b/metadata/md5-cache/dev-python/phonenumbers-8.12.29
deleted file mode 100644
index 53fb2514facc..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.29
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=8
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.29.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86370fd56c0d768a3d1a7719b82ab43b
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.31 b/metadata/md5-cache/dev-python/phonenumbers-8.12.31
index 9da2383a7a19..d37ac92d6911 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.31
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.31
@@ -4,11 +4,11 @@ DESCRIPTION=Python port of Google's libphonenumber
 EAPI=8
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.31.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f70b6d8f0abc35acbb5be565add89672
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=86370fd56c0d768a3d1a7719b82ab43b
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.33 b/metadata/md5-cache/dev-python/phonenumbers-8.12.33
index ff6138ac6fc0..91d4486f8fc4 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.33
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.33
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.33.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f70b6d8f0abc35acbb5be565add89672
diff --git a/metadata/md5-cache/dev-python/phply-1.2.5 b/metadata/md5-cache/dev-python/phply-1.2.5
index 2ed7311cadd3..68a12d7bd978 100644
--- a/metadata/md5-cache/dev-python/phply-1.2.5
+++ b/metadata/md5-cache/dev-python/phply-1.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://github.com/viraptor/phply/archive/1.2.5.tar.gz -> phply-1.2.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db252728f180f5698e5c8c36709a61e7
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.5 b/metadata/md5-cache/dev-python/pickleshare-0.7.5
index 784eef80706a..a783bfdefb8a 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.5
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.5
@@ -4,12 +4,12 @@ DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=7
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/path-py-6.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=mirror://pypi/p/pickleshare/pickleshare-0.7.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07aa8f22b52093424d12432ec4c7e256
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a893cbeff367dea2e0df7435b216c3ed
diff --git a/metadata/md5-cache/dev-python/pid-3.0.4 b/metadata/md5-cache/dev-python/pid-3.0.4
index 62beaa630e30..bb5a3a3c1ec0 100644
--- a/metadata/md5-cache/dev-python/pid-3.0.4
+++ b/metadata/md5-cache/dev-python/pid-3.0.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/p/pid/pid-3.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c10d74670be8fcc6eb2f88baaed4a19
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3-r1 b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
index 49f7500a641e..fffb2e615d44 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/piexif-1.1.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=mirror://pypi/p/piexif/piexif-1.1.3.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=612b9ce695c4cf3c46b1515f0c2bd9ce
diff --git a/metadata/md5-cache/dev-python/pika-1.1.0 b/metadata/md5-cache/dev-python/pika-1.1.0
index 2feab849b090..1f9b1e535f51 100644
--- a/metadata/md5-cache/dev-python/pika-1.1.0
+++ b/metadata/md5-cache/dev-python/pika-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pika/pika-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ef4ab7c261e33f86367deec35a753ba
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.16.1 b/metadata/md5-cache/dev-python/pikepdf-2.16.1
index d72190389756..094df0d992ea 100644
--- a/metadata/md5-cache/dev-python/pikepdf-2.16.1
+++ b/metadata/md5-cache/dev-python/pikepdf-2.16.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/pikepdf/pikepdf/archive/v2.16.1.tar.gz -> pikepdf-2.16.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74610feb91faeb866d1d920ea6d4004a
diff --git a/metadata/md5-cache/dev-python/pikepdf-3.1.0 b/metadata/md5-cache/dev-python/pikepdf-3.1.0
index fcfc2a67c4d4..23c59d58dac5 100644
--- a/metadata/md5-cache/dev-python/pikepdf-3.1.0
+++ b/metadata/md5-cache/dev-python/pikepdf-3.1.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/pikepdf/pikepdf/archive/v3.1.0.tar.gz -> pikepdf-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef45f3b2a8729130bc6c197588f3c7d0
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index 38e522a8850f..8ba8bb80e258 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a561f998c3184b0b1d111ec8ed94a434
diff --git a/metadata/md5-cache/dev-python/pillow-8.2.0 b/metadata/md5-cache/dev-python/pillow-8.2.0
index bc731079c1d4..185d9b8ccbf0 100644
--- a/metadata/md5-cache/dev-python/pillow-8.2.0
+++ b/metadata/md5-cache/dev-python/pillow-8.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.2.0.tar.gz -> pillow-8.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=358bd81b7ff8eca8012cfa8f3d70ab73
diff --git a/metadata/md5-cache/dev-python/pillow-8.3.0 b/metadata/md5-cache/dev-python/pillow-8.3.0
index 73aa3c387386..2e960644b7fe 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.0
+++ b/metadata/md5-cache/dev-python/pillow-8.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.0.tar.gz -> pillow-8.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e0dcb0be8fabe80807ef22080f76272a
diff --git a/metadata/md5-cache/dev-python/pillow-8.3.1 b/metadata/md5-cache/dev-python/pillow-8.3.1
index 9c33bdf65cfe..385150002dfd 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.1
+++ b/metadata/md5-cache/dev-python/pillow-8.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.1.tar.gz -> pillow-8.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e0dcb0be8fabe80807ef22080f76272a
diff --git a/metadata/md5-cache/dev-python/pillow-8.3.2 b/metadata/md5-cache/dev-python/pillow-8.3.2
index deee3ff21df3..eb94b292ec28 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.2
+++ b/metadata/md5-cache/dev-python/pillow-8.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 pytho
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.2.tar.gz -> pillow-8.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=02132001c867841242a5992bb0c38482
diff --git a/metadata/md5-cache/dev-python/pip-21.2.4 b/metadata/md5-cache/dev-python/pip-21.2.4
index e6d6f5044e7a..2a65aca99925 100644
--- a/metadata/md5-cache/dev-python/pip-21.2.4
+++ b/metadata/md5-cache/dev-python/pip-21.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/21.2.4.tar.gz -> pip-21.2.4.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-57.4.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.11.tar.gz -> virtualenv-16.7.11.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14f1a1d4497c6ec8de8abbc92f6aee55
diff --git a/metadata/md5-cache/dev-python/pipenv-2020.11.15 b/metadata/md5-cache/dev-python/pipenv-2020.11.15
index db9d87a5c37f..77bd5635d033 100644
--- a/metadata/md5-cache/dev-python/pipenv-2020.11.15
+++ b/metadata/md5-cache/dev-python/pipenv-2020.11.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipenv/archive/v2020.11.15.tar.gz -> pipenv-2020.11.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26483c9b7a2879e89a9675996708e5ad
diff --git a/metadata/md5-cache/dev-python/pipenv-2021.5.29 b/metadata/md5-cache/dev-python/pipenv-2021.5.29
index b7a5a80dbc84..3ead3c1ed61b 100644
--- a/metadata/md5-cache/dev-python/pipenv-2021.5.29
+++ b/metadata/md5-cache/dev-python/pipenv-2021.5.29
@@ -11,5 +11,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26483c9b7a2879e89a9675996708e5ad
diff --git a/metadata/md5-cache/dev-python/pipenv-2021.5.29-r2 b/metadata/md5-cache/dev-python/pipenv-2021.5.29-r2
index 0dda42d02543..a7d82c67abc2 100644
--- a/metadata/md5-cache/dev-python/pipenv-2021.5.29-r2
+++ b/metadata/md5-cache/dev-python/pipenv-2021.5.29-r2
@@ -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/pypa/pipenv/archive/v2021.5.29.tar.gz -> pipenv-2021.5.29.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d19353e980588474d8428f6d3a36f2b
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index 7a94379372ea..e34c71e3c9b4 100644
--- a/metadata/md5-cache/dev-python/pipfile-0.0.2
+++ b/metadata/md5-cache/dev-python/pipfile-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipfile/archive/v0.0.2.tar.gz -> pipfile-0.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4812845f27284ee0b84f20d66c3f3fb1
diff --git a/metadata/md5-cache/dev-python/pivy-0.6.6 b/metadata/md5-cache/dev-python/pivy-0.6.6
index 3c2695cafc14..0636a876714f 100644
--- a/metadata/md5-cache/dev-python/pivy-0.6.6
+++ b/metadata/md5-cache/dev-python/pivy-0.6.6
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/coin-4.0.0 quarter? ( media-libs/quarter ) soqt? ( >=media-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( quarter soqt ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/coin3d/pivy/archive/0.6.6.tar.gz -> pivy-0.6.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=37a5502ae167dab2dac937832a29cb38
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.5 b/metadata/md5-cache/dev-python/pkgconfig-1.5.5
index 36f3809a4c7b..6534efb3b062 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.5
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.5.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/matze/pkgconfig/archive/v1.5.5.tar.gz -> pkgconfig-1.5.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89d575d9384377be8b902f4df822b260
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.7.1 b/metadata/md5-cache/dev-python/pkginfo-1.7.1
index a240dfc14c23..45a2b9612477 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.7.1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf26b6328e7d1321526c535aa89af7c6
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.0.2 b/metadata/md5-cache/dev-python/platformdirs-2.0.2
deleted file mode 100644
index 692934bbf3ac..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~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 )
-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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e0c758e52baf7aa28d75768a9888103
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.2.0 b/metadata/md5-cache/dev-python/platformdirs-2.2.0
deleted file mode 100644
index c25d9988d56f..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/appdirs[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(-)?] ) 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 small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.2.0.tar.gz -> platformdirs-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f81f81984c02583a577f0c9ddfb95b2
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.3.0 b/metadata/md5-cache/dev-python/platformdirs-2.3.0
index b6b26c6e79d7..38cbfaba68cf 100644
--- a/metadata/md5-cache/dev-python/platformdirs-2.3.0
+++ b/metadata/md5-cache/dev-python/platformdirs-2.3.0
@@ -4,12 +4,12 @@ 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 ~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=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.3.0.tar.gz -> platformdirs-2.3.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2235a5210bf7cf10ed0508c31b2b74a7
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ac6e733061587ffdfa0a0ea68556afa3
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.4.0 b/metadata/md5-cache/dev-python/platformdirs-2.4.0
new file mode 100644
index 000000000000..74eb38c3d9e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/platformdirs-2.4.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/appdirs[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(-)?] ) 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 small Python module for determining appropriate platform-specific dirs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.4.0.tar.gz -> platformdirs-2.4.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2235a5210bf7cf10ed0508c31b2b74a7
diff --git a/metadata/md5-cache/dev-python/plotly-4.14.1 b/metadata/md5-cache/dev-python/plotly-4.14.1
index 0d48dd610541..a7455f2bf448 100644
--- a/metadata/md5-cache/dev-python/plotly-4.14.1
+++ b/metadata/md5-cache/dev-python/plotly-4.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-4.14.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=723563becc394e85d004bad2e442169b
diff --git a/metadata/md5-cache/dev-python/plotly-4.14.3 b/metadata/md5-cache/dev-python/plotly-4.14.3
index 0c1597341e29..c6f862eb344a 100644
--- a/metadata/md5-cache/dev-python/plotly-4.14.3
+++ b/metadata/md5-cache/dev-python/plotly-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-4.14.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44834e157560ea7cfe2c80b50bd744f8
diff --git a/metadata/md5-cache/dev-python/plotly-5.2.2 b/metadata/md5-cache/dev-python/plotly-5.2.2
index 2fc0b1cff6aa..614bb8ec6586 100644
--- a/metadata/md5-cache/dev-python/plotly-5.2.2
+++ b/metadata/md5-cache/dev-python/plotly-5.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-5.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2bd896c4fa3b4493ccfa51741ce18e4
diff --git a/metadata/md5-cache/dev-python/plotly-geo-1.0.0 b/metadata/md5-cache/dev-python/plotly-geo-1.0.0
index 78f9e2d4c06e..a6bbd3a463db 100644
--- a/metadata/md5-cache/dev-python/plotly-geo-1.0.0
+++ b/metadata/md5-cache/dev-python/plotly-geo-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plotly[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly-geo/plotly-geo-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6e1364b60ecdd2b0c3c3b9b7f9c4ba0
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1 b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
index 912f359f7bea..6f7fd15659e7 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.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/pluggy/pluggy-0.13.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0e9c3ceecc567a82a789fa9a5c4e5c6
diff --git a/metadata/md5-cache/dev-python/pluggy-1.0.0 b/metadata/md5-cache/dev-python/pluggy-1.0.0
index ea70582be864..76834b22208e 100644
--- a/metadata/md5-cache/dev-python/pluggy-1.0.0
+++ b/metadata/md5-cache/dev-python/pluggy-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=76fbc130b80bbda70f6b896b558065f6
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.0 b/metadata/md5-cache/dev-python/pluginbase-1.0.0
index c035bba37f5c..24caa1b64c1a 100644
--- a/metadata/md5-cache/dev-python/pluginbase-1.0.0
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b598fe158566081ae70e78a834a9cc6
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.1 b/metadata/md5-cache/dev-python/pluginbase-1.0.1
index f0a76daee4f3..f0e56a9e655c 100644
--- a/metadata/md5-cache/dev-python/pluginbase-1.0.1
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=80a4f5447e985bfe25b6f28fbdc2e959
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 4ef9613d7c64..6c38c22197d8 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 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plumbum/plumbum-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3cc88e9437064fc9e0ebb16228f94503
diff --git a/metadata/md5-cache/dev-python/ply-3.11-r1 b/metadata/md5-cache/dev-python/ply-3.11-r1
index 8080f20daa3b..e9391c53bfb1 100644
--- a/metadata/md5-cache/dev-python/ply-3.11-r1
+++ b/metadata/md5-cache/dev-python/ply-3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/3.11
 SRC_URI=mirror://pypi/p/ply/ply-3.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6185658d76d6a8b8069f430d7504d279
diff --git a/metadata/md5-cache/dev-python/plyr-1.0.6 b/metadata/md5-cache/dev-python/plyr-1.0.6
index 5f97be6eb8a3..3dccbbaf4db7 100644
--- a/metadata/md5-cache/dev-python/plyr-1.0.6
+++ b/metadata/md5-cache/dev-python/plyr-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=media-libs/glyr:= python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sahib/python-glyr/archive/1.0.6.tar.gz -> python-glyr-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=32f9006faf9c1139d5aafa373ea50c30
diff --git a/metadata/md5-cache/dev-python/plyvel-1.3.0 b/metadata/md5-cache/dev-python/plyvel-1.3.0
index a4d8187396ac..ce60a9664bb7 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.3.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.3.0
@@ -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/plyvel/plyvel-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42a9b114f42502f678eae24ce7429d01
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1-r2 b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
index 1f5fdc919388..b667cdc56505 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=07c5c68b2e1b4beacf4afffd91a63ccc
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.21 b/metadata/md5-cache/dev-python/pocketlint-0.21
index 0c98a29aa1ea..d19010b6dd49 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.21
+++ b/metadata/md5-cache/dev-python/pocketlint-0.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.21.tar.gz -> pocketlint-0.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31b5a5dc4f4033d34387b52b085fc0c4
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1-r1 b/metadata/md5-cache/dev-python/pockets-0.9.1-r1
deleted file mode 100644
index 0a758d0cfc58..000000000000
--- a/metadata/md5-cache/dev-python/pockets-0.9.1-r1
+++ /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/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Collection of helpful Python tools
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pockets/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=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/p/pockets/pockets-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4670d41b9b12fc2811c514e3595379bc
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1-r2 b/metadata/md5-cache/dev-python/pockets-0.9.1-r2
index 502b184242ad..8af910e29148 100644
--- a/metadata/md5-cache/dev-python/pockets-0.9.1-r2
+++ b/metadata/md5-cache/dev-python/pockets-0.9.1-r2
@@ -4,12 +4,12 @@ DESCRIPTION=Collection of helpful Python tools
 EAPI=8
 HOMEPAGE=https://pockets.readthedocs.io/ https://pypi.org/project/pockets/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~x86 ~amd64-linux ~x86-linux
 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobRuana/pockets/archive/777724c8eabaf76f6d0c5e4837c982d110509b2e.tar.gz -> pockets-0.9.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d95a8772e2f99f48b70fe003997fc8e3
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=73196b09a559f7b2ed0359d923cc389b
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.7 b/metadata/md5-cache/dev-python/podcastparser-0.6.7
index 88ccda100d87..43c268699ff2 100644
--- a/metadata/md5-cache/dev-python/podcastparser-0.6.7
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.7
@@ -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/podcastparser/podcastparser-0.6.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a69f9b0a0fc48e0ec756fd35f78f772e
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.8 b/metadata/md5-cache/dev-python/podcastparser-0.6.8
index 24ef3fe1a09f..6ac7c5f1d19e 100644
--- a/metadata/md5-cache/dev-python/podcastparser-0.6.8
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.8
@@ -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/podcastparser/podcastparser-0.6.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1ce6de1054c3fbc97f50d2e564df39f
diff --git a/metadata/md5-cache/dev-python/podman-py-3.2.0 b/metadata/md5-cache/dev-python/podman-py-3.2.0
index db67d79f3bae..5e37ce604ea0 100644
--- a/metadata/md5-cache/dev-python/podman-py-3.2.0
+++ b/metadata/md5-cache/dev-python/podman-py-3.2.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/containers/podman-py/archive/v3.2.0.tar.gz -> podman-py-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a78dc8624a2de58f8e99dd90a81f4e5
diff --git a/metadata/md5-cache/dev-python/podman-py-3.2.1 b/metadata/md5-cache/dev-python/podman-py-3.2.1
index b455249b64f3..d68755e1637d 100644
--- a/metadata/md5-cache/dev-python/podman-py-3.2.1
+++ b/metadata/md5-cache/dev-python/podman-py-3.2.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/containers/podman-py/archive/v3.2.1.tar.gz -> podman-py-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10a7092547cb50b4138b2680b2d32103
diff --git a/metadata/md5-cache/dev-python/polib-1.1.1 b/metadata/md5-cache/dev-python/polib-1.1.1
index e402b68cca62..ef2143520c45 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.1
+++ b/metadata/md5-cache/dev-python/polib-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70aaa6058baf4c949f8fd4f415aec338
diff --git a/metadata/md5-cache/dev-python/polygon-3.0.7 b/metadata/md5-cache/dev-python/polygon-3.0.7
index 025c3eb907e6..aea068defa10 100644
--- a/metadata/md5-cache/dev-python/polygon-3.0.7
+++ b/metadata/md5-cache/dev-python/polygon-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=3
 SRC_URI=https://www.bitbucket.org/jraedler/polygon3/downloads/Polygon3-3.0.7.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6ba08413feeb47f7c5bb33739d7c797
diff --git a/metadata/md5-cache/dev-python/pony-0.7.14 b/metadata/md5-cache/dev-python/pony-0.7.14
index 80849a848f8d..668c7e53e91c 100644
--- a/metadata/md5-cache/dev-python/pony-0.7.14
+++ b/metadata/md5-cache/dev-python/pony-0.7.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponyorm/pony/archive/v0.7.14.tar.gz -> pony-0.7.14.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb7865b393028744f902de6e087cc7c
diff --git a/metadata/md5-cache/dev-python/pooch-1.4.0 b/metadata/md5-cache/dev-python/pooch-1.4.0
index 15ca5d1863c4..4d55619f48a9 100644
--- a/metadata/md5-cache/dev-python/pooch-1.4.0
+++ b/metadata/md5-cache/dev-python/pooch-1.4.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/pooch/pooch-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42d087dff5aed5edfe50cd04b122d23a
diff --git a/metadata/md5-cache/dev-python/portend-2.7.1 b/metadata/md5-cache/dev-python/portend-2.7.1
index eb312ac927e3..12d8aed8ae35 100644
--- a/metadata/md5-cache/dev-python/portend-2.7.1
+++ b/metadata/md5-cache/dev-python/portend-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a4c051e2780f5ea7f776ed75f08525ae
diff --git a/metadata/md5-cache/dev-python/poyo-0.5.0 b/metadata/md5-cache/dev-python/poyo-0.5.0
index da36fd9edddf..a1c37878ada0 100644
--- a/metadata/md5-cache/dev-python/poyo-0.5.0
+++ b/metadata/md5-cache/dev-python/poyo-0.5.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/poyo/poyo-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b0df249033e05bf039aa762f2dd4b5c
diff --git a/metadata/md5-cache/dev-python/precis-i18n-1.0.3 b/metadata/md5-cache/dev-python/precis-i18n-1.0.3
index 9f4f8c16c399..50e85a24f519 100644
--- a/metadata/md5-cache/dev-python/precis-i18n-1.0.3
+++ b/metadata/md5-cache/dev-python/precis-i18n-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbd5b207f24ebbec0aa56d8799348e15
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.9-r1 b/metadata/md5-cache/dev-python/pretend-1.0.9-r1
index bbb7ce04642e..e8a9f19a0300 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.9-r1
+++ b/metadata/md5-cache/dev-python/pretend-1.0.9-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/alex/pretend/archive/v1.0.9.tar.gz -> pretend-1.0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04c05f247adcf6a2721164906d86cbd8
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-21.8.3 b/metadata/md5-cache/dev-python/pretty-yaml-21.8.3
index b273709c0fe2..0f2c96b1194a 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-21.8.3
+++ b/metadata/md5-cache/dev-python/pretty-yaml-21.8.3
@@ -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/pyaml/pyaml-21.8.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24bff1c5075c163ce7bdb5fea62624c7
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
index 9bbdf310c6ab..ae74a46cf847 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2-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/PrettyTable/prettytable-0.7.2.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20c9df231ea1c6285391334bb8966e26
diff --git a/metadata/md5-cache/dev-python/prettytable-2.1.0 b/metadata/md5-cache/dev-python/prettytable-2.1.0
index 6ef18709fc21..d7b52c381d66 100644
--- a/metadata/md5-cache/dev-python/prettytable-2.1.0
+++ b/metadata/md5-cache/dev-python/prettytable-2.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=mirror://pypi/p/prettytable/prettytable-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=572e7e97ee08a57a0f30ae155b182086
diff --git a/metadata/md5-cache/dev-python/prettytable-2.2.0 b/metadata/md5-cache/dev-python/prettytable-2.2.0
index 71ba2912bc84..fb9e61560a14 100644
--- a/metadata/md5-cache/dev-python/prettytable-2.2.0
+++ b/metadata/md5-cache/dev-python/prettytable-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prettytable/prettytable-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=774c3313c3d14081caf891b56fbf37f4
diff --git a/metadata/md5-cache/dev-python/prettytable-2.2.1 b/metadata/md5-cache/dev-python/prettytable-2.2.1
new file mode 100644
index 000000000000..931c01da2213
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prettytable-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_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] ) ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/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=Easily displaying tabular data in a visually appealing ASCII table format
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/prettytable/ https://pypi.org/project/prettytable/
+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 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) 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/prettytable/prettytable-2.2.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=774c3313c3d14081caf891b56fbf37f4
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 8c35fbdbefcb..53c359fa663b 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.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/priority/priority-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f076e2db697be971a9221bf0e042b4ae
diff --git a/metadata/md5-cache/dev-python/priority-2.0.0 b/metadata/md5-cache/dev-python/priority-2.0.0
index 50a5a1b040d2..b16a625b4e23 100644
--- a/metadata/md5-cache/dev-python/priority-2.0.0
+++ b/metadata/md5-cache/dev-python/priority-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0b7d7ce5772cfcf13e3987bc22851a7
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.2 b/metadata/md5-cache/dev-python/process-tests-2.1.2
index fc7c4b4f2ed5..68ce4ff2c183 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.2
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8915ddbcf23082d18317ba5fa0af330
diff --git a/metadata/md5-cache/dev-python/progress-1.6 b/metadata/md5-cache/dev-python/progress-1.6
index 4e7bf55ed313..b2652663fabb 100644
--- a/metadata/md5-cache/dev-python/progress-1.6
+++ b/metadata/md5-cache/dev-python/progress-1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14f2360ee10871dbaffc2a60958772b8
diff --git a/metadata/md5-cache/dev-python/progressbar-2.5 b/metadata/md5-cache/dev-python/progressbar-2.5
index b5aa26ca27c9..b8dee83bfa39 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.5
+++ b/metadata/md5-cache/dev-python/progressbar-2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar/progressbar-2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b20cfee2323a7825fac1fee988efbbca
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.53.1 b/metadata/md5-cache/dev-python/progressbar2-3.53.1
index 4c4c73f9aabe..1b0753597572 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.53.1
+++ b/metadata/md5-cache/dev-python/progressbar2-3.53.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.53.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa73b2da344c80e8f77149c8ea205cce
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.53.3 b/metadata/md5-cache/dev-python/progressbar2-3.53.3
index 7a8c55cc7a26..2e30d8a8e4ba 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.53.3
+++ b/metadata/md5-cache/dev-python/progressbar2-3.53.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.53.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f7d7e45e762bd4be6515e1c9c13b5ba
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.11.0 b/metadata/md5-cache/dev-python/prometheus_client-0.11.0
index bb47b91b7c03..978b19ef64d2 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.11.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.11.0.tar.gz -> prometheus_client-0.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6eaefa97a4823d0089ff437f474e5cab
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
index 7e11cf30b3f6..4f48e72a73c7 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.19
@@ -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/prompt_toolkit/prompt_toolkit-3.0.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8efe18d8d56dd411e93aea105c18d91
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.20 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.20
index d86aaf86df23..9b2e9d1ab812 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.20
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.20
@@ -4,12 +4,12 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=136ff0b49f63b98141cd1be0a428b7cd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b5a5a82f84f685c0c844e9a0770ae0b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.8 b/metadata/md5-cache/dev-python/protobuf-python-3.15.8
index ebb836036de0..3edf8ed19683 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.8
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.15.8
@@ -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/26
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz -> protobuf-3.15.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=138c46a91ebd7529a76cab190254c900
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.16.0 b/metadata/md5-cache/dev-python/protobuf-python-3.16.0
index 11e3c890998e..e3c4595b9c25 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.16.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.16.0
@@ -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/27
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz -> protobuf-3.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db7f12d571891ddf2887ff346d663ebe
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.17.0 b/metadata/md5-cache/dev-python/protobuf-python-3.17.0
index f3a42e50ea01..55d8d3725e2a 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.17.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.0
@@ -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/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.0.tar.gz -> protobuf-3.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be54c1c9ab213504b5da82e9f92ee568
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.17.1 b/metadata/md5-cache/dev-python/protobuf-python-3.17.1
index 350e8641f2bb..b554acd786ae 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.17.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.1
@@ -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/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.1.tar.gz -> protobuf-3.17.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be54c1c9ab213504b5da82e9f92ee568
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.17.2 b/metadata/md5-cache/dev-python/protobuf-python-3.17.2
index b5cc72e28b24..1adbe351c120 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.17.2
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.2
@@ -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/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.2.tar.gz -> protobuf-3.17.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be54c1c9ab213504b5da82e9f92ee568
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.17.3 b/metadata/md5-cache/dev-python/protobuf-python-3.17.3
index e51a2dadc92f..e679650cc347 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.17.3
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.3
@@ -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/28
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0121bafdee498ec3255c3fffc1d6bbe7
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 4b6b2ca13fe2..98849dbab429 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-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/protobuf-9999 dev-python/namespace-google[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 )
 SLOT=0/28
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26b8119f37d4a15ed0b8e7a662099e50
diff --git a/metadata/md5-cache/dev-python/prov-1.5.3 b/metadata/md5-cache/dev-python/prov-1.5.3
index 78026c5feac3..dfdf19412860 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.3
+++ b/metadata/md5-cache/dev-python/prov-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=864ce53317199815da28d7307e7df814
diff --git a/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1 b/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
index 6e3a9aef9f7c..bf43199912e8 100644
--- a/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[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/fossasia/pslab-python/archive/v1.0.1.tar.gz -> pslab-python-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2865640a0400044a80265fff690ef5ef
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.0-r1 b/metadata/md5-cache/dev-python/psutil-5.7.0-r1
index ebe416bf766e..257af5f10823 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.0-r1
+++ b/metadata/md5-cache/dev-python/psutil-5.7.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=mirror://pypi/p/psutil/psutil-5.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=880399c79e97895ba5421f4fc29eb93d
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.2-r1 b/metadata/md5-cache/dev-python/psutil-5.7.2-r1
index 0966fa659503..f83e6ce481bc 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.2-r1
+++ b/metadata/md5-cache/dev-python/psutil-5.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d09c30528cff43325b4c91f5a05f814c
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.3 b/metadata/md5-cache/dev-python/psutil-5.7.3
index 922bdcc81f1a..183d6ce7297e 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.3
+++ b/metadata/md5-cache/dev-python/psutil-5.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a78ddc286fd9b2293bb5dd3d1e728c1
diff --git a/metadata/md5-cache/dev-python/psycopg-2.9.1 b/metadata/md5-cache/dev-python/psycopg-2.9.1
index a9ad666f2eb3..463a6d75314f 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.9.1
+++ b/metadata/md5-cache/dev-python/psycopg-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57e4d85a645264c15e6d24cd169f03df
diff --git a/metadata/md5-cache/dev-python/ptvsd-4.3.2 b/metadata/md5-cache/dev-python/ptvsd-4.3.2
index 27ae3ea0cd8c..36a11a926766 100644
--- a/metadata/md5-cache/dev-python/ptvsd-4.3.2
+++ b/metadata/md5-cache/dev-python/ptvsd-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/microsoft/ptvsd/archive/v4.3.2.tar.gz -> ptvsd-4.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6bc4720b1935ae71f4698481f524c6fa
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.7.0 b/metadata/md5-cache/dev-python/ptyprocess-0.7.0
index afdc71d84253..78f6fb4d51ec 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.7.0
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f76313eab9ea4f1e5b3779610dcc8f33
diff --git a/metadata/md5-cache/dev-python/publicsuffix-2.20191221 b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
index 3c22deac03ab..021ac0d5423a 100644
--- a/metadata/md5-cache/dev-python/publicsuffix-2.20191221
+++ b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/publicsuffix2/publicsuffix2-2.20191221.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c54e13f0b6e4cb71a878b9c894667afb
diff --git a/metadata/md5-cache/dev-python/publicsuffix-2.20191221-r1 b/metadata/md5-cache/dev-python/publicsuffix-2.20191221-r1
index b404df3d26d4..0cee294735c3 100644
--- a/metadata/md5-cache/dev-python/publicsuffix-2.20191221-r1
+++ b/metadata/md5-cache/dev-python/publicsuffix-2.20191221-r1
@@ -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/nexB/python-publicsuffix2/archive/release-2.2019-12-21.tar.gz -> publicsuffix-2.20191221.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e02c9277435880d3c6d319e1ab8bd6f9
diff --git a/metadata/md5-cache/dev-python/pudb-2020.1 b/metadata/md5-cache/dev-python/pudb-2020.1
index 8e3ab72300b8..5cfbc08b83b3 100644
--- a/metadata/md5-cache/dev-python/pudb-2020.1
+++ b/metadata/md5-cache/dev-python/pudb-2020.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/pudb/pudb-2020.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4587f7ba8a31bbf8c13bda1912d16281
diff --git a/metadata/md5-cache/dev-python/pudb-2021.1 b/metadata/md5-cache/dev-python/pudb-2021.1
index bc316157118e..98620329364f 100644
--- a/metadata/md5-cache/dev-python/pudb-2021.1
+++ b/metadata/md5-cache/dev-python/pudb-2021.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/pudb/pudb-2021.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f015db95afd53dd65447cbf4a0ae84f
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.5.17 b/metadata/md5-cache/dev-python/pulsectl-21.5.17
index 6455d123605b..dc5e7355c727 100644
--- a/metadata/md5-cache/dev-python/pulsectl-21.5.17
+++ b/metadata/md5-cache/dev-python/pulsectl-21.5.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.17.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8271237beeff3bcdbce8838ff697876
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.5.18 b/metadata/md5-cache/dev-python/pulsectl-21.5.18
index c0ab8c970005..81531a2da9c9 100644
--- a/metadata/md5-cache/dev-python/pulsectl-21.5.18
+++ b/metadata/md5-cache/dev-python/pulsectl-21.5.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8271237beeff3bcdbce8838ff697876
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.9.1 b/metadata/md5-cache/dev-python/pulsectl-21.9.1
index 20c620c5ec0d..0c01a82bcf9d 100644
--- a/metadata/md5-cache/dev-python/pulsectl-21.9.1
+++ b/metadata/md5-cache/dev-python/pulsectl-21.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfc8f266f4ee776a2b56f0929f909cc6
diff --git a/metadata/md5-cache/dev-python/puremagic-1.11 b/metadata/md5-cache/dev-python/puremagic-1.11
index 471730a90ab6..ab1349e6d458 100644
--- a/metadata/md5-cache/dev-python/puremagic-1.11
+++ b/metadata/md5-cache/dev-python/puremagic-1.11
@@ -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/cdgriffith/puremagic/archive/1.11.tar.gz -> puremagic-1.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a20531423d5ccdd6fab146626a4bd1c7
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.12.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
index 4480de0b6caf..df03e97de26f 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pushbullet-py/pushbullet.py-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a2c9c5342211f1acd3462b90e7b9a9f
diff --git a/metadata/md5-cache/dev-python/pweave-0.30.3-r1 b/metadata/md5-cache/dev-python/pweave-0.30.3-r1
index 9cc9b146fdb9..06e603393cbd 100644
--- a/metadata/md5-cache/dev-python/pweave-0.30.3-r1
+++ b/metadata/md5-cache/dev-python/pweave-0.30.3-r1
@@ -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/P/Pweave/Pweave-0.30.3.tar.gz -> pweave-0.30.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01d9fea8c4cdf2a91a627c57faae2d86
diff --git a/metadata/md5-cache/dev-python/py-1.10.0 b/metadata/md5-cache/dev-python/py-1.10.0
index 027d83d7b9d5..972447072d2d 100644
--- a/metadata/md5-cache/dev-python/py-1.10.0
+++ b/metadata/md5-cache/dev-python/py-1.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45af3a49cc9872d6d6da93197e09df4e
diff --git a/metadata/md5-cache/dev-python/py-amqp-5.0.6 b/metadata/md5-cache/dev-python/py-amqp-5.0.6
index b57613c24621..cf9a98991160 100644
--- a/metadata/md5-cache/dev-python/py-amqp-5.0.6
+++ b/metadata/md5-cache/dev-python/py-amqp-5.0.6
@@ -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/a/amqp/amqp-5.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71eb87d7c04363ddde431a9b383fa49e
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
index 885380fc9cea..77c72fd45b82 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-6.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f191f045abe1130f153335674976499
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
index c819c11385e9..d888a4855628 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-7.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3c50b72d2a8f094f32ef5d08758c302
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
index 007737ea30ac..878f7f021dfa 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-8.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=38badc52852805a5bb4453f2e9fbc3c3
diff --git a/metadata/md5-cache/dev-python/py-gfm-0.1.4 b/metadata/md5-cache/dev-python/py-gfm-0.1.4
index 8d16fe0486cb..ef0f878494c4 100644
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.4
+++ b/metadata/md5-cache/dev-python/py-gfm-0.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_8(-)?] python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Zopieux/py-gfm/archive/0.1.4.tar.gz -> py-gfm-0.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9cd066fa7b05dceb3021a8ffc220a6e
diff --git a/metadata/md5-cache/dev-python/py-gfm-1.0.2 b/metadata/md5-cache/dev-python/py-gfm-1.0.2
index 2269dab6b297..23fb7b49a0c6 100644
--- a/metadata/md5-cache/dev-python/py-gfm-1.0.2
+++ b/metadata/md5-cache/dev-python/py-gfm-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-gfm/py-gfm-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=396d240e77f08390238da91e3b2dd6be
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.16.1 b/metadata/md5-cache/dev-python/py-ubjson-0.16.1
index 86d76c5eca70..d49fd5a85178 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.16.1
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.16.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/py-ubjson/py-ubjson-0.16.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03bb06f9e160efdb2afb1c1daecfb80f
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2 b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
index d24b94aa257a..177a081758be 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
+++ b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab6f5f7aa0d67fbeefa42b823e0d1e2c
diff --git a/metadata/md5-cache/dev-python/pyFFTW-0.12.0-r1 b/metadata/md5-cache/dev-python/pyFFTW-0.12.0-r1
index c6acf33a91c2..1f0c421873ec 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/pyFFTW-0.12.0-r1
@@ -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 )
 SLOT=0
 SRC_URI=https://github.com/pyFFTW/pyFFTW/archive/v0.12.0.tar.gz -> pyFFTW-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90550113cecbff4b9e4b72bd44de632d
diff --git a/metadata/md5-cache/dev-python/pyFFTW-9999 b/metadata/md5-cache/dev-python/pyFFTW-9999
index f9375ce0ac53..5b312ae07dae 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-9999
+++ b/metadata/md5-cache/dev-python/pyFFTW-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/fftw-3.3:3.0=[threads] python_targets_python3_8? ( dev-lang/python: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_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=223e31b04dc5a8944633e9d98a7c669d
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.2 b/metadata/md5-cache/dev-python/pyGPG-0.2
index a97024b2a72e..a717e3227c3d 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.2
+++ b/metadata/md5-cache/dev-python/pyGPG-0.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg python_targets_python3_8? ( dev-lang/python:3.8 ) python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3388626152fb992e5740e3cc33cdad1
diff --git a/metadata/md5-cache/dev-python/pyGPG-9999 b/metadata/md5-cache/dev-python/pyGPG-9999
index aa5e46fbbeac..935a78e87dcf 100644
--- a/metadata/md5-cache/dev-python/pyGPG-9999
+++ b/metadata/md5-cache/dev-python/pyGPG-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/gnupg python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3617777295428335f80b59e3f94c60b
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.0 b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
index 82ff240d24ee..3e283a6c15ec 100644
--- a/metadata/md5-cache/dev-python/pyacoustid-1.2.0
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/audioread[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78626c35f4571f59d817e46fff644463
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2 b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
index ffe43cec59e8..3219b3a20de7 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
@@ -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/pyaes/pyaes-1.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=488c7b1d1513d8e15ac362130b17394a
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1 b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
index ebcce0e492fe..ffb0eb7c3034 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/alsa-lib python_targets_python3_8? ( dev-lang/python:3.8 ) py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.1.6.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=23abebc0059dcc62fb3501705fdbc40a
diff --git a/metadata/md5-cache/dev-python/pyamg-4.0.0 b/metadata/md5-cache/dev-python/pyamg-4.0.0
index f6b6e8c5453d..f958ad421234 100644
--- a/metadata/md5-cache/dev-python/pyamg-4.0.0
+++ b/metadata/md5-cache/dev-python/pyamg-4.0.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/pyamg/pyamg-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=654e63cd606cca0ada88c03021a83a7a
diff --git a/metadata/md5-cache/dev-python/pyamg-4.1.0 b/metadata/md5-cache/dev-python/pyamg-4.1.0
index a3026d65f6f3..e563baa9fea5 100644
--- a/metadata/md5-cache/dev-python/pyamg-4.1.0
+++ b/metadata/md5-cache/dev-python/pyamg-4.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/pyamg/pyamg-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e836582a69d5c16fb1f6bf183b38d725
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1 b/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
index f629b6f27ec7..b5e05d0a974c 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58cdc8ac6070bc15af87416426ff3c90
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
index a87a4a36c521..04304f485064 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db87e46da36de7b28686b129f2cae2ed
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1 b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
index a9600bdd9a16..208849590d7f 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAudio/PyAudio-0.2.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=355c80a44a925d55098f83d7a353fbea
diff --git a/metadata/md5-cache/dev-python/pybind11-2.7.1 b/metadata/md5-cache/dev-python/pybind11-2.7.1
index 39232146b175..eaed40132513 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.7.1
+++ b/metadata/md5-cache/dev-python/pybind11-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.7.1.tar.gz -> pybind11-2.7.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=113f5935cd3c8caf394711e69df24cf5
diff --git a/metadata/md5-cache/dev-python/pybluez-0.23 b/metadata/md5-cache/dev-python/pybluez-0.23
index 9a9263969cd2..336afc9dde62 100644
--- a/metadata/md5-cache/dev-python/pybluez-0.23
+++ b/metadata/md5-cache/dev-python/pybluez-0.23
@@ -11,5 +11,5 @@ RDEPEND=net-wireless/bluez python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyBluez/PyBluez-0.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46bb8d17f484b0f1fd72be62615289ec
diff --git a/metadata/md5-cache/dev-python/pybtex-0.23.0 b/metadata/md5-cache/dev-python/pybtex-0.23.0
index a7e2df900f03..23a8ac3ae7ec 100644
--- a/metadata/md5-cache/dev-python/pybtex-0.23.0
+++ b/metadata/md5-cache/dev-python/pybtex-0.23.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.23.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1575f6d2e357dcd38e0f66d9d83b0820
diff --git a/metadata/md5-cache/dev-python/pybtex-0.24.0 b/metadata/md5-cache/dev-python/pybtex-0.24.0
index 1bb0e3c7c54a..878e0113cc03 100644
--- a/metadata/md5-cache/dev-python/pybtex-0.24.0
+++ b/metadata/md5-cache/dev-python/pybtex-0.24.0
@@ -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://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.24.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7dd10a98498583cc51cc1e256b7613b
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
index dd7268df72a6..679e70272d10 100644
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
+++ b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20d87d4565967f3ef6dc857156e52bb4
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
index 55dea5c6b6e6..b751926199a4 100644
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
+++ b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2959961d7282105cda6bd4f227242c7
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.1 b/metadata/md5-cache/dev-python/pycairo-1.20.1
index 3e98723bd677..b89e062b9978 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.20.1
+++ b/metadata/md5-cache/dev-python/pycairo-1.20.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/pygobject/pycairo/releases/download/v1.20.1/pycairo-1.20.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de6e91fba5b3adcc3bf5736cbd74b944
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.4 b/metadata/md5-cache/dev-python/pycapnp-0.6.4
index 9f446976c71f..f73feacdf36c 100644
--- a/metadata/md5-cache/dev-python/pycapnp-0.6.4
+++ b/metadata/md5-cache/dev-python/pycapnp-0.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/capnproto-0.6:= python_targets_python3_8? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycapnp/pycapnp-0.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0744534564034cdbe0abe9456077e342
diff --git a/metadata/md5-cache/dev-python/pycares-4.0.0 b/metadata/md5-cache/dev-python/pycares-4.0.0
index 537ea1876149..ff5743433f6d 100644
--- a/metadata/md5-cache/dev-python/pycares-4.0.0
+++ b/metadata/md5-cache/dev-python/pycares-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/saghul/pycares/archive/pycares-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=638fc592402ba2bc5ff7dfa1dcc87f1e
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.0 b/metadata/md5-cache/dev-python/pycdio-2.1.0
index ec40572bb903..5fbd9c1c35dd 100644
--- a/metadata/md5-cache/dev-python/pycdio-2.1.0
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fc58b654e85e04aa8c97d8471e0e55e
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.1 b/metadata/md5-cache/dev-python/pycdio-2.1.1
index bb248f8bfa0a..b971befdc577 100644
--- a/metadata/md5-cache/dev-python/pycdio-2.1.1
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.1
@@ -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/p/pycdio/pycdio-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59e9a3231fd5696d237c1c806d5a7a2b
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.6 b/metadata/md5-cache/dev-python/pychm-0.8.6
index 01e06a0bf697..87c629f59e61 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.6
+++ b/metadata/md5-cache/dev-python/pychm-0.8.6
@@ -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/dottedmag/pychm/archive/v0.8.6.tar.gz -> pychm-0.8.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dda23ef8ffb030b14c42ae4627808d49
diff --git a/metadata/md5-cache/dev-python/pychromecast-8.1.0 b/metadata/md5-cache/dev-python/pychromecast-8.1.0
index 480c8aea5a13..a590fed6e6fe 100644
--- a/metadata/md5-cache/dev-python/pychromecast-8.1.0
+++ b/metadata/md5-cache/dev-python/pychromecast-8.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyChromecast/PyChromecast-8.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8a7efdd50b853c09a4eea730d43d0d1
diff --git a/metadata/md5-cache/dev-python/pychroot-0.10.4 b/metadata/md5-cache/dev-python/pychroot-0.10.4
index 12beae544e03..d50361c1a86a 100644
--- a/metadata/md5-cache/dev-python/pychroot-0.10.4
+++ b/metadata/md5-cache/dev-python/pychroot-0.10.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/pychroot/pychroot-0.10.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2db2021d321811037e42944bdd54eab0
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index 629fbef90048..193c04d5fb7e 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc0f82424fb8a47b3ae1a8e70a0a75e3
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.3.0 b/metadata/md5-cache/dev-python/pyclipper-1.3.0
index 5dfdbcf74ae1..f48167bc92f7 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.3.0
+++ b/metadata/md5-cache/dev-python/pyclipper-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.3.0.tar.gz -> pyclipper-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51f92a147d37c9008c36865ec3d01461
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.6.0 b/metadata/md5-cache/dev-python/pycodestyle-2.6.0
index d4523fd75646..3cb76af89cb3 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.6.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8002a2a0559d3aefe73d58c898961ef5
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.7.0 b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
index 01db6b995127..b5948a439353 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.7.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbf48a22604eea65a9e5ebd619f9c11a
diff --git a/metadata/md5-cache/dev-python/pycollada-0.7.1 b/metadata/md5-cache/dev-python/pycollada-0.7.1
index 775b29ca1916..80316deefd76 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.7.1
+++ b/metadata/md5-cache/dev-python/pycollada-0.7.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/pycollada/pycollada/archive/v0.7.1.tar.gz -> pycollada-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3db5076a2bfe30185b8b1e3c5b39bd08
diff --git a/metadata/md5-cache/dev-python/pycountry-20.7.3 b/metadata/md5-cache/dev-python/pycountry-20.7.3
index 2dfde340de24..674bda1dcaf3 100644
--- a/metadata/md5-cache/dev-python/pycountry-20.7.3
+++ b/metadata/md5-cache/dev-python/pycountry-20.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-20.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e53c4ab69340e2c9d696a4cbb77ba33f
diff --git a/metadata/md5-cache/dev-python/pycparser-2.20-r1 b/metadata/md5-cache/dev-python/pycparser-2.20-r1
index fc2a9092403c..1bb81d0cc61f 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.20-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.20-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8b0fd9702e578b3ef6367c62ef596f1
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.10.1 b/metadata/md5-cache/dev-python/pycryptodome-3.10.1
index 0fc5badd6e3b..10095f5bbe35 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.10.1
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.10.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/Legrandin/pycryptodome/archive/v3.10.1.tar.gz -> pycryptodome-3.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=574dce77b6f6d98bb5092acddb1faffb
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.10.4 b/metadata/md5-cache/dev-python/pycryptodome-3.10.4
index 3863448af1e3..ddb4d4de0d96 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.10.4
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.10.4
@@ -5,12 +5,12 @@ DESCRIPTION=A self-contained cryptographic library for Python
 EAPI=8
 HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
 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 ~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=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.10.4.tar.gz -> pycryptodome-3.10.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f2abbfeb433970c5353d7165c464a11
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4b2df5caec274f20fac86bb52dafba8
diff --git a/metadata/md5-cache/dev-python/pycson-0.8-r1 b/metadata/md5-cache/dev-python/pycson-0.8-r1
index ebac1bac3449..5e3be8969e5c 100644
--- a/metadata/md5-cache/dev-python/pycson-0.8-r1
+++ b/metadata/md5-cache/dev-python/pycson-0.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/speg python_targets_python3_8? ( dev-lang/python:3.8 ) python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/avakar/pycson/archive/0.8.tar.gz -> pycson-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23698be8cb846d23fcc694bff4690be1
diff --git a/metadata/md5-cache/dev-python/pycuda-2019.1.2 b/metadata/md5-cache/dev-python/pycuda-2019.1.2
index fd904480067c..256e9436288c 100644
--- a/metadata/md5-cache/dev-python/pycuda-2019.1.2
+++ b/metadata/md5-cache/dev-python/pycuda-2019.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=userpriv !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2019.1.2.tar.gz
-_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d597a82ea017d8d365321eef951d0f7
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r2 b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
index 5c06c71ccff4..ee4af558f6ed 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r2
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups python_targets_python3_8? ( dev-lang/python:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ccd53378764fd0ad375e2b4daa6d9600
diff --git a/metadata/md5-cache/dev-python/pycups-2.0.1 b/metadata/md5-cache/dev-python/pycups-2.0.1
index f9df6136d2d6..7d5d65f8d2e5 100644
--- a/metadata/md5-cache/dev-python/pycups-2.0.1
+++ b/metadata/md5-cache/dev-python/pycups-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for the CUPS API
 EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/pycups
 IUSE=examples 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=GPL-2
 RDEPEND=net-print/cups python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/pycups/pycups-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=db40feff6a80378d2741a91ee8ae215f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d9d81fbdefed9f9eff0cf4221f94a339
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.6 b/metadata/md5-cache/dev-python/pycurl-7.43.0.6
index 5f98e91060d6..b8d93072a19b 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.6
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.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/p/pycurl/pycurl-7.43.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d30f63d8721e734dda6a8395709385d
diff --git a/metadata/md5-cache/dev-python/pycurl-7.44.0 b/metadata/md5-cache/dev-python/pycurl-7.44.0
index daee8729e74a..600da0dc7c7e 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.44.0
+++ b/metadata/md5-cache/dev-python/pycurl-7.44.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.44.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a47c2f96cb316fe0e5a0efc924e2a4e6
diff --git a/metadata/md5-cache/dev-python/pycurl-7.44.1 b/metadata/md5-cache/dev-python/pycurl-7.44.1
index 2471267634e6..43e48e011f71 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.44.1
+++ b/metadata/md5-cache/dev-python/pycurl-7.44.1
@@ -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/p/pycurl/pycurl-7.44.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0604f6a7278a5e7b8d103abf57a5834
diff --git a/metadata/md5-cache/dev-python/pycurl-requests-0.2.0 b/metadata/md5-cache/dev-python/pycurl-requests-0.2.0
index 2baa3a752d9f..ea2ee01ec76a 100644
--- a/metadata/md5-cache/dev-python/pycurl-requests-0.2.0
+++ b/metadata/md5-cache/dev-python/pycurl-requests-0.2.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/dcoles/pycurl-requests/archive/refs/tags/v0.2.0.tar.gz -> pycurl-requests-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d6e0bd0bd8d88ac61fc03e2cb7884ae
diff --git a/metadata/md5-cache/dev-python/pycurl-requests-0.2.1 b/metadata/md5-cache/dev-python/pycurl-requests-0.2.1
index 2866d43b5699..04ed65550597 100644
--- a/metadata/md5-cache/dev-python/pycurl-requests-0.2.1
+++ b/metadata/md5-cache/dev-python/pycurl-requests-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dcoles/pycurl-requests/archive/refs/tags/v0.2.1.tar.gz -> pycurl-requests-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c0d4b5459b906a0d2dd92827b90c177
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.5 b/metadata/md5-cache/dev-python/pycxx-7.1.5
index b1fb7e424368..315dca614a30 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.5
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7740deed2915b5a85e8251e32b68e0aa
diff --git a/metadata/md5-cache/dev-python/pydantic-1.8.2 b/metadata/md5-cache/dev-python/pydantic-1.8.2
index ceafa7dbaf65..2c1b4d77328f 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.8.2
+++ b/metadata/md5-cache/dev-python/pydantic-1.8.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/samuelcolvin/pydantic/archive/v1.8.2.tar.gz -> pydantic-1.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=293c09d239f354fab0451cb9d59d52a0
diff --git a/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719 b/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
index 0ae7301f4314..7270cb72452e 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
+++ b/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
@@ -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/samuelcolvin/pydantic/archive/0c26c1c4e288e0d41d2c3890d5b3befa7579455c.tar.gz -> pydantic-1.8.2_p20210719.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4d749b8f02524e407690a0c889070b1
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
index b13733b0984f..e5c9eda62590 100644
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.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/pydata/pydata-sphinx-theme/archive/v0.6.3.tar.gz -> pydata-sphinx-theme-0.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63a688ffffad78fb96b2d6e1db1e8202
diff --git a/metadata/md5-cache/dev-python/pydbus-0.6.0 b/metadata/md5-cache/dev-python/pydbus-0.6.0
index 3feec78df358..915fbf57c9e7 100644
--- a/metadata/md5-cache/dev-python/pydbus-0.6.0
+++ b/metadata/md5-cache/dev-python/pydbus-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/LEW21/pydbus/archive/v0.6.0.tar.gz -> pydbus-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18662b5a2d59aebb838b5ebcc73980f4
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3-r1 b/metadata/md5-cache/dev-python/pydecomp-0.3-r1
index 68975610459f..494f07cbcfd7 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.3-r1
+++ b/metadata/md5-cache/dev-python/pydecomp-0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9866ba8929c69976864a89415d7ce597
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index d18638709fa3..a8cfcca560c3 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -9,5 +9,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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d4156cf995264911800ed68b95a28ca
diff --git a/metadata/md5-cache/dev-python/pydevd-2.5.0-r1 b/metadata/md5-cache/dev-python/pydevd-2.5.0-r1
index 0542b214df81..ce8e978f23b1 100644
--- a/metadata/md5-cache/dev-python/pydevd-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/pydevd-2.5.0-r1
@@ -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/fabioz/PyDev.Debugger/archive/refs/tags/pydev_debugger_2_5_0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b28a641da7bd283a37a6399fece0654
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.1.2 b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
index 8e2373fe4eee..5dc3dbd40d7c 100644
--- a/metadata/md5-cache/dev-python/pydispatcher-2.1.2
+++ b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPyDispatcher/PyPyDispatcher-2.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f313260c5167d4d4da3454f85f30846a
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.1.1 b/metadata/md5-cache/dev-python/pydocstyle-6.1.1
index 35c7aafef417..1d14052d804e 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-6.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.1.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/PyCQA/pydocstyle/archive/6.1.1.tar.gz -> pydocstyle-6.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d5477ca5ce4d29f8e635c5a91100a85
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.2 b/metadata/md5-cache/dev-python/pydot-1.4.2
index 8e5a7910574f..cc8043de231d 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.2
+++ b/metadata/md5-cache/dev-python/pydot-1.4.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/pydot/pydot/archive/v1.4.2.tar.gz -> pydot-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74b961e4a2d3a6728efb7b5cdced7946
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
index fbc4eee9c901..27d9b9a2be51 100644
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ b/metadata/md5-cache/dev-python/pydotplus-2.0.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/pydotplus/pydotplus-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=010392e3a4088ffe9c74f53c4b511174
diff --git a/metadata/md5-cache/dev-python/pydyf-0.0.3 b/metadata/md5-cache/dev-python/pydyf-0.0.3
index 087edf95ba17..9bd7c62776e4 100644
--- a/metadata/md5-cache/dev-python/pydyf-0.0.3
+++ b/metadata/md5-cache/dev-python/pydyf-0.0.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/CourtBouillon/pydyf/archive/v0.0.3.tar.gz -> pydyf-0.0.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.0 b/metadata/md5-cache/dev-python/pydyf-0.1.0
index b5d457f5eda0..cb011670601d 100644
--- a/metadata/md5-cache/dev-python/pydyf-0.1.0
+++ b/metadata/md5-cache/dev-python/pydyf-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.0.tar.gz -> pydyf-0.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.1 b/metadata/md5-cache/dev-python/pydyf-0.1.1
index 2639c504e4e1..00d46c2a653b 100644
--- a/metadata/md5-cache/dev-python/pydyf-0.1.1
+++ b/metadata/md5-cache/dev-python/pydyf-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.1.tar.gz -> pydyf-0.1.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.27 b/metadata/md5-cache/dev-python/pyelftools-0.27
index 3cb4a2eb606a..5d51dbc29dcb 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.27
+++ b/metadata/md5-cache/dev-python/pyelftools-0.27
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/eliben/pyelftools/archive/v0.27.tar.gz -> pyelftools-0.27.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=764820b1786091c2b7bad404f7170b03
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.2.1 b/metadata/md5-cache/dev-python/pyenchant-3.2.1
index 691d3c722530..5b63f8316d99 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.2.1
+++ b/metadata/md5-cache/dev-python/pyenchant-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/pyenchant/pyenchant/archive/v3.2.1.tar.gz -> pyenchant-3.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f2f80b88021233dc8af2cdc408a4828
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.5.0 b/metadata/md5-cache/dev-python/pyfakefs-4.5.0
index 2fdfe3dcd239..0135de588f34 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.5.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.5.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/jmcgeheeiv/pyfakefs/archive/v4.5.0.tar.gz -> pyfakefs-4.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=649290d2798041447b663cec193255a7
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.5.1 b/metadata/md5-cache/dev-python/pyfakefs-4.5.1
index 3c0b2c5d1cae..ddec77ed926a 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.5.1
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.5.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/jmcgeheeiv/pyfakefs/archive/v4.5.1.tar.gz -> pyfakefs-4.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=360f86bef62ac51df2602ffe87358015
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
index ba84be723964..f1756bca424e 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyx-0.15[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e3a71e2825f56879782b42df4a8105c
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.2.0 b/metadata/md5-cache/dev-python/pyflakes-2.2.0
index dfc4a821b617..ac3c77101b77 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.2.0
+++ b/metadata/md5-cache/dev-python/pyflakes-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab4ffca6102d8301261f4d677ef7604f
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.3.1 b/metadata/md5-cache/dev-python/pyflakes-2.3.1
index a9215eb3714d..1853d0e5af14 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.3.1
+++ b/metadata/md5-cache/dev-python/pyflakes-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee63f453c5473be5c97aa26ebfcd5595
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4-r1 b/metadata/md5-cache/dev-python/pyformance-0.4-r1
index dc51ff55922c..69cd60aa77d8 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.4-r1
+++ b/metadata/md5-cache/dev-python/pyformance-0.4-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/p/pyformance/pyformance-0.4.tar.gz https://dev.gentoo.org/~chutzpah/dist/python/pyformance-0.4-patches.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=169bdc5336822561284158da62b8a315
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
index 54bf5f81010c..30f69098fc8b 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-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/p/pyftpdlib/pyftpdlib-1.5.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19b31c35ceb0beee8ed1f117e24d18cf
diff --git a/metadata/md5-cache/dev-python/pygal-2.4.0-r2 b/metadata/md5-cache/dev-python/pygal-2.4.0-r2
index 2ba44c1c0a74..26992d91da07 100644
--- a/metadata/md5-cache/dev-python/pygal-2.4.0-r2
+++ b/metadata/md5-cache/dev-python/pygal-2.4.0-r2
@@ -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/Kozea/pygal/archive/2.4.0.tar.gz -> pygal-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d25aa6fab0f6ff3f28a4de41988ba12
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.6-r1 b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
index 21649f7dcabe..16860eafae39 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.6-r1
+++ b/metadata/md5-cache/dev-python/pygame-1.9.6-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/pygame/pygame-1.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e196f1ce8776c08b636c4efbd48d7ad0
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.0 b/metadata/md5-cache/dev-python/pygame-2.0.0
index afb25089c425..bc1d7f12159f 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.0
+++ b/metadata/md5-cache/dev-python/pygame-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.0/pygame-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c775d19174dcc409e3036c6ecc709de
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10 b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
index 67419ae222da..403fa8d6c5b3 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
+++ b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.0.dev10/pygame-2.0.0.dev10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=946776462bdf85303677c6ea11aec426
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.1-r1 b/metadata/md5-cache/dev-python/pygame-2.0.1-r1
index e9f08ba4406e..17223495a3a5 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pygame-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.1/pygame-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d41cc66a6ddd2245dbc225ed00b9499
diff --git a/metadata/md5-cache/dev-python/pygame-9999 b/metadata/md5-cache/dev-python/pygame-9999
index ec4f558c93b6..59b9173de25a 100644
--- a/metadata/md5-cache/dev-python/pygame-9999
+++ b/metadata/md5-cache/dev-python/pygame-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54ce2597da91fdab28fda8dbc83a7c1e
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
index 6e72c5f0992f..a4e114d4a8d5 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d2bafd95637e7b1e6f75ce1ef9c3d28
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
index c4a069ceaf57..de8e6553d9c2 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56c8f16aa2c737661fe0334e81aa6fef
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
index 8a2074efd184..2338daed33f2 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79925b8218cb2081a96c2e348d852237
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.22 b/metadata/md5-cache/dev-python/pyghmi-1.5.22
index 4e6b86790b68..262ec55ed55f 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.22
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.22.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a117f6442d7e5806b379bab75bf7c575
diff --git a/metadata/md5-cache/dev-python/pygit2-1.6.1-r1 b/metadata/md5-cache/dev-python/pygit2-1.6.1-r1
index 1aee5fba2b84..b6f9e4fd420c 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pygit2-1.6.1-r1
@@ -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/p/pygit2/pygit2-1.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a39c0f9a331518b01557204c4201da4
diff --git a/metadata/md5-cache/dev-python/pygit2-1.6.1-r2 b/metadata/md5-cache/dev-python/pygit2-1.6.1-r2
new file mode 100644
index 000000000000..3d9b33e8fd4b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-1.6.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( =dev-libs/libgit2-1.2*:= dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-1.2*:= dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for libgit2
+EAPI=8
+HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-1.2*:= dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pygit2/pygit2-1.6.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fcbc12f2fef5171a852037b09c8bb852
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.19 b/metadata/md5-cache/dev-python/pyglet-1.5.19
index 26b43b86eae4..b9cdacd0ffca 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.19
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.19.tar.gz -> pyglet-1.5.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d143f8766b1bfd8c26eee5835ce55112
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.21 b/metadata/md5-cache/dev-python/pyglet-1.5.21
index 46bf3e444f7e..d4833766d515 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.21
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.21.tar.gz -> pyglet-1.5.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=010a2be2d65a8d7c1da3abe1e18d4b59
diff --git a/metadata/md5-cache/dev-python/pygments-2.10.0 b/metadata/md5-cache/dev-python/pygments-2.10.0
index 6bb91a7e733e..998772a04cec 100644
--- a/metadata/md5-cache/dev-python/pygments-2.10.0
+++ b/metadata/md5-cache/dev-python/pygments-2.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.10.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58c49fe3866cc66462d9c98b18ea50f8
diff --git a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5 b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
index e468d043ec57..3193a85228a8 100644
--- a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
+++ b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/liluo/pygments-github-lexers/archive/v0.0.5.tar.gz -> pygments-github-lexers-0.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=846be388af159c23c14ede0a6b276c91
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r3 b/metadata/md5-cache/dev-python/pygpgme-0.3-r3
index 0a05533d19a3..30c5acb6bffd 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r3
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r3
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme python_targets_python3_8? ( dev-lang/python:3.8 ) python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e62aa1ab8f8cc9cbc111d076db7a80bd
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.7 b/metadata/md5-cache/dev-python/pygraphviz-1.7
index bdccdf285405..00dadb088720 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.7
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.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/p/pygraphviz/pygraphviz-1.7.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2f55453d1cb716d653e948811b60270
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2.2 b/metadata/md5-cache/dev-python/pygresql-5.2.2
index bcbdbd072571..2244120c231a 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.2.2
+++ b/metadata/md5-cache/dev-python/pygresql-5.2.2
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	postgres	c90f34fec636bb31d36838ad7e11b37b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	postgres	3ff7ea72ed39efa38ebaead171fd5da4	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=5ae9f9ec6588f17152cf6f4be031b09a
diff --git a/metadata/md5-cache/dev-python/pyh2o-1 b/metadata/md5-cache/dev-python/pyh2o-1
index e4f0b7f9dbd8..3744439361c5 100644
--- a/metadata/md5-cache/dev-python/pyh2o-1
+++ b/metadata/md5-cache/dev-python/pyh2o-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/mgorny/pyh2o/archive/v1.tar.gz -> pyh2o-1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16c168b3baad37a2974596c5db20a3da
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
index 36d5986da710..2b26398132ce 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+++ b/metadata/md5-cache/dev-python/pyhamcrest-2.0.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/hamcrest/PyHamcrest/archive/V2.0.2.tar.gz -> PyHamcrest-2.0.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1a99a70b83d5eac4b148ca75f9f3266
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.4.4 b/metadata/md5-cache/dev-python/pyhcl-0.4.4
index 011e07faac58..b99961a1ee9f 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.4.4
+++ b/metadata/md5-cache/dev-python/pyhcl-0.4.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/virtuald/pyhcl/archive/0.4.4.tar.gz -> pyhcl-0.4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48b04ba8485fee4a8a8c01edba45f337
diff --git a/metadata/md5-cache/dev-python/pyicu-2.7.4 b/metadata/md5-cache/dev-python/pyicu-2.7.4
index d2a99bb92197..0eaf4493125d 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.7.4
+++ b/metadata/md5-cache/dev-python/pyicu-2.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.7.4/pyicu-v2.7.4.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fced37794efed501d1d869dce92f2f9d
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 2abf548da596..6fe19cb38877 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=850bf0d0387d62129e88416694edff7c
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 8d1e39121a99..96c921f0f68a 100644
--- a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
+++ b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
@@ -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/PiotrDabkowski/pyjsparser/archive/5465d037b30e334cb0997f2315ec1e451b8ad4c1.tar.gz -> pyjsparser-2.7.1_p20190421.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a8a3f6361e00dd641b0a0476857031
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 e4efe09ab61e..0b9804ffea69 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 ab8a658a4549..c754fa746483 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=617b3f5e44c8f7322f6044891127de26
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.1 b/metadata/md5-cache/dev-python/pykerberos-1.3.1
index 9705543a7bcb..f6d49fe66c93 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.1
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f7b0b0bcb40c83579fa9f309e32cf328
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.2 b/metadata/md5-cache/dev-python/pykka-2.0.2
index 705017f63bf5..c8a6cc6dd19a 100644
--- a/metadata/md5-cache/dev-python/pykka-2.0.2
+++ b/metadata/md5-cache/dev-python/pykka-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a742b536b07b63846fc2997c30e41c21
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.3 b/metadata/md5-cache/dev-python/pykka-2.0.3
index f51cbe515605..b071dfc0cbca 100644
--- a/metadata/md5-cache/dev-python/pykka-2.0.3
+++ b/metadata/md5-cache/dev-python/pykka-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=278b2efddc968b38cd8a5c261a5eca69
diff --git a/metadata/md5-cache/dev-python/pykka-3.0.1 b/metadata/md5-cache/dev-python/pykka-3.0.1
index 60adbb05a08b..6f36a967344c 100644
--- a/metadata/md5-cache/dev-python/pykka-3.0.1
+++ b/metadata/md5-cache/dev-python/pykka-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jodal/pykka/archive/v3.0.1.tar.gz -> pykka-3.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2343551a042b8a31fab0c893aa019ae0
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.8.0-r1 b/metadata/md5-cache/dev-python/pykwalify-1.8.0-r1
index e7c91af8580b..8f383470936b 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.8.0-r1
+++ b/metadata/md5-cache/dev-python/pykwalify-1.8.0-r1
@@ -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/p/pykwalify/pykwalify-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed926dcd5f71a812c79a2795ff0ff199
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
index 42c766cc4c8b..11bd5a4b25eb 100644
--- a/metadata/md5-cache/dev-python/pylama-7.7.1-r1
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -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/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a302d02cf937c694b8fb6cfbf7c5e94
diff --git a/metadata/md5-cache/dev-python/pylast-4.2.1 b/metadata/md5-cache/dev-python/pylast-4.2.1
index 7343849268ec..a9758dab67df 100644
--- a/metadata/md5-cache/dev-python/pylast-4.2.1
+++ b/metadata/md5-cache/dev-python/pylast-4.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/pylast/pylast/archive/4.2.1.tar.gz -> pylast-4.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59eb184d4556f6f26bd8e39e0454622d
diff --git a/metadata/md5-cache/dev-python/pylatex-1.4.1 b/metadata/md5-cache/dev-python/pylatex-1.4.1
index e6641d1aaff6..adfcaf90349d 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78fdc6df533dc071bc8cab9b0069971d
diff --git a/metadata/md5-cache/dev-python/pylev-1.4.0 b/metadata/md5-cache/dev-python/pylev-1.4.0
index a98679f516f3..b7ec07a83b13 100644
--- a/metadata/md5-cache/dev-python/pylev-1.4.0
+++ b/metadata/md5-cache/dev-python/pylev-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toastdriven/pylev/archive/v1.4.0.tar.gz -> pylev-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e06846093331fd6207fa65e1b0216714
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.6.0 b/metadata/md5-cache/dev-python/pylibacl-0.6.0
index b1024f69a9ee..6fbf3d76cfd1 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.6.0
+++ b/metadata/md5-cache/dev-python/pylibacl-0.6.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/iustin/pylibacl/archive/v0.6.0.tar.gz -> pylibacl-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a4b2a21f661d5a8a2f0f5bd510aa443
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
index 32e3ec2e4b6a..8c2bfebaed5c 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
@@ -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/lericson/pylibmc/archive/1.6.1.tar.gz -> pylibmc-1.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1389584addd74f650931eb62faea2762
diff --git a/metadata/md5-cache/dev-python/pylint-2.10.2 b/metadata/md5-cache/dev-python/pylint-2.10.2
index c6e93bc82e1c..177e27103fff 100644
--- a/metadata/md5-cache/dev-python/pylint-2.10.2
+++ b/metadata/md5-cache/dev-python/pylint-2.10.2
@@ -4,12 +4,12 @@ DESCRIPTION=Python code static checker
 EAPI=8
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astroid-2.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.10.2.tar.gz -> pylint-2.10.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=09a5f22e3b50b190d63e70f9b85a5260
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ada27a68d56a1ac05ea71bb265509c96
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.6 b/metadata/md5-cache/dev-python/pylint-2.9.6
index b6a318cdeb91..6fd10665f2c0 100644
--- a/metadata/md5-cache/dev-python/pylint-2.9.6
+++ b/metadata/md5-cache/dev-python/pylint-2.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.6.tar.gz -> pylint-2.9.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cd7044609930c524f03bde0efec4bfa
diff --git a/metadata/md5-cache/dev-python/pylru-1.2.0 b/metadata/md5-cache/dev-python/pylru-1.2.0
index def84aae54d7..f5e574213125 100644
--- a/metadata/md5-cache/dev-python/pylru-1.2.0
+++ b/metadata/md5-cache/dev-python/pylru-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylru/pylru-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6dcd8f0a0d5be0172cccd1a6da396717
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1 b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
index 8a56bba3095a..4a2941fcd542 100644
--- a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-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/spyder-ide/pyls-spyder/archive/v0.4.0.tar.gz -> pyls-spyder-0.4.0-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72803e4e7606afabfa935f05d2869cc1
diff --git a/metadata/md5-cache/dev-python/pymad-0.10 b/metadata/md5-cache/dev-python/pymad-0.10
index 905c9cc1fb78..79ddeb65964c 100644
--- a/metadata/md5-cache/dev-python/pymad-0.10
+++ b/metadata/md5-cache/dev-python/pymad-0.10
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmad python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jaqx0r/pymad/archive/version/0.10.tar.gz -> pymad-0.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69bc67b5534512e94cd3c925d3e89a71
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-8.2 b/metadata/md5-cache/dev-python/pymdown-extensions-8.2
index 6618cc8e13e5..6bd22690ff90 100644
--- a/metadata/md5-cache/dev-python/pymdown-extensions-8.2
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-8.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/facelessuser/pymdown-extensions/archive/8.2.tar.gz -> pymdown-extensions-8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=799b5eb02f8b6f4d4bb8ed8d057657ca
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.0 b/metadata/md5-cache/dev-python/pymdown-extensions-9.0
new file mode 100644
index 000000000000..c1f6636c3f0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pygments[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-vcs/git ) test? ( >=dev-python/markdown-3.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(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extensions for Python Markdown
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.0.tar.gz -> pymdown-extensions-9.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=91bfae48aa91c23738bb268eef668013
diff --git a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308 b/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
index 068fab025ebd..2af53aaab477 100644
--- a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
+++ b/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygments-2.0.1[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pymdown-lexers/archive/84dc78c7692720bd614209124c3e8af65678532a.tar.gz -> pymdown-lexers-0_pre20210308.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9592140eb8052316bc2c0e6363551338
diff --git a/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1 b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
index 3009e4e9028f..989d74441a16 100644
--- a/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/pymdstat/archive/v0.4.2.tar.gz -> pymdstat-0.4.2-r1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6d56dbd0982fe62e2124aaf6491a8ee
diff --git a/metadata/md5-cache/dev-python/pymediainfo-5.1.0 b/metadata/md5-cache/dev-python/pymediainfo-5.1.0
index 637a02a91369..b7b448fd3190 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-5.1.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-5.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=mirror://pypi/p/pymediainfo/pymediainfo-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1645ee344eff8a25f4beb1bff6362c60
diff --git a/metadata/md5-cache/dev-python/pymetar-1.3 b/metadata/md5-cache/dev-python/pymetar-1.3
index e70cabe5121e..587eddeaf6ab 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.3
+++ b/metadata/md5-cache/dev-python/pymetar-1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aadde7ef1a2b267d0f055031ff4c4749
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
index ed62a10eb523..4a7e5c477b1c 100644
--- a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10e4dad7f1a3494e46ac0515bdc623ac
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.4 b/metadata/md5-cache/dev-python/pymongo-3.11.4
index c2cec2e6f425..5bca607b2803 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	bfb51de63b0462097e40436214dd43c8	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d9498196e5cd399ab03a430abcebfd0
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.3 b/metadata/md5-cache/dev-python/pymountboot-0.2.3
index be91724efff3..9b3072d829bd 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.3
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python3_8? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pymountboot/archive/v0.2.3.tar.gz -> pymountboot-0.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3516e8b6616ff9b1e08b5f92a24cedb5
diff --git a/metadata/md5-cache/dev-python/pymountboot-9999 b/metadata/md5-cache/dev-python/pymountboot-9999
index ba6d82e74bc9..12857fc665da 100644
--- a/metadata/md5-cache/dev-python/pymountboot-9999
+++ b/metadata/md5-cache/dev-python/pymountboot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e8f6af067ae6a36f4ff9c93190eaea1
diff --git a/metadata/md5-cache/dev-python/pymssql-2.2.1 b/metadata/md5-cache/dev-python/pymssql-2.2.1
index 30cdbf84f031..14b9fac6c003 100644
--- a/metadata/md5-cache/dev-python/pymssql-2.2.1
+++ b/metadata/md5-cache/dev-python/pymssql-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymssql/pymssql-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49cef1dbfcaac3341f1b14ad87d5ba9f
diff --git a/metadata/md5-cache/dev-python/pymysql-1.0.2 b/metadata/md5-cache/dev-python/pymysql-1.0.2
index 0298cb288736..eb4be845080e 100644
--- a/metadata/md5-cache/dev-python/pymysql-1.0.2
+++ b/metadata/md5-cache/dev-python/pymysql-1.0.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/PyMySQL/PyMySQL/archive/v1.0.2.tar.gz -> pymysql-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=372d3f4a761a68d4802a2a4ebdaf03e3
diff --git a/metadata/md5-cache/dev-python/pynacl-1.4.0 b/metadata/md5-cache/dev-python/pynacl-1.4.0
index b178d2a31f24..f3b184424353 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.4.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.4.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/pyca/pynacl/archive/1.4.0.tar.gz -> pynacl-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6dfbe0eb28e99027b413aee09a76a34
diff --git a/metadata/md5-cache/dev-python/pynput-1.6.8 b/metadata/md5-cache/dev-python/pynput-1.6.8
index b4eba472dc88..54a8c8c7b45f 100644
--- a/metadata/md5-cache/dev-python/pynput-1.6.8
+++ b/metadata/md5-cache/dev-python/pynput-1.6.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[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/moses-palmer/pynput/archive/v1.6.8.tar.gz -> pynput-1.6.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=949e05408cdafdbdcc2d7f9ceb46edac
diff --git a/metadata/md5-cache/dev-python/pynput-9999 b/metadata/md5-cache/dev-python/pynput-9999
index e4971f844f28..a2e5268549aa 100644
--- a/metadata/md5-cache/dev-python/pynput-9999
+++ b/metadata/md5-cache/dev-python/pynput-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-xlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=949e05408cdafdbdcc2d7f9ceb46edac
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.3 b/metadata/md5-cache/dev-python/pynvim-0.4.3
index 6cf1447eb0fb..aed592a8599a 100644
--- a/metadata/md5-cache/dev-python/pynvim-0.4.3
+++ b/metadata/md5-cache/dev-python/pynvim-0.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=https://github.com/neovim/pynvim/archive/0.4.3.tar.gz -> pynvim-0.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9906a6c531851f8c73150b6fc6dc9ffd
diff --git a/metadata/md5-cache/dev-python/pyocr-0.7.2 b/metadata/md5-cache/dev-python/pyocr-0.7.2
index 4ad01fa530f2..361869b0dcf6 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyocr-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-
 REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4f60e7164f591f67b55d7d6c685d8e4
diff --git a/metadata/md5-cache/dev-python/pyocr-0.8 b/metadata/md5-cache/dev-python/pyocr-0.8
index c7e5643647d9..46a0bdf69808 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.8
+++ b/metadata/md5-cache/dev-python/pyocr-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_8 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b18eb6659f556bebf2f768a37b37be8
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.2.6 b/metadata/md5-cache/dev-python/pyopencl-2021.2.6
index 07f28afe2350..ba6f98548623 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2021.2.6
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5f882e7a61beeade70eaee6951f7a78
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.5 b/metadata/md5-cache/dev-python/pyopengl-3.1.5
index 149ec813b539..ec6cd12889cf 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.5
@@ -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/P/PyOpenGL/PyOpenGL-3.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=ca5ec6c44c14ce4a0b19aa8ef6a7c0dc
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
index ace45908c138..2f5c40e9f61e 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mcfletch/pyopengl/archive/02d11dad9ff18e50db10e975c4756e17bf198464.tar.gz -> pyopengl-3.1.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=52b7e44507b99d45caa14ed91245e871
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.1 b/metadata/md5-cache/dev-python/pyopenssl-20.0.1
index f45989a8d6be..b64b6c8d9e01 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.1
+++ b/metadata/md5-cache/dev-python/pyopenssl-20.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1fbc85df5375390ba3737404e9e4bc9
diff --git a/metadata/md5-cache/dev-python/pyotp-2.6.0 b/metadata/md5-cache/dev-python/pyotp-2.6.0
index ae264d576581..d9424df2c275 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.6.0
+++ b/metadata/md5-cache/dev-python/pyotp-2.6.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/pyotp/pyotp-2.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ff91935258ef5f9e2747a4cb5444461
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r6 b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
index 8546dab9993e..0d8bcb3c2b78 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r6
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/pam-0.64 python_targets_python3_8? ( dev-lang/python:3.8 ) py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz https://distfiles.gentoo.org/distfiles/ad/PyPAM-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=724b621daeb6ffda391cc4eaa284ba0f
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1 b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
index 0cce50239dce..f07d6df1d287 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67cb2de9c515b47641b72f8912880946
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=edd5f9684676bfc26e55b7f2e0147542
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.7 b/metadata/md5-cache/dev-python/pyparted-3.11.7
index c77f4887e353..3e0c527da174 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.7
@@ -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/dcantrell/pyparted/archive/v3.11.7.tar.gz -> pyparted-3.11.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c33c9eb618f8cfb04a3220ca8ff3c0a7
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.5 b/metadata/md5-cache/dev-python/pypax-0.9.5
index 894ebcb4ee85..a1ef9581f240 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.5
+++ b/metadata/md5-cache/dev-python/pypax-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_pyt
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=66b402ab266b8b7fa0d98a02518f4528
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
index 056015918f2a..12804d27d1be 100644
--- a/metadata/md5-cache/dev-python/pypax-9999
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_8? ( dev-lang/python: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=|| ( ptpax xtpax ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ab4ab61e2dc2eac88b5c037a6eab0e39
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.3-r1 b/metadata/md5-cache/dev-python/pypcap-1.2.3-r1
index c886e87f9600..f171b88c736a 100644
--- a/metadata/md5-cache/dev-python/pypcap-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/pypcap-1.2.3-r1
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libpcap python_targets_python3_8? ( dev-lang/python:3.8 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pynetwork/pypcap/archive/v1.2.3.tar.gz -> pypcap-1.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b580500860e46177c723af523d2b876
diff --git a/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1 b/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
index 848c0ab92811..e67053b7ec92 100644
--- a/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
+++ b/metadata/md5-cache/dev-python/pypeg2-2.15.2-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/pyPEG2/pyPEG2-2.15.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba1782f91de6c0a5c77f0b764b189431
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.8.2 b/metadata/md5-cache/dev-python/pyperclip-1.8.2
index b6dc35bc8b91..03919f1629c1 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.8.2
+++ b/metadata/md5-cache/dev-python/pyperclip-1.8.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/pyperclip/pyperclip-1.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6c63c63706fd9f927c499cf0a14160e5
diff --git a/metadata/md5-cache/dev-python/pyphen-0.11.0-r1 b/metadata/md5-cache/dev-python/pyphen-0.11.0-r1
index 7d52c4c108d9..e7b8ac647d08 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/pyphen-0.11.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=https://github.com/Kozea/Pyphen/archive/0.11.0.tar.gz -> Pyphen-0.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=702ee4c7b79a9a0c6abf7c6316643777
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.4.2 b/metadata/md5-cache/dev-python/pypiserver-1.4.2
index bfab89590c9d..c79d22b191c7 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.4.2
+++ b/metadata/md5-cache/dev-python/pypiserver-1.4.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/pypiserver/pypiserver/archive/v1.4.2.tar.gz -> pypiserver-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fbb7247d1e2593932e1b9500ccc1e36
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.20 b/metadata/md5-cache/dev-python/pypng-0.0.20
index 7246d55b49a1..a4f8fc21d7e0 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.20
+++ b/metadata/md5-cache/dev-python/pypng-0.0.20
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypng/pypng-0.0.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=110cfc9c8640b815735a96cd7d19309c
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.21 b/metadata/md5-cache/dev-python/pypng-0.0.21
index 5219b0515eb0..ec88da4e56ed 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.21
+++ b/metadata/md5-cache/dev-python/pypng-0.0.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/drj11/pypng/archive/pypng-0.0.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=251b54bc19aa32851bd53573797b9dff
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
index e28e0aad8009..6a3deebe8320 100644
--- a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
+++ b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pwaller/pyprof2calltree/archive/v1.4.5.tar.gz -> pyprof2calltree-1.4.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26e0a0181a6b85c1762f99511fe87ce0
diff --git a/metadata/md5-cache/dev-python/pyproj-3.0.1 b/metadata/md5-cache/dev-python/pyproj-3.0.1
index 4f0f1871a1c5..4197349c456a 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.0.1
+++ b/metadata/md5-cache/dev-python/pyproj-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7386ef790fb04afafbb37073e4d670a7
diff --git a/metadata/md5-cache/dev-python/pyproj-3.1.0 b/metadata/md5-cache/dev-python/pyproj-3.1.0
index 7dec1bc8df2d..6313e7ad6782 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.1.0
+++ b/metadata/md5-cache/dev-python/pyproj-3.1.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/pyproj/pyproj-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d2b2b095e0e6bc2f7f36bc93fa11a06
diff --git a/metadata/md5-cache/dev-python/pyproj-3.2.0 b/metadata/md5-cache/dev-python/pyproj-3.2.0
index 092dbb82966f..788cc77e4897 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.2.0
+++ b/metadata/md5-cache/dev-python/pyproj-3.2.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/pyproj/pyproj-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c61f275c5c48d67fd7301327e75aff14
diff --git a/metadata/md5-cache/dev-python/pyproj-3.2.1 b/metadata/md5-cache/dev-python/pyproj-3.2.1
index 784f5f74d667..8183d19e0722 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.2.1
+++ b/metadata/md5-cache/dev-python/pyproj-3.2.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/pyproj/pyproj-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75bd5d810345f20fcc66ae1144df35b5
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-18 b/metadata/md5-cache/dev-python/pyproject2setuppy-18
index 00af20545f36..4a55e70c808a 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-18
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-18
@@ -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/mgorny/pyproject2setuppy/archive/v18.tar.gz -> pyproject2setuppy-18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ebc3bed0c37c36db53f4017e220dd241
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-19 b/metadata/md5-cache/dev-python/pyproject2setuppy-19
index 64e8f3e05269..ad3978542774 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-19
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-19
@@ -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/mgorny/pyproject2setuppy/archive/v19.tar.gz -> pyproject2setuppy-19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8669eb7d34e6d810c2f6cc180f2f758
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-20 b/metadata/md5-cache/dev-python/pyproject2setuppy-20
index 465e8e79d9f3..2ef989360531 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-20
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-20
@@ -4,12 +4,12 @@ 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 ~m68k 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=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/v20.tar.gz -> pyproject2setuppy-20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d09e44e1d098a9feb9a1cc7144a6d16
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6dade3a12a5d0de10452bb26310d66aa
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.5 b/metadata/md5-cache/dev-python/pypugjs-5.9.5
index 08371023eb60..9f3bc9d173b9 100644
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.5
+++ b/metadata/md5-cache/dev-python/pypugjs-5.9.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet python_t
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.5.tar.gz -> pypugjs-5.9.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a520f99cc9a94714d0b2495fcf03d89c
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.8 b/metadata/md5-cache/dev-python/pypugjs-5.9.8
index db0d96ec8a66..9346472cbfe5 100644
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.8
+++ b/metadata/md5-cache/dev-python/pypugjs-5.9.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet python_t
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.8.tar.gz -> pypugjs-5.9.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a520f99cc9a94714d0b2495fcf03d89c
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.9 b/metadata/md5-cache/dev-python/pypugjs-5.9.9
index 0b8a02b9f066..a051fa306e00 100644
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.9
+++ b/metadata/md5-cache/dev-python/pypugjs-5.9.9
@@ -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/kakulukia/pypugjs/archive/v5.9.9.tar.gz -> pypugjs-5.9.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=995049934695ce4c124b42335e7ec676
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
index 65380af087c0..fb774b520ee7 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
@@ -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/mnooner256/pyqrcode/archive/674a77b5eaf850d063f518bd90c243ee34ad6b5d.tar.gz -> pyqrcode-1.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2dfd14ffc91ad61e6ac4e8764bf7203
diff --git a/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3 b/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
index 6d0afe7f0b1f..fc0f71756525 100644
--- a/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
+++ b/metadata/md5-cache/dev-python/pyqt-distutils-0.7.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/ColinDuquesnoy/pyqt_distutils/archive/0.7.3.tar.gz -> pyqt-distutils-0.7.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36a258ad0a02b5b55485f826988c6f7d
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2 b/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
index a0df74a09b7d..ad9968870a77 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.12.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/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.12.2.tar.gz test? ( https://github.com/pyqtgraph/test-data/archive/test-data-8.tar.gz -> pyqtgraph-test-data-8.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e2ce0606f16949c4068e8419dee818b
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
index d7c92f7d0abd..b93f3ad27d65 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3dc478bcb8a55e07e3ed18345b72a065
diff --git a/metadata/md5-cache/dev-python/pyre2-1.0.7 b/metadata/md5-cache/dev-python/pyre2-1.0.7
index 1d16aea8c3db..df37549ec8ee 100644
--- a/metadata/md5-cache/dev-python/pyre2-1.0.7
+++ b/metadata/md5-cache/dev-python/pyre2-1.0.7
@@ -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/facebook/pyre2/archive/v1.0.7.tar.gz -> pyre2-1.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b560693b399ff9a25d94a2e1c5aa417
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1
index fae6c14173c0..ffdab5da1671 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.1
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.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/pyRFC3339/pyRFC3339-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bf3f823938d81784c3ab5ab8b22d0f4
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.14 b/metadata/md5-cache/dev-python/pyroute2-0.5.14
index 3d4bf8ffc592..6d34df695fd2 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.14
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test ) test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svinota/pyroute2/archive/0.5.14.tar.gz -> pyroute2-0.5.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9457ef677343e083d25b787abc8cbfb0
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.1 b/metadata/md5-cache/dev-python/pyrqlite-2.1
index c720ce5a2941..f78bc338d356 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.1
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.1.tar.gz -> pyrqlite-2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c551326af5ff62fca897f8c8b892e5a
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.18.0 b/metadata/md5-cache/dev-python/pyrsistent-0.18.0
index cd9981517f16..6b2d4892e565 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.18.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2d62195d5e9b2b9e01d5b56833981cc
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.1 b/metadata/md5-cache/dev-python/pyscard-2.0.1
index 6ac99bffd91f..110e474aa856 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.1
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d5705521d95a91bc280d3d9ccc2a9d2
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.2 b/metadata/md5-cache/dev-python/pyscard-2.0.2
index d865f914e812..a16f34083029 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.2
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82e89364435e0ae5591653a4de8aace8
diff --git a/metadata/md5-cache/dev-python/pyscreenshot-3.0 b/metadata/md5-cache/dev-python/pyscreenshot-3.0
index c981c70f8b72..95e3d4c01411 100644
--- a/metadata/md5-cache/dev-python/pyscreenshot-3.0
+++ b/metadata/md5-cache/dev-python/pyscreenshot-3.0
@@ -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/ponty/pyscreenshot/archive/3.0.tar.gz -> pyscreenshot-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=08c3bd5d67527abcb4978fd4e1c58713
diff --git a/metadata/md5-cache/dev-python/pyserial-3.5 b/metadata/md5-cache/dev-python/pyserial-3.5
index 6be74f56e673..eb03952e0021 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.5
+++ b/metadata/md5-cache/dev-python/pyserial-3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f882a6b58fe328b3db01920347f7e3b
diff --git a/metadata/md5-cache/dev-python/pysimdjson-4.0.2 b/metadata/md5-cache/dev-python/pysimdjson-4.0.2
index 8976f470476c..21df658a4d61 100644
--- a/metadata/md5-cache/dev-python/pysimdjson-4.0.2
+++ b/metadata/md5-cache/dev-python/pysimdjson-4.0.2
@@ -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/TkTech/pysimdjson/archive/v4.0.2.tar.gz -> pysimdjson-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=25391fbc23797f25695dc09b710af0ff
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.4 b/metadata/md5-cache/dev-python/pysmi-0.3.4
index ea431b9ee55a..5273cbd041da 100644
--- a/metadata/md5-cache/dev-python/pysmi-0.3.4
+++ b/metadata/md5-cache/dev-python/pysmi-0.3.4
@@ -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/pysmi/pysmi-0.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9267b07fcd1bb8d5aaaf109590fcf026
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1 b/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
index 01ceac9b502c..6e480e70c807 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.4.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=708c78b07eb6c702fd971f1bb2b8c780
diff --git a/metadata/md5-cache/dev-python/pysnmp-999999 b/metadata/md5-cache/dev-python/pysnmp-999999
index d7b8483cba74..4d8bc9e9ced5 100644
--- a/metadata/md5-cache/dev-python/pysnmp-999999
+++ b/metadata/md5-cache/dev-python/pysnmp-999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d24dfcf58bd4709f8c4a1f58b0d61c8
diff --git a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6 b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
index e6c7b2fd3a3f..377514cd457e 100644
--- a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
+++ b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp-mibs/pysnmp-mibs-0.1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=73a220204efd344447765bfc946aef00
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.10.2 b/metadata/md5-cache/dev-python/pysol_cards-0.10.2
index 8a75da7e5f78..d532631421d0 100644
--- a/metadata/md5-cache/dev-python/pysol_cards-0.10.2
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.10.2
@@ -11,5 +11,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e126e683b1f4c787cfbba0a5d14c96f9
diff --git a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0 b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
index 5ca19efc13fe..c98cf8e9222e 100644
--- a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
+++ b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/pyspectrum2/archive/v0.2.0.tar.gz -> pyspectrum2-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0b7fcef33d6d4b97f4baf5c38a9cbde
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.7.2 b/metadata/md5-cache/dev-python/pyspelling-2.7.2
index 1fb00ddca8c8..0c8d68c4895d 100644
--- a/metadata/md5-cache/dev-python/pyspelling-2.7.2
+++ b/metadata/md5-cache/dev-python/pyspelling-2.7.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/facelessuser/pyspelling/archive/2.7.2.tar.gz -> pyspelling-2.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bdc50ae443034c5280fb7a5121c7e67
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.7.3 b/metadata/md5-cache/dev-python/pyspelling-2.7.3
index f60c47210231..edae574b5a2a 100644
--- a/metadata/md5-cache/dev-python/pyspelling-2.7.3
+++ b/metadata/md5-cache/dev-python/pyspelling-2.7.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/facelessuser/pyspelling/archive/2.7.3.tar.gz -> pyspelling-2.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b391493b4767e08f3ed6a031ae07c38d
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.14-r2 b/metadata/md5-cache/dev-python/pyspf-2.0.14-r2
index 94622aa50081..9a398c8bb22f 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.14-r2
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.14-r2
@@ -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/pyspf/pyspf-2.0.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=649eabfcbf7b3edb8fbb943a5c4aa707
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.2 b/metadata/md5-cache/dev-python/pysrt-1.1.2
index bfd298a15b66..c99cf841f45b 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.2
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysrt/pysrt-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=617deb8c32a62f5d596c78ef0f1af108
diff --git a/metadata/md5-cache/dev-python/pysrt-9999 b/metadata/md5-cache/dev-python/pysrt-9999
index 8ee2c15070f4..9b91feec6388 100644
--- a/metadata/md5-cache/dev-python/pysrt-9999
+++ b/metadata/md5-cache/dev-python/pysrt-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_8(-)?
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=986a916241d71de2d9e8c8f0fb1b23fc
diff --git a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3 b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
index 3e1889b2ff27..930973e51135 100644
--- a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
+++ b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysvg-py3/pysvg-py3-0.2.2.post3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fae5e2b57a0353740b9fbcc000c2bd8f
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.13 b/metadata/md5-cache/dev-python/pysvn-1.9.13
index 988d0768075b..8ff4e9633649 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.13
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.13
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.13/pysvn-1.9.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7a48d2dae0bc834c508067b29e6a99a
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.15 b/metadata/md5-cache/dev-python/pysvn-1.9.15
index 7a731a517201..304a4e7f839a 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.15
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.15
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_pyt
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf97361501f9f82093f887593e5f47f5
diff --git a/metadata/md5-cache/dev-python/pytables-3.6.1 b/metadata/md5-cache/dev-python/pytables-3.6.1
index 80190a0e9238..9717d3065d05 100644
--- a/metadata/md5-cache/dev-python/pytables-3.6.1
+++ b/metadata/md5-cache/dev-python/pytables-3.6.1
@@ -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/t/tables/tables-3.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1d8b95b7b7e8c945f65cc64cb416b6d
diff --git a/metadata/md5-cache/dev-python/pytaglib-1.4.6 b/metadata/md5-cache/dev-python/pytaglib-1.4.6
index a6f078df9405..f5e39e32dded 100644
--- a/metadata/md5-cache/dev-python/pytaglib-1.4.6
+++ b/metadata/md5-cache/dev-python/pytaglib-1.4.6
@@ -11,5 +11,5 @@ RDEPEND=media-libs/taglib python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/supermihi/pytaglib/archive/v1.4.6.tar.gz -> pytaglib-1.4.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5e42b7faa1edc0465a7cc575c13c96c
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0-r1 b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
index afca7df19973..1ff6ec06397f 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.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=https://github.com/selectel/pyte/archive/0.8.0.tar.gz -> pyte-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08ba0bc7e7f87688d7cd54a6cdafe109
diff --git a/metadata/md5-cache/dev-python/pytest-5.4.3 b/metadata/md5-cache/dev-python/pytest-5.4.3
index e4139a0cebc8..30113badafb3 100644
--- a/metadata/md5-cache/dev-python/pytest-5.4.3
+++ b/metadata/md5-cache/dev-python/pytest-5.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/pytest/pytest-5.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d6fbdbf05f5398465eeda99c56179fa
diff --git a/metadata/md5-cache/dev-python/pytest-6.1.2 b/metadata/md5-cache/dev-python/pytest-6.1.2
index 3098ea39b7ba..0ddc8892eb1f 100644
--- a/metadata/md5-cache/dev-python/pytest-6.1.2
+++ b/metadata/md5-cache/dev-python/pytest-6.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=mirror://pypi/p/pytest/pytest-6.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ff6aa41507787563d0d5f7a8e907026
diff --git a/metadata/md5-cache/dev-python/pytest-6.2.4-r1 b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
index fa9427c64783..70d8a4fc1c1e 100644
--- a/metadata/md5-cache/dev-python/pytest-6.2.4-r1
+++ b/metadata/md5-cache/dev-python/pytest-6.2.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f65d7491672203074e0a3e17dba360e1
diff --git a/metadata/md5-cache/dev-python/pytest-6.2.5 b/metadata/md5-cache/dev-python/pytest-6.2.5
index c17af16e9662..2a4045767539 100644
--- a/metadata/md5-cache/dev-python/pytest-6.2.5
+++ b/metadata/md5-cache/dev-python/pytest-6.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90b444d2f4a743469c0ee46c1e04cf12
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 c969f5c11704..b1c05521fb37 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-5.4[python_targets_pypy3(-)?,python_targets_python3_
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4e10e4378bec6b41d0d57f9c06897ac
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.15.1 b/metadata/md5-cache/dev-python/pytest-asyncio-0.15.1
index 4ec036905bdf..59914bf55600 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.15.1
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.15.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/pytest-dev/pytest-asyncio/archive/v0.15.1.tar.gz -> pytest-asyncio-0.15.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5329bf71bd9ff14e61e5dc754b81b239
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
index 3354405e1b73..99f69fda95f1 100644
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43861429477d55a2cb704dcd17c87982
diff --git a/metadata/md5-cache/dev-python/pytest-check-1.0.4 b/metadata/md5-cache/dev-python/pytest-check-1.0.4
index 3f09de61f284..3954b0967c7d 100644
--- a/metadata/md5-cache/dev-python/pytest-check-1.0.4
+++ b/metadata/md5-cache/dev-python/pytest-check-1.0.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/okken/pytest-check/archive/1.0.4.tar.gz -> pytest-check-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed5895b948f41fd4d61addc00eb1e698
diff --git a/metadata/md5-cache/dev-python/pytest-console-scripts-1.2.0 b/metadata/md5-cache/dev-python/pytest-console-scripts-1.2.0
index 9f39a814b2d8..ab6bbbd35bb8 100644
--- a/metadata/md5-cache/dev-python/pytest-console-scripts-1.2.0
+++ b/metadata/md5-cache/dev-python/pytest-console-scripts-1.2.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/pytest-console-scripts/pytest-console-scripts-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ca5f48c99fb78a19e13590534eabea8
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.12.1 b/metadata/md5-cache/dev-python/pytest-cov-2.12.1
index 5f867ab873c8..5abc482e9960 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.12.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0082d1d3ccd0721d037e913fbde923d0
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 e6e6e5c156c3..77f3cbed5959 100644
--- a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
+++ b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
@@ -4,12 +4,12 @@ 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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-datadir/pytest-datadir-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=207435783887ae2e8e8e2fdae2dc0d82
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd96d2321362c989fef93d80c3610c8e
diff --git a/metadata/md5-cache/dev-python/pytest-describe-2.0.0 b/metadata/md5-cache/dev-python/pytest-describe-2.0.0
index 681fac94ee6c..54e411e648f4 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-2.0.0
+++ b/metadata/md5-cache/dev-python/pytest-describe-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51b6eeb4bc332826784987d4159ac8bf
diff --git a/metadata/md5-cache/dev-python/pytest-django-4.4.0 b/metadata/md5-cache/dev-python/pytest-django-4.4.0
index 2f38fd1492ae..8e160ffa15a9 100644
--- a/metadata/md5-cache/dev-python/pytest-django-4.4.0
+++ b/metadata/md5-cache/dev-python/pytest-django-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-django/archive/v4.4.0.tar.gz -> pytest-django-4.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c6e35915f13da1a40976e02935d76b6
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.6.2 b/metadata/md5-cache/dev-python/pytest-env-0.6.2
index 9b3a3bc1efbd..b5627e5beaef 100644
--- a/metadata/md5-cache/dev-python/pytest-env-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest-env-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-env/pytest-env-0.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11e17b12f84750ea4e2caf39d42ea7fd
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
index b7fb3f205562..264ae0cd3dea 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=py.test plugin that stores test expectations by saving the set of fa
 EAPI=7
 HOMEPAGE=https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/u-msgpack-python[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
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=331964f967ea340279ec98e3b5915579
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e678c6d4fcdc0dd1a6ba4a39845450e1
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1 b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
index 4f89affbf55b..0a79e5532905 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-5.0[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-faulthandler/archive/2.0.1.tar.gz -> pytest-faulthandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2484c7409cfc2b05d32c570540ccfd0e
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
index 70fa4edeff78..10c996486afd 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.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=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64c272a2e213610d57379a1eac73cbde
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-1.0.7 b/metadata/md5-cache/dev-python/pytest-flake8-1.0.7
index 57c4acdb1cee..b41cbb807363 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-1.0.7
+++ b/metadata/md5-cache/dev-python/pytest-flake8-1.0.7
@@ -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/pytest-flake8/pytest-flake8-1.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6bd16dde69cd2119650228ae3c6a923
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1
index d4adaca5f0b7..2a1b17a8d0ba 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b99d835f5cb163298a3f7c04a42f9360
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.3 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.3
index 8fc959d17779..b4a348d1589d 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.3
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba84fe2cb5d9664be9f7a9999b9c7434
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
index 0d0d4ab7cec7..dfa8340c5f30 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.3.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=mirror://pypi/p/pytest-forked/pytest-forked-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88aa19e492c270fe0cb7dc058c4cbd5d
diff --git a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2 b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
index 21b2e15a4b8a..26705120d985 100644
--- a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+++ b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.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/ktosiek/pytest-freezegun/archive/0.4.2.tar.gz -> pytest-freezegun-0.4.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac9ad05572aa017a32d8f82efcd77a23
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
index cfcdd25abada..63a1228fbbbf 100644
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
+++ b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-helpers-namespace/archive/v2019.1.8.tar.gz -> pytest-helpers-namespace-v2019.1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4a4bb2bfcedf95011d4cecef4748266
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
index 7a21ce4786d3..a899fb136728 100644
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
+++ b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
@@ -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/saltstack/pytest-helpers-namespace/archive/v2021.3.24.tar.gz -> pytest-helpers-namespace-2021.3.24.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=567e6a4ed8e5ab9b64e5067caa1f9940
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.22.1 b/metadata/md5-cache/dev-python/pytest-html-1.22.1
index 9d62b3c4c9c3..5708b9d9be61 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.22.1
+++ b/metadata/md5-cache/dev-python/pytest-html-1.22.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.22.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=525ef37fdb3ad9f2a9f40220923d47c5
diff --git a/metadata/md5-cache/dev-python/pytest-html-3.1.1 b/metadata/md5-cache/dev-python/pytest-html-3.1.1
index 54695723b392..e2f24a5a142b 100644
--- a/metadata/md5-cache/dev-python/pytest-html-3.1.1
+++ b/metadata/md5-cache/dev-python/pytest-html-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0bc470ae7c171fc089c5604a5e8c7b2e
diff --git a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1 b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
index dc6b382bf4cd..8a06ccd6f2ad 100644
--- a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
@@ -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/kevin1024/pytest-httpbin/archive/v1.0.0.tar.gz -> pytest-httpbin-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c4cf89c5256c63de98cbda21321e2ea
diff --git a/metadata/md5-cache/dev-python/pytest-httpx-0.13.0 b/metadata/md5-cache/dev-python/pytest-httpx-0.13.0
index 2ee0dc81a9d1..d74066a97627 100644
--- a/metadata/md5-cache/dev-python/pytest-httpx-0.13.0
+++ b/metadata/md5-cache/dev-python/pytest-httpx-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Colin-b/pytest_httpx/archive/v0.13.0.tar.gz -> pytest-httpx-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9daae7b384acb5609ceefbcd7ba057a8
diff --git a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3 b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
index d74018fe0ca7..a6abf2923a9a 100644
--- a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
+++ b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.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=mirror://pypi/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be19f0ad3e61b4aba9cf234b9813e4ef
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
index b294e8ad983d..5ee5a9e179d3 100644
--- a/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
+++ b/metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localftpserver/pytest_localftpserver-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f675d7097081374c3e60bfa0467922c0
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0 b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
index 26bf63ada731..7f30d63fcc87 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bce644c7db03317c2ceb14ad512b13d2
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.11.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.11.0
index 65300c43b5e3..4990b6d3fb6d 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.11.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fcefca7da7906e1865da3ad6e93ca4c
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
index c2e274149854..5f8108ea0e69 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d406669fe3ab9ecd01b251fe4033d7e8
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.6.1 b/metadata/md5-cache/dev-python/pytest-mock-3.6.1
index 7bec2f2a9d25..7d3ebae7f0f2 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.6.1
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6119a1d4db27d746907f224dd51df92
diff --git a/metadata/md5-cache/dev-python/pytest-ordering-0.6 b/metadata/md5-cache/dev-python/pytest-ordering-0.6
index 9d5207c137c5..b05b770936ce 100644
--- a/metadata/md5-cache/dev-python/pytest-ordering-0.6
+++ b/metadata/md5-cache/dev-python/pytest-ordering-0.6
@@ -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/ftobia/pytest-ordering/archive/0.6.tar.gz -> pytest-ordering-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b3a123f5ed1793b90cfecf13d0bdc18
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.2 b/metadata/md5-cache/dev-python/pytest-plus-0.2
index e4b580a4255f..980e89ccd98c 100644
--- a/metadata/md5-cache/dev-python/pytest-plus-0.2
+++ b/metadata/md5-cache/dev-python/pytest-plus-0.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/pytest-plus/pytest-plus-0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cba12ecac46025ca2651e21b0c90d7dd
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
index 77bf329ae35e..4a6d9da7a168 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.17.0.tar.gz -> pytest-pylint-0.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d27af6f54cd4fb7c9ea723851c8c75f3
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.18.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.18.0
index a4b69e67dd69..7fd26d87f5be 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.18.0
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.18.0.tar.gz -> pytest-pylint-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea3547c5d9ab493de2acca84983e6245
diff --git a/metadata/md5-cache/dev-python/pytest-qt-3.3.0 b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
index 04310eea2c72..c41bf20ace61 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-3.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -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=mirror://pypi/p/pytest-qt/pytest-qt-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=a297a389258a5b47098362584cd4085f
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.0.2 b/metadata/md5-cache/dev-python/pytest-qt-4.0.2
index e96e9fb2f334..936f0f192518 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-4.0.2
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.0.2
@@ -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=mirror://pypi/p/pytest-qt/pytest-qt-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e70b5dc6f96142f9fe3db59f9b2dcae7
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 9aeed8cd92e9..978ef6654da9 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
@@ -4,12 +4,12 @@ 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 ~arm64 ~ppc ~ppc64 ~riscv ~s390 x86
+KEYWORDS=amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8591bcf311aab42ad52ca64d6595d5fe
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ca0428f2900910afe20df67182a207b
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
index bf360867ebfe..0f81dcae156b 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24926e2c18e8f07aa31eac0f72459791
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.2 b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.2
index 54f344631ce6..6953025fcdcd 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.2
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-10.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=451d9f51fb3ecb197dd3227c06046576
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3 b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
index ce80a1028829..acc2ef16da33 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
+++ b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
@@ -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/saltstack/pytest-salt/archive/v2020.1.27.tar.gz -> pytest-salt-2020.1.27.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e029abec70a5df89154db21b72bb72e2
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1 b/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
index 19c064cf4ff4..7d1a64140772 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/0.121.1.tar.gz -> pytest-salt-factories-0.121.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e809cff80ef6282f1b3dad8a985b124
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.2.1 b/metadata/md5-cache/dev-python/pytest-services-2.2.1
index 48013d4c7aed..1e19a64281d4 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.2.1
+++ b/metadata/md5-cache/dev-python/pytest-services-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.2.1.tar.gz -> pytest-services-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d08d36a8ded563f506811c7e3ba952ec
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
index 0875158498ff..aa42f85e4968 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c2c17f3821dfc684a616a44aef0c0ad
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2
index 5c339c0b2de1..41de1cf021e9 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2
@@ -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/untitaker/pytest-subtesthack/archive/0.1.2.tar.gz -> pytest-subtesthack-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69d08747eff162978ffd3cd87a2a725b
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
index 1f4f873a7bd7..2e65cfb66c1d 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
@@ -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/untitaker/pytest-subtesthack/archive/0.1.2.tar.gz -> pytest-subtesthack-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a4bb17afc4f1466c7be754cc79adc4c0
diff --git a/metadata/md5-cache/dev-python/pytest-subtests-0.5.0 b/metadata/md5-cache/dev-python/pytest-subtests-0.5.0
index df77e77540fd..2b34f097ae10 100644
--- a/metadata/md5-cache/dev-python/pytest-subtests-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-subtests-0.5.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/pytest-dev/pytest-subtests/archive/refs/tags/0.5.0.tar.gz -> pytest-subtests-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79f95d3f828116dde605da8e7ea1fb42
diff --git a/metadata/md5-cache/dev-python/pytest-sugar-0.9.4 b/metadata/md5-cache/dev-python/pytest-sugar-0.9.4
index 653a12be883d..9c297ca53d2f 100644
--- a/metadata/md5-cache/dev-python/pytest-sugar-0.9.4
+++ b/metadata/md5-cache/dev-python/pytest-sugar-0.9.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/p/pytest-sugar/pytest-sugar-0.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=85f062c09218dde5d16205618699d70c
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 8c8c77d56acc..ed9d900d082f 100644
--- a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
+++ b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -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/saltstack/pytest-tempdir/archive/v2019.10.12.tar.gz -> pytest-tempdir-2019.10.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1cb18d3eb59b8e78343caaa2c35e291
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0 b/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
index 6690a9d4ccaf..a9132b6d9408 100644
--- a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-6.3.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/pytest-testinfra/pytest-testinfra-6.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5f4e0499ce31610bc6132a919e7dea5
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-6.4.0 b/metadata/md5-cache/dev-python/pytest-testinfra-6.4.0
index 130c931074a6..127f1402048e 100644
--- a/metadata/md5-cache/dev-python/pytest-testinfra-6.4.0
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-6.4.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/pytest-testinfra/pytest-testinfra-6.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=420dce4dff803572b45f037b96426dfb
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1 b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
index 65105c411e07..c8726d61d52c 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd7793e356fbf4027a5136e931ee7e55
diff --git a/metadata/md5-cache/dev-python/pytest-toolbox-0.4 b/metadata/md5-cache/dev-python/pytest-toolbox-0.4
index 8d1911396626..1b40000196a5 100644
--- a/metadata/md5-cache/dev-python/pytest-toolbox-0.4
+++ b/metadata/md5-cache/dev-python/pytest-toolbox-0.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/samuelcolvin/pytest-toolbox/archive/v0.4.tar.gz -> pytest-toolbox-0.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27b7ce7739828167596003c1064347d6
diff --git a/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2 b/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
index c2fbe648f35f..9be667cd5bde 100644
--- a/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
+++ b/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-tornasync/pytest-tornasync-0.6.0.post2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5939aeb53b0d37af86c7e9c315a43c7
diff --git a/metadata/md5-cache/dev-python/pytest-trio-0.7.0 b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
index ffd05af68e2c..fa59741cd203 100644
--- a/metadata/md5-cache/dev-python/pytest-trio-0.7.0
+++ b/metadata/md5-cache/dev-python/pytest-trio-0.7.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/pytest-trio/pytest-trio-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42547a5fc27859a01de1622f12adb993
diff --git a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0 b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
index 5ff45124be87..01bd57e2ac17 100644
--- a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cd095a08f3866ee13a764f8bf2c5c39
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
index ef84c8ca083f..d68a3722e427 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.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=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fc8859931aa2f501a2b959175b44497
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
index f1075214b28c..d190ce92001d 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=190e49a669bbfd95abb18db4c7e25832
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.4.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.4.0
index 9ead2fc2b6ef..31f53875a620 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.4.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce0a4554fc580e8643c45b630c23f1d3
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
index c6f3a7d135b7..18ca64a75587 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.18.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc3c3a092851330728eb09bd11a19dc2
diff --git a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1 b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
index 3402826574fb..de3aed29eb49 100644
--- a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.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=https://github.com/The-Compiler/pytest-xvfb/archive/v2.0.0.tar.gz -> pytest-xvfb-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df442ef336dff23bc2e98ec7f10fc9ae
diff --git a/metadata/md5-cache/dev-python/python-augeas-1.1.0 b/metadata/md5-cache/dev-python/python-augeas-1.1.0
index 74d8c8d5c5bd..5fcfde963ea6 100644
--- a/metadata/md5-cache/dev-python/python-augeas-1.1.0
+++ b/metadata/md5-cache/dev-python/python-augeas-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_8(-)?,py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-augeas/python-augeas-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f2aee99f4a5d7a5bdf5add296a6c362
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1 b/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
index 6d83fb328a28..70b6116e845b 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
@@ -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/tgalal/python-axolotl/archive/0.2.3.tar.gz -> python-axolotl-0.2.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2ab4171a591063e9cde1400ef8de095
diff --git a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1 b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
index a7693f0002f3..3e6a9ae84234 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
+++ b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/python-axolotl-curve25519/archive/0.4.1-2.tar.gz -> python-axolotl-curve25519-0.4.1-2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69c55e35be668c01a182dad0c19e4e96
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.1.0 b/metadata/md5-cache/dev-python/python-bugzilla-3.1.0
index d3d49f248733..d891d369de7f 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.1.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.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/python-bugzilla/python-bugzilla-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e140d350d90da0be827b7b2570a168d
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0 b/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
index b5c689269a83..c408ebef8dfc 100644
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_8(-)?] >=dev-python/iso8601-
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-2.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcf28ca6572955b16299944aa5a76df7
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-7.2.1 b/metadata/md5-cache/dev-python/python-cinderclient-7.2.1
index 05a7e56eb35f..b9b77cbbf83d 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-7.2.1
+++ b/metadata/md5-cache/dev-python/python-cinderclient-7.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-7.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d9769e3353a1f3314d30765f98872fb
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r1 b/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r1
index 4e98b4929950..da4f9276b571 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r1
+++ b/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=A client for the OpenStack Cinder API
 EAPI=8
 HOMEPAGE=https://launchpad.net/python-cinderclient
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-3.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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-8.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a0d7ad8323bd95aa73caf3616f31104
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a7a91d9b958ed26d05aedcfed366d69b
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r2 b/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r2
new file mode 100644
index 000000000000..fb206a9a8216
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cinderclient-8.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/ddt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oslo-serialization[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tempest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A client for the OpenStack Cinder API
+EAPI=8
+HOMEPAGE=https://launchpad.net/python-cinderclient
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-3.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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-8.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e645f906080e7f30024517996799cb9f
diff --git a/metadata/md5-cache/dev-python/python-cstruct-1.8 b/metadata/md5-cache/dev-python/python-cstruct-1.8
index 8407002e6179..7208fb78425b 100644
--- a/metadata/md5-cache/dev-python/python-cstruct-1.8
+++ b/metadata/md5-cache/dev-python/python-cstruct-1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/andreax79/python-cstruct/archive/v1.8.tar.gz -> python-cstruct-1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b2c776c2a58a265030f582e6da68bef
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 dfe6594dd6b8..def10b0d94a2 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.5.0
+++ b/metadata/md5-cache/dev-python/python-ctags-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a28d53ffcbd5abf170c6b07ce658fd68
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.3.0-r1 b/metadata/md5-cache/dev-python/python-daemon-2.3.0-r1
index 317b0bf44c48..e683f855ffb0 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/python-daemon-2.3.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=mirror://pypi/p/python-daemon/python-daemon-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57bd85bc5b4f4da544cd9310613913af
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.2 b/metadata/md5-cache/dev-python/python-dateutil-2.8.2
index 9adff5199a62..1eb50b9c907a 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.2
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e638117282d9fbcffc1f52dae2c40de
diff --git a/metadata/md5-cache/dev-python/python-dbusmock-0.23.1 b/metadata/md5-cache/dev-python/python-dbusmock-0.23.1
index 71985955afa3..95639a61ffe3 100644
--- a/metadata/md5-cache/dev-python/python-dbusmock-0.23.1
+++ b/metadata/md5-cache/dev-python/python-dbusmock-0.23.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.23.1/python-dbusmock-0.23.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7377e1eda0f06978542c36056b84a13a
diff --git a/metadata/md5-cache/dev-python/python-dbusmock-0.24.0 b/metadata/md5-cache/dev-python/python-dbusmock-0.24.0
index a60d3747d212..3c756802f07b 100644
--- a/metadata/md5-cache/dev-python/python-dbusmock-0.24.0
+++ b/metadata/md5-cache/dev-python/python-dbusmock-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.24.0/python-dbusmock-0.24.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83186c26d04fa5c7e0589f48f4fcf372
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.40 b/metadata/md5-cache/dev-python/python-debian-0.1.40
index d471c056f0ab..de8778011177 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.40
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.40
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.40.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89cf01850c605e332167df9512d6b25b
diff --git a/metadata/md5-cache/dev-python/python-discid-1.2.0 b/metadata/md5-cache/dev-python/python-discid-1.2.0
index 906e357ae3ae..e3469b6f6fd3 100644
--- a/metadata/md5-cache/dev-python/python-discid-1.2.0
+++ b/metadata/md5-cache/dev-python/python-discid-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libdiscid-0.2.2 python_targets_python3_8? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/JonnyJD/python-discid/archive/v1.2.0.tar.gz -> python-discid-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09c909820619134e25c3b7cbabbc5aac
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.45 b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
index 1cc7ef9bf3d8..e874723fe446 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.45
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/2.45/python-distutils-extra-2.45.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=672490e5dfe04872d2fca084f2b442e8
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.19.0 b/metadata/md5-cache/dev-python/python-dotenv-0.19.0
index 40a87b9b2091..4c54de6ab3ae 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.19.0
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3977ceaa5f302f65e670e8f6b5ce7007
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
index 6c32807b00c8..d14f97b18a58 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5597b3941fe5d13fff695128ac99f45
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 ab9edb23ecac..12c71944bb85 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.25.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.25.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.25.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=367403afba97e47b725bd1fdc1274df1
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.3 b/metadata/md5-cache/dev-python/python-email-validator-1.1.3
index b880c8d6d808..6af250a5408d 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.3
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.3.tar.gz -> python-email-validator-1.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b73f2882f1302c792244f72bdecd07c4
diff --git a/metadata/md5-cache/dev-python/python-engineio-3.12.1 b/metadata/md5-cache/dev-python/python-engineio-3.12.1
index 463f46eecdba..acc663a3775a 100644
--- a/metadata/md5-cache/dev-python/python-engineio-3.12.1
+++ b/metadata/md5-cache/dev-python/python-engineio-3.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-3.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44ac3a502e6285b7df77ce69abe44191
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.0.1 b/metadata/md5-cache/dev-python/python-engineio-4.0.1
index c6665d3bbbad..9b978e4f902c 100644
--- a/metadata/md5-cache/dev-python/python-engineio-4.0.1
+++ b/metadata/md5-cache/dev-python/python-engineio-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.0.1.tar.gz -> python-engineio-4.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f97aa1035bc472c7a184f7d2c1eeb6c6
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.1.0 b/metadata/md5-cache/dev-python/python-engineio-4.1.0
index 9ea7cb758db7..d1fa7261a2eb 100644
--- a/metadata/md5-cache/dev-python/python-engineio-4.1.0
+++ b/metadata/md5-cache/dev-python/python-engineio-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.1.0.tar.gz -> python-engineio-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbcf0834d5c32415fde5c96ff9e5c535
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.2.0 b/metadata/md5-cache/dev-python/python-engineio-4.2.0
index 7fe5af3dd784..7cb2f8243a97 100644
--- a/metadata/md5-cache/dev-python/python-engineio-4.2.0
+++ b/metadata/md5-cache/dev-python/python-engineio-4.2.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/miguelgrinberg/python-engineio/archive/v4.2.0.tar.gz -> python-engineio-4.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bbcf0834d5c32415fde5c96ff9e5c535
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.2.1 b/metadata/md5-cache/dev-python/python-engineio-4.2.1
index fc4ab5312414..b83a84eaccf6 100644
--- a/metadata/md5-cache/dev-python/python-engineio-4.2.1
+++ b/metadata/md5-cache/dev-python/python-engineio-4.2.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/miguelgrinberg/python-engineio/archive/v4.2.1.tar.gz -> python-engineio-4.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d30b0a47d732e43eb8a7796ea234fe48
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1 b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
index 7eb4a0e10586..6695ee49e7e9 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-etcd/python-etcd-0.4.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5a921f27d4dc96a81553b75d989eaf9f
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.4.0 b/metadata/md5-cache/dev-python/python-evdev-1.4.0
index aa2b50685f58..627f4d49f29b 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.4.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.4.0.tar.gz -> python-evdev-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1227c69bb3c4ae91a34eab50da7a87a8
diff --git a/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1 b/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1
index 7c4cc5b99629..6805eacd3242 100644
--- a/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1
+++ b/metadata/md5-cache/dev-python/python-fcl-0.0.12-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-fcl/python-fcl-0.0.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75f0eb8ad3e7013aeeedf5270dffebfe
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index d1a2ff7da030..ae4d70df7c16 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ca4e7d67dfbf4cae62dedd14b31a0b3
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1 b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
index 87fda4e0e45d..ae93ec28edc2 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ea3db91de62e95f4f83eb880e301952
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2 b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
index 7b36d2bb12c0..129a722a81e2 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
+++ b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-3.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cb8c9440f61cc56a44412f5a6256ebc
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2-r1 b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2-r1
index 3529e97a5789..5e8971d0467b 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2-r1
@@ -4,12 +4,12 @@ DESCRIPTION=A client for the OpenStack Glance API
 EAPI=7
 HOMEPAGE=https://github.com/openstack/python-glanceclient
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/warlock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/warlock-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.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/p/python-glanceclient/python-glanceclient-3.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb648cc557c76e29ab3986af507861d3
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=66c99a54b250c04ffdff9b65f4cf3e7b
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.7 b/metadata/md5-cache/dev-python/python-gnupg-0.4.7
index 231444f9a016..8d29e0cadfcc 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.7
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.7
@@ -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/python-gnupg/python-gnupg-0.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12020e9dbceeca4606d965a918b3ac55
diff --git a/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1 b/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
index 2ef1c2858b6d..21e07c131508 100644
--- a/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/python-iptables-1.0.0-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/p/python-iptables/python-iptables-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65918e5f10640dc1758adb12904c58f5
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.4.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
index 31519d698004..ef4a7254f0a5 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5aa9df7e1f0068041b452428cb9f7c5
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.8.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.8.0
new file mode 100644
index 000000000000..52811e7b5f18
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ironicclient-4.8.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for the Ironic API
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-4.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=069b6a1048bf1a20a887b6c814798199
diff --git a/metadata/md5-cache/dev-python/python-jose-3.3.0 b/metadata/md5-cache/dev-python/python-jose-3.3.0
index cc2a3461413b..54da80807f3b 100644
--- a/metadata/md5-cache/dev-python/python-jose-3.3.0
+++ b/metadata/md5-cache/dev-python/python-jose-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpdavis/python-jose/archive/3.3.0.tar.gz -> python-jose-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=918a879bf0e098286829fa8dcbccec35
diff --git a/metadata/md5-cache/dev-python/python-jwt-1.2.0 b/metadata/md5-cache/dev-python/python-jwt-1.2.0
index fd9cd64f2686..80f2ac486b34 100644
--- a/metadata/md5-cache/dev-python/python-jwt-1.2.0
+++ b/metadata/md5-cache/dev-python/python-jwt-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GehirnInc/python-jwt/archive/v1.2.0.tar.gz -> python-jwt-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a77004fa2169a5bf648a1d545b08de2
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1 b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
index 2587d179f02f..77788dbfcfe5 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-4.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ebf5fd1cfef4b1a195b7c5b967537dc
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.3.0 b/metadata/md5-cache/dev-python/python-keystoneclient-4.3.0
new file mode 100644
index 000000000000..2e63bebe4249
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-4.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/os-client-config-1.28.0 >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[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(-)?] 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=Client Library for OpenStack Identity
+EAPI=7
+HOMEPAGE=https://www.openstack.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[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(-)?] python_targets_python3_8? ( dev-lang/python: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/python-keystoneclient/python-keystoneclient-4.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4de0445abbeaa419f8b543df7e0e09db
diff --git a/metadata/md5-cache/dev-python/python-keyutils-0.6 b/metadata/md5-cache/dev-python/python-keyutils-0.6
index b3d9bcda75d7..104f90ec5b51 100644
--- a/metadata/md5-cache/dev-python/python-keyutils-0.6
+++ b/metadata/md5-cache/dev-python/python-keyutils-0.6
@@ -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/sassoftware/python-keyutils/archive/refs/tags/0.6.tar.gz -> python-keyutils-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5ff6eb0beca62b5e328094e72057368
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.3.1 b/metadata/md5-cache/dev-python/python-ldap-3.3.1
index 0a096bab1e24..8a9bd289aae7 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.3.1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea87bb526f39d69d25f0bc12b6618088
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index 7d46d5a1e44e..720d42b76c8b 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=673c49e76724c610148942dc360c0df9
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.1 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.1
index f2e301f5ed79..879d71a7022d 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.1
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.1
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9892ce89afb4b1d238900d1eef4384b
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
index 4e1bba02f855..748a4a5d8777 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf4208a2dfe3a2d0c62d905ac1e025e6
diff --git a/metadata/md5-cache/dev-python/python-lhafile-0.3.0 b/metadata/md5-cache/dev-python/python-lhafile-0.3.0
index 06b29f099f8a..96c4f5f97834 100644
--- a/metadata/md5-cache/dev-python/python-lhafile-0.3.0
+++ b/metadata/md5-cache/dev-python/python-lhafile-0.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/FrodeSolheim/python-lhafile/archive/v0.3.0.tar.gz -> python-lhafile-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2a487b4a3f3505f03b5e7f344de3a3e
diff --git a/metadata/md5-cache/dev-python/python-libevdev-0.9 b/metadata/md5-cache/dev-python/python-libevdev-0.9
index 74ff4f0c5e53..ed2374bf7d99 100644
--- a/metadata/md5-cache/dev-python/python-libevdev-0.9
+++ b/metadata/md5-cache/dev-python/python-libevdev-0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/0.9/python-libevdev-0.9.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e24e118451064b188939f994d2c5930
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.3 b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.3
index df2463826cc5..5100ba9bfaa7 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.3
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://cdn.kernel.org/pub/software/libs/python/python-linux-procfs/python-linux-procfs-0.6.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b75f464012995ad28a0ccc43aa7a3a43
diff --git a/metadata/md5-cache/dev-python/python-lsp-black-1.0.0 b/metadata/md5-cache/dev-python/python-lsp-black-1.0.0
index 8d59a822265b..a229bd7052bf 100644
--- a/metadata/md5-cache/dev-python/python-lsp-black-1.0.0
+++ b/metadata/md5-cache/dev-python/python-lsp-black-1.0.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/python-lsp/python-lsp-black/archive/v1.0.0.tar.gz -> python-lsp-black-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c894c2d85ca563b1d3609be7b370f9d
diff --git a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0 b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
index c16f14df777e..28ea9394afc9 100644
--- a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
+++ b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d44f40ec746605308ea298a9f005f172
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
index 9fe166c30e4d..1aeaf0a074ee 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.2.1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.2.1
@@ -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.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69ed92079058ad52813ec0b12e46af73
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.2.2 b/metadata/md5-cache/dev-python/python-lsp-server-1.2.2
index 567829afcadc..0fe386b14049 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.2.2
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.2.2
@@ -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.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8167515bb1eff5c16a0a84e31862853
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.6 b/metadata/md5-cache/dev-python/python-ly-0.9.6
index 7d0fba144bc7..f05b8d8ad18f 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.6
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2ad1e84f39bf324a727d8af94dd1b6b
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r2 b/metadata/md5-cache/dev-python/python-lzo-1.12-r2
index ceafb0e5fa5e..d2b9786b9718 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r2
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r2
@@ -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/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31b0b9c9d70ab7367175a6afe2094d69
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.24 b/metadata/md5-cache/dev-python/python-magic-0.4.24
index 1d950752ff1b..498bae6d50cc 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.24
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.24
@@ -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/ahupp/python-magic/archive/0.4.24.tar.gz -> python-magic-0.4.24.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2fad052831d0958161725554c30076b
diff --git a/metadata/md5-cache/dev-python/python-markdown-math-0.8 b/metadata/md5-cache/dev-python/python-markdown-math-0.8
index 40ccd435f8c9..d4d676389b01 100644
--- a/metadata/md5-cache/dev-python/python-markdown-math-0.8
+++ b/metadata/md5-cache/dev-python/python-markdown-math-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-markdown-math/python-markdown-math-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d42a2e76dca8486d217ad3ace9652a93
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.59-r1 b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
index 83a9d00a2890..dda2cb83d0d7 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.59-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.59-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/linsomniac/python-memcached/archive/1.59.tar.gz -> python-memcached-1.59-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13d63d0477c631c93eacd8604a59ce20
diff --git a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3 b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
index c8dcaeb8c41e..5f113eda6538 100644
--- a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
+++ b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7e824683bd8e7b2a8f705ee96a8add0
diff --git a/metadata/md5-cache/dev-python/python-mpd-3.0.4 b/metadata/md5-cache/dev-python/python-mpd-3.0.4
index 57eec9365a7a..1301a56ffa58 100644
--- a/metadata/md5-cache/dev-python/python-mpd-3.0.4
+++ b/metadata/md5-cache/dev-python/python-mpd-3.0.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/Mic92/python-mpd2/archive/v3.0.4.tar.gz -> python-mpd2-3.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b452d82c818573a09a45808a30b50990
diff --git a/metadata/md5-cache/dev-python/python-mpv-0.5.2 b/metadata/md5-cache/dev-python/python-mpv-0.5.2
index 6f614dc4e88a..8ffc4ff80bf3 100644
--- a/metadata/md5-cache/dev-python/python-mpv-0.5.2
+++ b/metadata/md5-cache/dev-python/python-mpv-0.5.2
@@ -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/jaseg/python-mpv/archive/v0.5.2.tar.gz -> python-mpv-0.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e0c6cdcba12512e357c9324d9220ac32
diff --git a/metadata/md5-cache/dev-python/python-musicbrainzngs-0.7.1 b/metadata/md5-cache/dev-python/python-musicbrainzngs-0.7.1
index 029892ea4ace..e395f3ec8504 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainzngs-0.7.1
+++ b/metadata/md5-cache/dev-python/python-musicbrainzngs-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.7.1.tar.gz -> python-musicbrainzngs-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03241e83830eacef69017244807aaa79
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-2.0.3 b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.3
index f8b1c97eaad6..0ebfd1bafffd 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-2.0.3
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.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://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-2.0.3/python-nbxmpp-nbxmpp-2.0.3.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c15171f94fbab6d7a4ac5632095eac73
diff --git a/metadata/md5-cache/dev-python/python-netlink-0.1 b/metadata/md5-cache/dev-python/python-netlink-0.1
index c50272429dfc..c8f7329296ae 100644
--- a/metadata/md5-cache/dev-python/python-netlink-0.1
+++ b/metadata/md5-cache/dev-python/python-netlink-0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-libs/libnl[python(-)] python_targets_python3_8? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/N/NetLink/NetLink-0.1.tar.gz -> python-netlink-0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18b9c9122f4fab48dc68969fb94319e2
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-7.2.1 b/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
index ae1123abc520..621da00de767 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
+++ b/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-7.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb3b9a33b32699e8e24161bc48203279
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-7.6.0 b/metadata/md5-cache/dev-python/python-neutronclient-7.6.0
new file mode 100644
index 000000000000..075b138b87e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-neutronclient-7.6.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/bandit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oslotest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-openstackclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/subunit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testscenarios[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tempest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.5.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=A client for the OpenStack Quantum API
+EAPI=7
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplejson-3.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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-7.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b86e7c1b814aba4a20dfcf39d3ea7d5d
diff --git a/metadata/md5-cache/dev-python/python-novaclient-17.2.1 b/metadata/md5-cache/dev-python/python-novaclient-17.2.1
index 3e8e7c559b8b..ff753c761fdb 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-17.2.1
+++ b/metadata/md5-cache/dev-python/python-novaclient-17.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/keystoneauth-3.5.0[python_targets_python3_8(-)?] >=dev-pyth
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-17.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f841975bd33743bda1e3eccb459898de
diff --git a/metadata/md5-cache/dev-python/python-novaclient-17.6.0 b/metadata/md5-cache/dev-python/python-novaclient-17.6.0
new file mode 100644
index 000000000000..69d8fbf0a227
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-novaclient-17.6.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/bandit[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ddt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-keystoneclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-cinderclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-glanceclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-neutronclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/openstacksdk[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testscenarios[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tempest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/requests-2.12.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.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=A client for the OpenStack Nova API
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-novaclient
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/requests-2.12.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.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/p/python-novaclient/python-novaclient-17.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=05532ba5c7f971a7a144720aef1917f7
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.4.0 b/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
index 6049585ccfbd..a62f07fe023a 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-5.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=643b5acb869a3d40f31e840ccb535b7b
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.6.0 b/metadata/md5-cache/dev-python/python-openstackclient-5.6.0
new file mode 100644
index 000000000000..5941bc3ed616
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.6.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[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-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cliff-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.56.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-keystoneclient-3.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-novaclient-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.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=A client for the OpenStack APIs
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-openstackclient
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cliff-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.56.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-keystoneclient-3.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-novaclient-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-2.0.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/p/python-openstackclient/python-openstackclient-5.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4d8d1a69d07d35a8f50f462790977bf1
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0 b/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
index 2f8b08867a87..f059c8c0ec59 100644
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
+++ b/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_8(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/frescobaldi/python-poppler-qt5/archive/v0.75.0.tar.gz -> python-poppler-qt5-0.75.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49aa58cf888c77fbbd5ac259c58bb1cc
diff --git a/metadata/md5-cache/dev-python/python-redmine-2.3.0 b/metadata/md5-cache/dev-python/python-redmine-2.3.0
index 1fd1a99184f7..bdf42493c89f 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.3.0
+++ b/metadata/md5-cache/dev-python/python-redmine-2.3.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/python-redmine/python-redmine-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b8178aeac40bc5b06296afa58075122
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2 b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
index b1d3e23ba71a..f8e8fa7406e9 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.2.0.tar.gz -> python-sense-hat-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e58d02cf2473a4a81b1a4554f147528
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5-r1 b/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
index 8f2fbae15600..3b2a58e21833 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ef94f40892bcf5046f43e9468746fe2
diff --git a/metadata/md5-cache/dev-python/python-slugify-4.0.1 b/metadata/md5-cache/dev-python/python-slugify-4.0.1
index fa2272cbdc43..ec43d4d90041 100644
--- a/metadata/md5-cache/dev-python/python-slugify-4.0.1
+++ b/metadata/md5-cache/dev-python/python-slugify-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/4.0.1.tar.gz -> python-slugify-4.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b577a694e2d99bba75e30b0c8d4c01ad
diff --git a/metadata/md5-cache/dev-python/python-slugify-5.0.0 b/metadata/md5-cache/dev-python/python-slugify-5.0.0
index a1f5215d34ec..8ebd0c4522b7 100644
--- a/metadata/md5-cache/dev-python/python-slugify-5.0.0
+++ b/metadata/md5-cache/dev-python/python-slugify-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/5.0.0.tar.gz -> python-slugify-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a38bdeadc3732cc1b573c329806a30ba
diff --git a/metadata/md5-cache/dev-python/python-slugify-5.0.1 b/metadata/md5-cache/dev-python/python-slugify-5.0.1
index 2d575c69ea94..0b40caffc5f7 100644
--- a/metadata/md5-cache/dev-python/python-slugify-5.0.1
+++ b/metadata/md5-cache/dev-python/python-slugify-5.0.1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/5.0.1.tar.gz -> python-slugify-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fbd41936eba045dbe579155042b80a9
diff --git a/metadata/md5-cache/dev-python/python-slugify-5.0.2 b/metadata/md5-cache/dev-python/python-slugify-5.0.2
new file mode 100644
index 000000000000..5b017b47cecb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-slugify-5.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/text-unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python Slugify application that handles Unicode
+EAPI=7
+HOMEPAGE=https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/text-unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/un33k/python-slugify/archive/5.0.2.tar.gz -> python-slugify-5.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c218bc4aaa17481fa53d559747147ace
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 f33fc9928556..c665e1b44c3e 100644
--- a/metadata/md5-cache/dev-python/python-socks-1.2.4
+++ b/metadata/md5-cache/dev-python/python-socks-1.2.4
@@ -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/romis2012/python-socks/archive/v1.2.4.tar.gz -> python-socks-1.2.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=368f1230fe0774fad9ddfc54d2f97fe2
diff --git a/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1 b/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
index 3d0b46a7b30f..4493d5ef908d 100644
--- a/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
+++ b/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ojarva/python-sshpubkeys/archive/3.3.1.tar.gz -> python-sshpubkeys-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c0c58cd695a8fdc7d67a013f3915f69
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.16 b/metadata/md5-cache/dev-python/python-stdnum-1.16
index 4c77a11fc345..b4f52f520f6b 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.16
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.16
@@ -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-stdnum/python-stdnum-1.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ef517b3817b5f64ede474db2398e118
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.10.1 b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
index 48db3d281b46..225462fdfcb8 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a7aaea6378a477faea7263e44cd8532
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.12.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.12.0
new file mode 100644
index 000000000000..f65fc2c633c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.12.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-keystoneclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings to the OpenStack Object Storage API
+EAPI=7
+HOMEPAGE=https://launchpad.net/python-swiftclient
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.12.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2e47db28e037774879312db40e84888c
diff --git a/metadata/md5-cache/dev-python/python-systemd-234 b/metadata/md5-cache/dev-python/python-systemd-234
index 295ad5883f17..3817632e00e3 100644
--- a/metadata/md5-cache/dev-python/python-systemd-234
+++ b/metadata/md5-cache/dev-python/python-systemd-234
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v234.tar.gz -> python-systemd-234.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=566bc4a635dc95eb5af1eea60a39bb33
diff --git a/metadata/md5-cache/dev-python/python-utils-2.5.6 b/metadata/md5-cache/dev-python/python-utils-2.5.6
index c2b99fd1b1cb..43de3d5d7ce1 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.5.6
+++ b/metadata/md5-cache/dev-python/python-utils-2.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.5.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ca5905b32766bfc76b4396a61f35762
diff --git a/metadata/md5-cache/dev-python/python-varlink-30.3.1 b/metadata/md5-cache/dev-python/python-varlink-30.3.1
index 6c55efbfe8e6..e4a005e7b695 100644
--- a/metadata/md5-cache/dev-python/python-varlink-30.3.1
+++ b/metadata/md5-cache/dev-python/python-varlink-30.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/python/archive/30.3.1.tar.gz -> python-varlink-30.3.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=978fa33be0d9525957035ff2b5be475d
diff --git a/metadata/md5-cache/dev-python/python-vlc-3.0.12118 b/metadata/md5-cache/dev-python/python-vlc-3.0.12118
index 28f45c55f52c..0cc79be46c3a 100644
--- a/metadata/md5-cache/dev-python/python-vlc-3.0.12118
+++ b/metadata/md5-cache/dev-python/python-vlc-3.0.12118
@@ -10,5 +10,5 @@ RDEPEND=media-video/vlc python_targets_python3_8? ( dev-lang/python:3.8 ) python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-vlc/python-vlc-3.0.12118.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a67cfdebd78d19e57e0fdaae6e1fa9b
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.31 b/metadata/md5-cache/dev-python/python-xlib-0.31
index 7d2bb3bbc76a..f4f29b2f2746 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.31
+++ b/metadata/md5-cache/dev-python/python-xlib-0.31
@@ -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/python-xlib/python-xlib/releases/download/0.31/python-xlib-0.31.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=2534bd2d8fb492cfd78b6c7a4929ae3e
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 6341af006e4f..98b131a2084e 100644
--- a/metadata/md5-cache/dev-python/python-xmlsec-1.3.11
+++ b/metadata/md5-cache/dev-python/python-xmlsec-1.3.11
@@ -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/mehcode/python-xmlsec/archive/1.3.11.tar.gz -> python-xmlsec-1.3.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e33af887dec05a26caad55454daa13c7
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
index d99cb1679b72..266ae56f6914 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
@@ -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/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcc69522de7f658ef4d02b7999892b4a
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
index eca596f8bc05..bd1e094b00a7 100644
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.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/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f0e96ed66cd5d49d343c9d7138a440a
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 61efee20b79d..caefb96f7852 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.4
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/lxc python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=290ecec85a3c670777d2d038b0792c4f
diff --git a/metadata/md5-cache/dev-python/python3-openid-3.2.0 b/metadata/md5-cache/dev-python/python3-openid-3.2.0
index 61b4526121db..7999de81e784 100644
--- a/metadata/md5-cache/dev-python/python3-openid-3.2.0
+++ b/metadata/md5-cache/dev-python/python3-openid-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python3-openid/python3-openid-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87c5b45fd67ddecbdf741db9ae7c46b3
diff --git a/metadata/md5-cache/dev-python/python3-saml-1.11.0 b/metadata/md5-cache/dev-python/python3-saml-1.11.0
index 8faf77278851..21054268c5a3 100644
--- a/metadata/md5-cache/dev-python/python3-saml-1.11.0
+++ b/metadata/md5-cache/dev-python/python3-saml-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/onelogin/python3-saml/archive/v1.11.0.tar.gz -> python3-saml-1.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da8cf30bde3c414392d4f1fd9b2aa31a
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.5.1 b/metadata/md5-cache/dev-python/pythondialog-3.5.1
index 17fd8d2d8ee5..fad26e828b3c 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.5.1
+++ b/metadata/md5-cache/dev-python/pythondialog-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog/3.5.1/python3-pythondialog-3.5.1.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44de1902766a3e3079b26a0e13ebfe99
diff --git a/metadata/md5-cache/dev-python/pythran-0.10.0 b/metadata/md5-cache/dev-python/pythran-0.10.0
index 2a9ad6628328..06a40c05760d 100644
--- a/metadata/md5-cache/dev-python/pythran-0.10.0
+++ b/metadata/md5-cache/dev-python/pythran-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.10.0.tar.gz -> pythran-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=808fafbf9d83bd0dcb9615389fe0d790
diff --git a/metadata/md5-cache/dev-python/pythran-0.9.12_p1 b/metadata/md5-cache/dev-python/pythran-0.9.12_p1
index 14d265b61f2e..f44f38cc5f05 100644
--- a/metadata/md5-cache/dev-python/pythran-0.9.12_p1
+++ b/metadata/md5-cache/dev-python/pythran-0.9.12_p1
@@ -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/serge-sans-paille/pythran/archive/0.9.12.post1.tar.gz -> pythran-0.9.12.post1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=808fafbf9d83bd0dcb9615389fe0d790
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 0a90ab3bbe6c..07d015ee4e6f 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2-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/pytidylib/pytidylib-0.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6d82b838b3dbd64a3856281a1e2e4752
diff --git a/metadata/md5-cache/dev-python/pytimeparse-1.1.8 b/metadata/md5-cache/dev-python/pytimeparse-1.1.8
index 1ffae661d323..33f62bc60570 100644
--- a/metadata/md5-cache/dev-python/pytimeparse-1.1.8
+++ b/metadata/md5-cache/dev-python/pytimeparse-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytimeparse/pytimeparse-1.1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb2960dda2de312b70c282d8e75c391d
diff --git a/metadata/md5-cache/dev-python/pytools-2021.2.8 b/metadata/md5-cache/dev-python/pytools-2021.2.8
index 90a85a474998..1df219b1bd9d 100644
--- a/metadata/md5-cache/dev-python/pytools-2021.2.8
+++ b/metadata/md5-cache/dev-python/pytools-2021.2.8
@@ -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/pytools/pytools-2021.2.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=391e431c153f38e062dfd9dfdc42848e
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index 4b4fb09619e6..7774dacec9f0 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10e44ec973d661f2af76cd0af6abc997
diff --git a/metadata/md5-cache/dev-python/pytrie-0.4.0 b/metadata/md5-cache/dev-python/pytrie-0.4.0
index 21bacf685098..9b60580cc2e4 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.4.0
+++ b/metadata/md5-cache/dev-python/pytrie-0.4.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/PyTrie/PyTrie-0.4.0.tar.gz -> pytrie-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb44682ceeeef1a27eaf27599dac1e28
diff --git a/metadata/md5-cache/dev-python/pytz-2021.1 b/metadata/md5-cache/dev-python/pytz-2021.1
index c7064b0e00f1..795ef15f001b 100644
--- a/metadata/md5-cache/dev-python/pytz-2021.1
+++ b/metadata/md5-cache/dev-python/pytz-2021.1
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2021.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01c0c33ef588f9903300ae3f30df017e
diff --git a/metadata/md5-cache/dev-python/pytzdata-2020.1-r1 b/metadata/md5-cache/dev-python/pytzdata-2020.1-r1
index 8ab3d3b49b78..88b00030432e 100644
--- a/metadata/md5-cache/dev-python/pytzdata-2020.1-r1
+++ b/metadata/md5-cache/dev-python/pytzdata-2020.1-r1
@@ -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/sdispater/pytzdata/archive/2020.1.tar.gz -> pytzdata-2020.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=354ded0d264466309a77e41d84ca6023
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1 b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
index adb21bbb667b..f6d2b1c557af 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53a59fec510ab72b3a49884b0814fdb8
diff --git a/metadata/md5-cache/dev-python/pyudev-0.22.0 b/metadata/md5-cache/dev-python/pyudev-0.22.0
index 224576b17e23..cb7c81258c39 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.22.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.22.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.22.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1104e2de0fc9ef44985dbeb7dad55c4
diff --git a/metadata/md5-cache/dev-python/pyusb-1.2.1 b/metadata/md5-cache/dev-python/pyusb-1.2.1
index d607d06ab4e9..d351ac6a8523 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.2.1
+++ b/metadata/md5-cache/dev-python/pyusb-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=virtual/libusb:= python_targets_python3_8? ( dev-lang/python:3.8 ) pytho
 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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff1eb805cffb1b6bfabd246c438667a8
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2 b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
index 926951634a80..c0b6a05f33b3 100644
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
+++ b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/2.2.tar.gz -> PyVirtualDisplay-2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb38cf4decf1d11102ce4ccd697c5991
diff --git a/metadata/md5-cache/dev-python/pywavelets-1.1.1 b/metadata/md5-cache/dev-python/pywavelets-1.1.1
index ecab45414ecc..b8cf31ba6ad2 100644
--- a/metadata/md5-cache/dev-python/pywavelets-1.1.1
+++ b/metadata/md5-cache/dev-python/pywavelets-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59e8ce620393a29d6d66fc778c353f43
diff --git a/metadata/md5-cache/dev-python/pywinrm-0.4.2 b/metadata/md5-cache/dev-python/pywinrm-0.4.2
index 69ece6407008..73d814e1215b 100644
--- a/metadata/md5-cache/dev-python/pywinrm-0.4.2
+++ b/metadata/md5-cache/dev-python/pywinrm-0.4.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/pywinrm/pywinrm-0.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92226f2ed9c08db6a6e474fbed2b3c9d
diff --git a/metadata/md5-cache/dev-python/pyx-0.15 b/metadata/md5-cache/dev-python/pyx-0.15
index 3f5a83b7b56c..b32db476c27c 100644
--- a/metadata/md5-cache/dev-python/pyx-0.15
+++ b/metadata/md5-cache/dev-python/pyx-0.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyx-project/pyx/archive/0.15.tar.gz -> pyx-0.15.gh.tar.gz test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eec83009cd2cae264908a3a9e58c1d3b
diff --git a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0 b/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
index 5dd00a7a631d..6c468ca05352 100644
--- a/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
+++ b/metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gfairchild/pyxDamerauLevenshtein/archive/v1.7.0.tar.gz -> pyxDamerauLevenshtein-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1e1da75989fde1c4b95e186eba5b502
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.7.2 b/metadata/md5-cache/dev-python/pyxattr-0.7.2
index 2c625f4b10d0..1870f923872f 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyxattr-0.7.2
@@ -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/pyxattr/pyxattr-0.7.2.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd619a02839519b61847dea7ccd29f4b
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.27 b/metadata/md5-cache/dev-python/pyxdg-0.27
index f8708da63162..72ac7615d17b 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.27
+++ b/metadata/md5-cache/dev-python/pyxdg-0.27
@@ -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/takluyver/pyxdg/archive/rel-0.27.tar.gz -> pyxdg-rel-0.27.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=138235f3c42e616da6c3ec2b45bb3d98
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1 b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
index d1696c61b4c7..c615ee1cab71 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.3.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=https://github.com/yaml/pyyaml/archive/5.3.1.tar.gz -> pyyaml-5.3.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6de0ac304a33a7f3885a429c2fadd71
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.4.1 b/metadata/md5-cache/dev-python/pyyaml-5.4.1
index 34ef4c97947b..89b3db2d33b1 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.4.1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.4.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/yaml/pyyaml/archive/5.4.1.tar.gz -> pyyaml-5.4.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5650709d277a4fcd72ea0ff87f32e8d9
diff --git a/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1 b/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
index 94b0f984f859..ba19207dda77 100644
--- a/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
+++ b/metadata/md5-cache/dev-python/pyyaml_env_tag-0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyyaml_env_tag/pyyaml_env_tag-0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6c2325f7ebec9e5425d6246e05f2268
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.8 b/metadata/md5-cache/dev-python/pyzbar-0.1.8
index 4e53d0651670..b316e2cb102c 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.8
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.8
@@ -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/NaturalHistoryMuseum/pyzbar/archive/v0.1.8.tar.gz -> pyzbar-0.1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88bee3192a7c0044fb334e2ab641306d
diff --git a/metadata/md5-cache/dev-python/pyzmq-22.1.0 b/metadata/md5-cache/dev-python/pyzmq-22.1.0
index d540d03d8b48..c23cfe54b602 100644
--- a/metadata/md5-cache/dev-python/pyzmq-22.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-22.1.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/zeromq/pyzmq/archive/v22.1.0.tar.gz -> pyzmq-22.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab94c7f27574b723fe81882a89a13683
diff --git a/metadata/md5-cache/dev-python/pyzotero-1.4.25 b/metadata/md5-cache/dev-python/pyzotero-1.4.25
index 0d09ffeb8c3f..b9e1a7834672 100644
--- a/metadata/md5-cache/dev-python/pyzotero-1.4.25
+++ b/metadata/md5-cache/dev-python/pyzotero-1.4.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/urschrei/pyzotero/archive/v1.4.25.tar.gz -> pyzotero-1.4.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=248a7ca3d768871b5194acb0c2731814
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 8f573f96b83f..fa3d63af0762 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 7a1cc5c6e786..99158372b435 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74a17c6902adb494b4629c64c134fae9
diff --git a/metadata/md5-cache/dev-python/qrcode-7.2 b/metadata/md5-cache/dev-python/qrcode-7.2
deleted file mode 100644
index f9c7dbf32468..000000000000
--- a/metadata/md5-cache/dev-python/qrcode-7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=QR Code generator on top of PIL
-EAPI=8
-HOMEPAGE=https://pypi.org/project/qrcode/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qrcode/qrcode-7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9206afde4c37c1593d21ee2bd9ee23ce
diff --git a/metadata/md5-cache/dev-python/qrcode-7.3 b/metadata/md5-cache/dev-python/qrcode-7.3
index 50170ed386a4..c35a94d21166 100644
--- a/metadata/md5-cache/dev-python/qrcode-7.3
+++ b/metadata/md5-cache/dev-python/qrcode-7.3
@@ -4,12 +4,12 @@ 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a5a400975d0453b281732e3321131b0
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9206afde4c37c1593d21ee2bd9ee23ce
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.1.10 b/metadata/md5-cache/dev-python/qstylizer-0.1.10
index 6a58047322b3..5a20ae4d83b8 100644
--- a/metadata/md5-cache/dev-python/qstylizer-0.1.10
+++ b/metadata/md5-cache/dev-python/qstylizer-0.1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.1.10.tar.gz -> qstylizer-0.1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=851661c83e5cab2791f545aa7acaa63d
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.0 b/metadata/md5-cache/dev-python/qstylizer-0.2.0
index 209d959ab3de..3a74a4134385 100644
--- a/metadata/md5-cache/dev-python/qstylizer-0.2.0
+++ b/metadata/md5-cache/dev-python/qstylizer-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.2.0.tar.gz -> qstylizer-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=decc22d1a050490900001846e5f19529
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.1 b/metadata/md5-cache/dev-python/qstylizer-0.2.1
index 9b6b859b089e..45269154e667 100644
--- a/metadata/md5-cache/dev-python/qstylizer-0.2.1
+++ b/metadata/md5-cache/dev-python/qstylizer-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.2.1.tar.gz -> qstylizer-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbcffeaec96a923f9749e30d1bad6eb5
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.0.3 b/metadata/md5-cache/dev-python/qtawesome-1.0.3
index bff5aecac2e1..a787892c0daf 100644
--- a/metadata/md5-cache/dev-python/qtawesome-1.0.3
+++ b/metadata/md5-cache/dev-python/qtawesome-1.0.3
@@ -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/Q/QtAwesome/QtAwesome-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=7328f1ae2bab8a496e2ad8c8469bcd1b
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.1.1 b/metadata/md5-cache/dev-python/qtconsole-5.1.1
index 48272ca2971c..143b813fdbd3 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.1.1
+++ b/metadata/md5-cache/dev-python/qtconsole-5.1.1
@@ -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/q/qtconsole/qtconsole-5.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13cdff4f8790d0643ea0557a667546aa
diff --git a/metadata/md5-cache/dev-python/qtsass-0.3.0 b/metadata/md5-cache/dev-python/qtsass-0.3.0
index 9b62b3ac830f..2ff4dcf21165 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.3.0
+++ b/metadata/md5-cache/dev-python/qtsass-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/qtsass/archive/v0.3.0.tar.gz -> qtsass-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c7c2bceca25a27da435287035327384
diff --git a/metadata/md5-cache/dev-python/quantities-0.12.5 b/metadata/md5-cache/dev-python/quantities-0.12.5
index fb90035d84bf..5137cc9f507c 100644
--- a/metadata/md5-cache/dev-python/quantities-0.12.5
+++ b/metadata/md5-cache/dev-python/quantities-0.12.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://github.com/python-quantities/python-quantities/archive/v0.12.5.tar.gz -> python-quantities-0.12.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49d5da82797a567bcabe653cd2944861
diff --git a/metadata/md5-cache/dev-python/radon-4.5.2 b/metadata/md5-cache/dev-python/radon-4.5.2
index be055023ce84..f9f1a9d134c3 100644
--- a/metadata/md5-cache/dev-python/radon-4.5.2
+++ b/metadata/md5-cache/dev-python/radon-4.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-4.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ffc5eef38f538da75900bc5d17bea1f8
diff --git a/metadata/md5-cache/dev-python/radon-5.0.1 b/metadata/md5-cache/dev-python/radon-5.0.1
index 3fc523953bb4..d704c950d426 100644
--- a/metadata/md5-cache/dev-python/radon-5.0.1
+++ b/metadata/md5-cache/dev-python/radon-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16fa76b76672c994628efbd46e047fd8
diff --git a/metadata/md5-cache/dev-python/radon-5.1.0 b/metadata/md5-cache/dev-python/radon-5.1.0
index d9134222eae2..bbbaf52d8ecd 100644
--- a/metadata/md5-cache/dev-python/radon-5.1.0
+++ b/metadata/md5-cache/dev-python/radon-5.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/r/radon/radon-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7521587a0e2d5eaf62e7811f62277345
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r2 b/metadata/md5-cache/dev-python/raet-0.6.8-r2
index 9c651382d73c..371c3d99721b 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r2
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3189d329bfc78f3716f32e87c6e2c39d
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1-r1 b/metadata/md5-cache/dev-python/random2-1.0.1-r1
index d62e5d4668e8..bfc0ca41c893 100644
--- a/metadata/md5-cache/dev-python/random2-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/random2-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e15f74c4daa3999dbee52533d558ff1d
diff --git a/metadata/md5-cache/dev-python/rarfile-3.1 b/metadata/md5-cache/dev-python/rarfile-3.1
index 66b4950b5ffb..7cc8a805cc94 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.1
+++ b/metadata/md5-cache/dev-python/rarfile-3.1
@@ -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/r/rarfile/rarfile-3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8379545e9cc9d4755137c55d3e3c4c0c
diff --git a/metadata/md5-cache/dev-python/ratelimit-2.2.1 b/metadata/md5-cache/dev-python/ratelimit-2.2.1
index 25a1866531af..674c9bbf21f7 100644
--- a/metadata/md5-cache/dev-python/ratelimit-2.2.1
+++ b/metadata/md5-cache/dev-python/ratelimit-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v2.2.1.tar.gz -> ratelimit-2.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a300046c3e783a89c26a9952d3725a59
diff --git a/metadata/md5-cache/dev-python/rcssmin-1.0.6 b/metadata/md5-cache/dev-python/rcssmin-1.0.6
index 385607777447..7ec9012ba790 100644
--- a/metadata/md5-cache/dev-python/rcssmin-1.0.6
+++ b/metadata/md5-cache/dev-python/rcssmin-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rcssmin/rcssmin-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9365e9c56c5dd1199b79056d778f423e
diff --git a/metadata/md5-cache/dev-python/rdflib-5.0.0 b/metadata/md5-cache/dev-python/rdflib-5.0.0
index 6fad100a2c0c..cae315311f27 100644
--- a/metadata/md5-cache/dev-python/rdflib-5.0.0
+++ b/metadata/md5-cache/dev-python/rdflib-5.0.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/rdflib/rdflib-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5524a4ccfa834c4bd68e312ec0463363
diff --git a/metadata/md5-cache/dev-python/rdflib-6.0.1 b/metadata/md5-cache/dev-python/rdflib-6.0.1
index 7a53be0036fa..8fe31730999c 100644
--- a/metadata/md5-cache/dev-python/rdflib-6.0.1
+++ b/metadata/md5-cache/dev-python/rdflib-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-6.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=762421f249e71be6aecf756a637ce186
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 f5e4b9137b21..e8464aa27c65 100644
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0
+++ b/metadata/md5-cache/dev-python/re-assert-1.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/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cdaa85dc86754a87b978c08ce15ed174
diff --git a/metadata/md5-cache/dev-python/readme_renderer-29.0 b/metadata/md5-cache/dev-python/readme_renderer-29.0
index 2526a769e7e1..8e6d847b8f72 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-29.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-29.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-29.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0ab22fb26df41c48c784e6ea425df79
diff --git a/metadata/md5-cache/dev-python/readme_renderer-30.0 b/metadata/md5-cache/dev-python/readme_renderer-30.0
new file mode 100644
index 000000000000..2709fa91abfc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/readme_renderer-30.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.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=a library for rendering "readme" descriptions for Warehouse
+EAPI=8
+HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
+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=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.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/r/readme_renderer/readme_renderer-30.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4809dbd457e4373e68c939bde0c441f2
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
index f4d272d0e493..eac631b1018b 100644
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=Code specific for Read the Docs and Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/jinja-2.9[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(-)?] 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(-)?]
@@ -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/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e3b9a42d7e79854cf38e399441c587dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3b7313194547f2e26b07445e23db5193
diff --git a/metadata/md5-cache/dev-python/rebulk-3.0.1 b/metadata/md5-cache/dev-python/rebulk-3.0.1
index d68f6a5db546..a06d76cbde69 100644
--- a/metadata/md5-cache/dev-python/rebulk-3.0.1
+++ b/metadata/md5-cache/dev-python/rebulk-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toilal/rebulk/archive/v3.0.1.tar.gz -> rebulk-3.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9bbf4f90d707fe62675ff160af93b10
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.7.1 b/metadata/md5-cache/dev-python/recommonmark-0.7.1
index 59f328ed9c6d..f4202702ca07 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.7.1
+++ b/metadata/md5-cache/dev-python/recommonmark-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/0.7.1.tar.gz -> recommonmark-0.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4494a7cd31082fdd8145e8196ec0554
diff --git a/metadata/md5-cache/dev-python/redis-py-3.5.3 b/metadata/md5-cache/dev-python/redis-py-3.5.3
index 11d9ffc987dc..ed8eaeb7597a 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.5.3
+++ b/metadata/md5-cache/dev-python/redis-py-3.5.3
@@ -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/r/redis/redis-3.5.3.tar.gz -> redis-py-3.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cfc8e06c5fe93d3bcf803cd24775c985
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.5.4 b/metadata/md5-cache/dev-python/reedsolomon-1.5.4
index cd5bb2c43a60..572c75c9d30c 100644
--- a/metadata/md5-cache/dev-python/reedsolomon-1.5.4
+++ b/metadata/md5-cache/dev-python/reedsolomon-1.5.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/tomerfiliba/reedsolomon/archive/v1.5.4.tar.gz -> reedsolomon-1.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe64e9be8bc10943179b3888691afae4
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1-r1 b/metadata/md5-cache/dev-python/reflink-0.2.1-r1
index db068a6982cc..a5d4ce9262b0 100644
--- a/metadata/md5-cache/dev-python/reflink-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/reflink-0.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7bc604f3b5b388a04bd5fc46a0610c9
diff --git a/metadata/md5-cache/dev-python/regex-2021.7.6 b/metadata/md5-cache/dev-python/regex-2021.7.6
index c26c5dc97787..042be666f5b2 100644
--- a/metadata/md5-cache/dev-python/regex-2021.7.6
+++ b/metadata/md5-cache/dev-python/regex-2021.7.6
@@ -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/r/regex/regex-2021.7.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a7eea995b5e95d0c52dc0bebd57386a
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.28 b/metadata/md5-cache/dev-python/regex-2021.8.28
index ecf56e614d9f..0898e517d1e9 100644
--- a/metadata/md5-cache/dev-python/regex-2021.8.28
+++ b/metadata/md5-cache/dev-python/regex-2021.8.28
@@ -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/r/regex/regex-2021.8.28.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a7bb1f7b2c56ab1b3e920e496d2acf2
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.3 b/metadata/md5-cache/dev-python/regex-2021.8.3
index d00912048f4b..8a36633f69c5 100644
--- a/metadata/md5-cache/dev-python/regex-2021.8.3
+++ b/metadata/md5-cache/dev-python/regex-2021.8.3
@@ -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/r/regex/regex-2021.8.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f170f34076eaba167e48e400905e1f7
diff --git a/metadata/md5-cache/dev-python/regex-2021.9.24 b/metadata/md5-cache/dev-python/regex-2021.9.24
index a8060c6bddba..8b25b955c882 100644
--- a/metadata/md5-cache/dev-python/regex-2021.9.24
+++ b/metadata/md5-cache/dev-python/regex-2021.9.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/r/regex/regex-2021.9.24.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a7bb1f7b2c56ab1b3e920e496d2acf2
diff --git a/metadata/md5-cache/dev-python/regex-2021.9.30 b/metadata/md5-cache/dev-python/regex-2021.9.30
new file mode 100644
index 000000000000..69dd7bbdab07
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.9.30
@@ -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.9.30.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7bb1f7b2c56ab1b3e920e496d2acf2
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.6-r2 b/metadata/md5-cache/dev-python/rencode-1.0.6-r2
index 3e5bfc38c65b..376c8962e0e3 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.6-r2
+++ b/metadata/md5-cache/dev-python/rencode-1.0.6-r2
@@ -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/aresch/rencode/archive/v1.0.6.tar.gz -> rencode-1.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70c193482fb2a862b8d767d4b3ed643c
diff --git a/metadata/md5-cache/dev-python/reno-3.4.0 b/metadata/md5-cache/dev-python/reno-3.4.0
index d3875cff9d4d..6e9fc63640c6 100644
--- a/metadata/md5-cache/dev-python/reno-3.4.0
+++ b/metadata/md5-cache/dev-python/reno-3.4.0
@@ -1,15 +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(-)?]
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/testtools-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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=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
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 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 )
+RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2.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/r/reno/reno-3.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adea85f63ae6f55690de41302b9c6bc6
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=04bef00c718565896d6bb4b7f817f301
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.1 b/metadata/md5-cache/dev-python/reportlab-3.6.1
index 564e09861b74..8a193a51bd35 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.6.1
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.1
@@ -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/r/reportlab/reportlab-3.6.1.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a5126f38a734bb3cfbd5b089c5b8b08
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1 b/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
index 27b0cf776d26..c64edd5219b9 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.7-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/repoze/repoze.lru/archive/0.7.tar.gz -> repoze-lru-0.7-r1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5439dbbf1e839d319b1a889e4a1c7d3c
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
index 5a12703089e4..03acb5b2c7a5 100644
--- a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-repoze[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79eefe8e0427325a123db7c73e2e29b2
diff --git a/metadata/md5-cache/dev-python/requests-2.25.1-r2 b/metadata/md5-cache/dev-python/requests-2.25.1-r2
index 07dacee5eb09..6c15947f3e1d 100644
--- a/metadata/md5-cache/dev-python/requests-2.25.1-r2
+++ b/metadata/md5-cache/dev-python/requests-2.25.1-r2
@@ -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/r/requests/requests-2.25.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=276abebdc7586fcd1658d88a93e80085
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index eda1d6a161a7..cf79513edf3e 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=093588a6befc514d9115e8f0bf6d82ab
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.4 b/metadata/md5-cache/dev-python/requests-cache-0.6.4
index 4dbd7819a6fa..3e91ca688a27 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.6.4
+++ b/metadata/md5-cache/dev-python/requests-cache-0.6.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/reclosedev/requests-cache/archive/v0.6.4.tar.gz -> requests-cache-0.6.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53b85d17d5d82d085bca133267bd665d
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.1 b/metadata/md5-cache/dev-python/requests-cache-0.7.1
index d48da940afaa..a1552da43ec9 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.1
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.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/reclosedev/requests-cache/archive/v0.7.1.tar.gz -> requests-cache-0.7.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed0f363f4eef42e1476b184181553bf1
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.2 b/metadata/md5-cache/dev-python/requests-cache-0.7.2
index 926d0eb06f90..b0ad7afa20e0 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.2
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.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/reclosedev/requests-cache/archive/v0.7.2.tar.gz -> requests-cache-0.7.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed0f363f4eef42e1476b184181553bf1
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.3 b/metadata/md5-cache/dev-python/requests-cache-0.7.3
index 69ef231dd9a6..bb6a8ee3f450 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.3
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.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/reclosedev/requests-cache/archive/v0.7.3.tar.gz -> requests-cache-0.7.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40a2bc047ea4a6fd19d3e9b9919abcfc
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.4 b/metadata/md5-cache/dev-python/requests-cache-0.7.4
index 842ca68f2d88..afe9fd8f89c5 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.4
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Persistent cache for requests library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.4.tar.gz -> requests-cache-0.7.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fc757d6c25a9273544d2e32701bebe0a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a509bff7c51ec61fd2f443d71acbcdfe
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.5 b/metadata/md5-cache/dev-python/requests-cache-0.7.5
index 717d5872d45c..303db0402dcd 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.5
+++ b/metadata/md5-cache/dev-python/requests-cache-0.7.5
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Persistent cache for requests library
 EAPI=8
@@ -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/reclosedev/requests-cache/archive/v0.7.5.tar.gz -> requests-cache-0.7.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3313036235eebf883f729e7aea5cf4cf
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65f0ff92f0e9488a9f7fe1f4fd79016c
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.8.0 b/metadata/md5-cache/dev-python/requests-cache-0.8.0
index 169c10181fce..11d91e6c2d13 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.8.0
+++ b/metadata/md5-cache/dev-python/requests-cache-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.8.0.tar.gz -> requests-cache-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3313036235eebf883f729e7aea5cf4cf
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.8.1 b/metadata/md5-cache/dev-python/requests-cache-0.8.1
deleted file mode 100644
index ce6876076012..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.8.1.tar.gz -> requests-cache-0.8.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3313036235eebf883f729e7aea5cf4cf
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1 b/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1
new file mode 100644
index 000000000000..cfe4520174cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-httpbin[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(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[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(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Persistent cache for requests library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[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(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.8.1.tar.gz -> requests-cache-0.8.1.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c7b79d89e6d055114e44e7ddf90637fa
diff --git a/metadata/md5-cache/dev-python/requests-credssp-1.2.0 b/metadata/md5-cache/dev-python/requests-credssp-1.2.0
index 63475f246ea8..8725e5b0e29f 100644
--- a/metadata/md5-cache/dev-python/requests-credssp-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-credssp-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jborean93/requests-credssp/archive/refs/tags/v1.2.0.tar.gz -> requests-credssp-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db5d24dc654e0ef14b9e2bc8c9101212
diff --git a/metadata/md5-cache/dev-python/requests-file-1.4.3 b/metadata/md5-cache/dev-python/requests-file-1.4.3
index fd5498cf5741..6498c4296500 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.4.3
+++ b/metadata/md5-cache/dev-python/requests-file-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-file/requests-file-1.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f7418977d327b1cb681225c6bb5df9e
diff --git a/metadata/md5-cache/dev-python/requests-file-1.5.1-r1 b/metadata/md5-cache/dev-python/requests-file-1.5.1-r1
index b3fe55c51507..84defc91eef4 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/requests-file-1.5.1-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/r/requests-file/requests-file-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51ef3caab391b3d708a3d123b45a1da1
diff --git a/metadata/md5-cache/dev-python/requests-futures-1.0.0 b/metadata/md5-cache/dev-python/requests-futures-1.0.0
index 26cabc1608de..7eb2158d6808 100644
--- a/metadata/md5-cache/dev-python/requests-futures-1.0.0
+++ b/metadata/md5-cache/dev-python/requests-futures-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-futures/requests-futures-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86ff4809c5367c16659e799bc6ff8003
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1 b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
index cdb24b94c735..d77d5a9957e6 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.12.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=https://github.com/requests/requests-kerberos/archive/v0.12.0.tar.gz -> requests-kerberos-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3dfc7e0ea242fcaa129bcedef4b019fc
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.9.3 b/metadata/md5-cache/dev-python/requests-mock-1.9.3
index cce656057f7a..98d0712c3cc5 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.9.3
+++ b/metadata/md5-cache/dev-python/requests-mock-1.9.3
@@ -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/r/requests-mock/requests-mock-1.9.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49e52fd8f00e5cdfea429762bda5a96b
diff --git a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1 b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
index c062a732e27f..311e3c795d10 100644
--- a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_ntlm/requests_ntlm-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db4c4debd1c339e790fa443ac24bbb76
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0 b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
index 7a6b81e16e09..f7a2dcb1c07a 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.3.0.tar.gz -> requests-oauthlib-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=938d8def78d84b2922da0eebec3ff986
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index 18556d93aa90..49f43fd4f58c 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -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/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cd7c9cc1753f7980716edfedcc81546
diff --git a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0 b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
index 30114583d1e6..f6f9bd84779f 100644
--- a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+++ b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.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/r/requests-unixsocket/requests-unixsocket-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c4d4cf0d77363bfd61d810b4adfd804
diff --git a/metadata/md5-cache/dev-python/requests_download-0.1.2 b/metadata/md5-cache/dev-python/requests_download-0.1.2
index effad4aa5726..8203fef4d3df 100644
--- a/metadata/md5-cache/dev-python/requests_download-0.1.2
+++ b/metadata/md5-cache/dev-python/requests_download-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/takluyver/requests_download/archive/0.1.2.tar.gz -> requests_download-0.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd8522af00a4498c6bb0f84bd6c98fdb
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.10 b/metadata/md5-cache/dev-python/requests_pkcs12-1.10
index 51653ccd8afc..6e6c432901b6 100644
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.10
+++ b/metadata/md5-cache/dev-python/requests_pkcs12-1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18726fe635df47af6c2aee10a3e9d419
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.7 b/metadata/md5-cache/dev-python/requests_pkcs12-1.7
index 3a7f5d8266c8..8317d604a4f4 100644
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.7
+++ b/metadata/md5-cache/dev-python/requests_pkcs12-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c07eb6ffe5a2237ad9fb09de4014996d
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 7b38fa3ee99e..cffc0286234c 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -1,15 +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=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=7
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
-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=Apache-2.0
-RDEPEND=>=dev-python/pbr-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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9455d2a16e3bd8a1651509bbf9fa1b92
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a8ae63709eff7da3a7f956022acade30
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.5.4 b/metadata/md5-cache/dev-python/resolvelib-0.5.4
index c877a55b64f8..349cc6ccd20f 100644
--- a/metadata/md5-cache/dev-python/resolvelib-0.5.4
+++ b/metadata/md5-cache/dev-python/resolvelib-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/resolvelib/resolvelib-0.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2bc81f4dce3735dd1f497931138c474
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.7.1 b/metadata/md5-cache/dev-python/resolvelib-0.7.1
index 8eb4e4f87fee..3230e8dcb4cb 100644
--- a/metadata/md5-cache/dev-python/resolvelib-0.7.1
+++ b/metadata/md5-cache/dev-python/resolvelib-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sarugaku/resolvelib/archive/0.7.1.tar.gz -> resolvelib-0.7.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=782def889c33eb8ed8df6c6543165601
diff --git a/metadata/md5-cache/dev-python/responses-0.13.4 b/metadata/md5-cache/dev-python/responses-0.13.4
index 80c10e7e71ec..86cdb4c22d25 100644
--- a/metadata/md5-cache/dev-python/responses-0.13.4
+++ b/metadata/md5-cache/dev-python/responses-0.13.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/r/responses/responses-0.13.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b16643b7e445ab4b97ee995c8be6a46f
diff --git a/metadata/md5-cache/dev-python/responses-0.14.0 b/metadata/md5-cache/dev-python/responses-0.14.0
index 6fcd5c6d227d..a9c635a65bc6 100644
--- a/metadata/md5-cache/dev-python/responses-0.14.0
+++ b/metadata/md5-cache/dev-python/responses-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8ff24a78d54720e329450ab6cc34c9a
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
index db3c74918618..c2beb10a40db 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.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/r/restructuredtext_lint/restructuredtext_lint-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61588ce81df4cbcdba22f0c01cdf3199
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.1.1 b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
index f88cfe505add..ab65b76081e2 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.1.1
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.1.1.tar.gz -> retry-decorator-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0efeb3d974d3de2fc7f7af62423c91e9
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3 b/metadata/md5-cache/dev-python/retrying-1.3.3
index d9f4c538ac65..777f4b23e8b1 100644
--- a/metadata/md5-cache/dev-python/retrying-1.3.3
+++ b/metadata/md5-cache/dev-python/retrying-1.3.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/rholder/retrying/archive/v1.3.3.tar.gz -> retrying-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d0445212c4a77ad08f3d628c5887bbe
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4
index ee20c0ba7006..879be519d761 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.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=https://github.com/naimetti/rfc3339-validator/archive/v0.1.4.tar.gz -> rfc3339-validator-0.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f342af36719df56da414f49257202eb
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.5.0 b/metadata/md5-cache/dev-python/rfc3986-1.5.0
index 9351d872e469..546358d7a6d0 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.5.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab36acee8101452ef45243952ee3a8f2
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index e5b35024480c..3965545f486d 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.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/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e306fa827d163a4fa6173b67270cfa61
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index 2415bc334974..93f8d2efee30 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6a7fb1cae71a9a12146069374d2c459
diff --git a/metadata/md5-cache/dev-python/rich-10.10.0 b/metadata/md5-cache/dev-python/rich-10.10.0
index 556d1f12ab0c..2549dfc567ea 100644
--- a/metadata/md5-cache/dev-python/rich-10.10.0
+++ b/metadata/md5-cache/dev-python/rich-10.10.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.10.0.tar.gz -> rich-10.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f9b49cf70a53c1b01e0bb61e5c1e95d
diff --git a/metadata/md5-cache/dev-python/rich-10.11.0 b/metadata/md5-cache/dev-python/rich-10.11.0
index 7bd06f6176dd..894546f41ba4 100644
--- a/metadata/md5-cache/dev-python/rich-10.11.0
+++ b/metadata/md5-cache/dev-python/rich-10.11.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.11.0.tar.gz -> rich-10.11.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f9b49cf70a53c1b01e0bb61e5c1e95d
diff --git a/metadata/md5-cache/dev-python/rjsmin-1.1.0 b/metadata/md5-cache/dev-python/rjsmin-1.1.0
index d0e92e32dc4f..3784785272b4 100644
--- a/metadata/md5-cache/dev-python/rjsmin-1.1.0
+++ b/metadata/md5-cache/dev-python/rjsmin-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ndparker/rjsmin/archive/1.1.0.tar.gz -> rjsmin-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6cfb31928ad6c5272bf40f0fc17df8c
diff --git a/metadata/md5-cache/dev-python/robot-detection-0.4.0 b/metadata/md5-cache/dev-python/robot-detection-0.4.0
index 0f1f49eb4fdc..7d609d514461 100644
--- a/metadata/md5-cache/dev-python/robot-detection-0.4.0
+++ b/metadata/md5-cache/dev-python/robot-detection-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rory/robot-detection/archive/v0.4.0.tar.gz -> robot-detection-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=563fc89dc48045a04c1363d33337c1d6
diff --git a/metadata/md5-cache/dev-python/roman-3.3 b/metadata/md5-cache/dev-python/roman-3.3
index 89a66147d569..1d551fbe0a4c 100644
--- a/metadata/md5-cache/dev-python/roman-3.3
+++ b/metadata/md5-cache/dev-python/roman-3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e8040b4540dc1686346eaaea02f8087
diff --git a/metadata/md5-cache/dev-python/rope-0.19.0 b/metadata/md5-cache/dev-python/rope-0.19.0
index b2396e3e8e07..db4f032b6f0c 100644
--- a/metadata/md5-cache/dev-python/rope-0.19.0
+++ b/metadata/md5-cache/dev-python/rope-0.19.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/r/rope/rope-0.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64cbbefe65548c16ba838fafff4dec2e
diff --git a/metadata/md5-cache/dev-python/rope-0.20.0 b/metadata/md5-cache/dev-python/rope-0.20.0
index 516d352144d5..9a7321723ae6 100644
--- a/metadata/md5-cache/dev-python/rope-0.20.0
+++ b/metadata/md5-cache/dev-python/rope-0.20.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/r/rope/rope-0.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93e7a6c44f2eccdb9e6d3fc47564d0d6
diff --git a/metadata/md5-cache/dev-python/rope-0.20.1 b/metadata/md5-cache/dev-python/rope-0.20.1
index 2e6cf4233674..ef5f18791961 100644
--- a/metadata/md5-cache/dev-python/rope-0.20.1
+++ b/metadata/md5-cache/dev-python/rope-0.20.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/r/rope/rope-0.20.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93e7a6c44f2eccdb9e6d3fc47564d0d6
diff --git a/metadata/md5-cache/dev-python/ropemode-0.5 b/metadata/md5-cache/dev-python/ropemode-0.5
index fb01f5bbd959..a8f02c62d966 100644
--- a/metadata/md5-cache/dev-python/ropemode-0.5
+++ b/metadata/md5-cache/dev-python/ropemode-0.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://github.com/python-rope/ropemode/archive/0.5.tar.gz -> ropemode-0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4fbbbcadad6a193c0f7f209e433b6ef
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.8.3 b/metadata/md5-cache/dev-python/rosdistro-0.8.3
index ff80ce808529..45fea14d0c6d 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.8.3
+++ b/metadata/md5-cache/dev-python/rosdistro-0.8.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/ros-infrastructure/rosdistro/archive/0.8.3.tar.gz -> rosdistro-0.8.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3176eab5ebc18b4be9c3b0f2573c440e
diff --git a/metadata/md5-cache/dev-python/rosdistro-9999 b/metadata/md5-cache/dev-python/rosdistro-9999
index a35a6fd31bc3..7ff332437a7d 100644
--- a/metadata/md5-cache/dev-python/rosdistro-9999
+++ b/metadata/md5-cache/dev-python/rosdistro-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3176eab5ebc18b4be9c3b0f2573c440e
diff --git a/metadata/md5-cache/dev-python/rospkg-1.3.0 b/metadata/md5-cache/dev-python/rospkg-1.3.0
index bbe8d2a59553..69977f94c29e 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.3.0
+++ b/metadata/md5-cache/dev-python/rospkg-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.3.0.tar.gz -> rospkg-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04434ca84e33304c662b756a45df338b
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index 30fbbe807309..905488bcfe46 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04434ca84e33304c662b756a45df338b
diff --git a/metadata/md5-cache/dev-python/routes-2.5.1 b/metadata/md5-cache/dev-python/routes-2.5.1
index a93083e5a4f7..f215d6d1f463 100644
--- a/metadata/md5-cache/dev-python/routes-2.5.1
+++ b/metadata/md5-cache/dev-python/routes-2.5.1
@@ -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/R/Routes/Routes-2.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3e8c22e4bd682e6a24de2d5e0958ec7
diff --git a/metadata/md5-cache/dev-python/rply-0.7.8 b/metadata/md5-cache/dev-python/rply-0.7.8
index d1873a64e61b..ee419b36abc4 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.8
+++ b/metadata/md5-cache/dev-python/rply-0.7.8
@@ -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/alex/rply/archive/v0.7.8.tar.gz -> rply-0.7.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2afba056ed408f6a103b61608ab6c58
diff --git a/metadata/md5-cache/dev-python/rpy-3.4.2 b/metadata/md5-cache/dev-python/rpy-3.4.2
index 76c9d6dc783d..8594b68abe5a 100644
--- a/metadata/md5-cache/dev-python/rpy-3.4.2
+++ b/metadata/md5-cache/dev-python/rpy-3.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-3.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e87c67fe5117f6b81d16986b69ac4ff
diff --git a/metadata/md5-cache/dev-python/rpyc-5.0.1 b/metadata/md5-cache/dev-python/rpyc-5.0.1
index e96811fee2f3..f2f2a0a0ded9 100644
--- a/metadata/md5-cache/dev-python/rpyc-5.0.1
+++ b/metadata/md5-cache/dev-python/rpyc-5.0.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/tomerfiliba-org/rpyc/archive/5.0.1.tar.gz -> rpyc-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=820452e8def0176b371b584063ab16e0
diff --git a/metadata/md5-cache/dev-python/rq-1.10 b/metadata/md5-cache/dev-python/rq-1.10
index 5697253d81cc..cfbb034fb5b1 100644
--- a/metadata/md5-cache/dev-python/rq-1.10
+++ b/metadata/md5-cache/dev-python/rq-1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.10.tar.gz -> rq-1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd0e540665f631fc15e83f939bf68792
diff --git a/metadata/md5-cache/dev-python/rq-1.9.0 b/metadata/md5-cache/dev-python/rq-1.9.0
index 850d503f96c5..ccd6fcc97c7f 100644
--- a/metadata/md5-cache/dev-python/rq-1.9.0
+++ b/metadata/md5-cache/dev-python/rq-1.9.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/rq/rq/archive/v1.9.0.tar.gz -> rq-1.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b10d8c1c7199112bb17e2915feeb5e8d
diff --git a/metadata/md5-cache/dev-python/rsa-4.7.2 b/metadata/md5-cache/dev-python/rsa-4.7.2
index 4e2b47387e1d..1800acc0f813 100644
--- a/metadata/md5-cache/dev-python/rsa-4.7.2
+++ b/metadata/md5-cache/dev-python/rsa-4.7.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/sybrenstuvel/python-rsa/archive/version-4.7.2.tar.gz -> python-rsa-version-4.7.2.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a7ff4557fcaf1539127b3418752f56b
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.2.0 b/metadata/md5-cache/dev-python/rst-linker-2.2.0
index c06cbbb7f48e..144ecd850186 100644
--- a/metadata/md5-cache/dev-python/rst-linker-2.2.0
+++ b/metadata/md5-cache/dev-python/rst-linker-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0df49ba7decc90751d3be118e37ab2e
diff --git a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1 b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
index 7b9d4d304a7e..6354d408f82c 100644
--- a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
+++ b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/RPi-Distro/RTIMULib/archive/V7.2.1.tar.gz -> RTIMULib-7.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4a8b448ce9ab3562cbe0ea5925ce3fc
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
index fb018d6b33fc..1d053fcf6170 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python3_8(-)?] dev-python/six[python_ta
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8422beec4d99caf4ca8fdf64c5d1982f
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0
index 17e65eb3d140..dab058779223 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.std.pathlib-0.8.0.tar.xz -> ruamel-std-pathlib-0.8.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9ad429e8c1ff15f06a1c566962685ed
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
index fe8db7bc1fc4..e7d70da6e147 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.10.tar.xz -> ruamel-yaml-0.17.10.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbd9c8e5f579d5f76fe8bcd2080678ba
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.15 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.15
index b3fb5f45e418..4c47c550fb11 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.15
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.15.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ac4d22ac47cc0afabdf834d91bf32c0
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.16 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.16
index bbe0c41d9c84..efa1e5857ce5 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.16
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.16.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ac4d22ac47cc0afabdf834d91bf32c0
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 e7294cd308b0..e23eca8e1998 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
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f1e8f17f8606f3f29f7929b3085d9cc
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.5.0 b/metadata/md5-cache/dev-python/s3transfer-0.5.0
index 507614b2e6c1..da0b5cecf38d 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.5.0
+++ b/metadata/md5-cache/dev-python/s3transfer-0.5.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/s/s3transfer/s3transfer-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d49a23ecc8da9084719316c404976a12
diff --git a/metadata/md5-cache/dev-python/sabyenc-4.0.2 b/metadata/md5-cache/dev-python/sabyenc-4.0.2
index 80c984dbeec8..97f0864ed0e4 100644
--- a/metadata/md5-cache/dev-python/sabyenc-4.0.2
+++ b/metadata/md5-cache/dev-python/sabyenc-4.0.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/sabnzbd/sabyenc/archive/v4.0.2.tar.gz -> sabyenc-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e1ce947bb04b821c3c004a2b64d12ab
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.5 b/metadata/md5-cache/dev-python/sarge-0.1.5
index bf7b65002a15..0f037b707581 100644
--- a/metadata/md5-cache/dev-python/sarge-0.1.5
+++ b/metadata/md5-cache/dev-python/sarge-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sarge/sarge-0.1.5.post0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6031722593fdfd041734faf5bb5df25
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.6 b/metadata/md5-cache/dev-python/sarge-0.1.6
index 60200ae26469..ec58fb9ac586 100644
--- a/metadata/md5-cache/dev-python/sarge-0.1.6
+++ b/metadata/md5-cache/dev-python/sarge-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://bitbucket.org/vinay.sajip/sarge/get/0.1.6.tar.gz -> sarge-0.1.6.bb.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7622ff03b9737f335f836ce05bfd26e7
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r2 b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
index e3cc3205c0ae..404a49d6eded 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r2
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43256c640fd91b1f0dd5b51ed249ae3a
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.12.0 b/metadata/md5-cache/dev-python/scikit-build-0.12.0
index acf948c6c6fd..0985e9767c34 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.12.0
+++ b/metadata/md5-cache/dev-python/scikit-build-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0414e2e4504cfa84b85e4b80c7fd2ede
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.2 b/metadata/md5-cache/dev-python/scipy-1.6.2
index 0673a926ebf9..0b0618032713 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.2
+++ b/metadata/md5-cache/dev-python/scipy-1.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.2.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.1/scipy-html-1.6.1.zip https://docs.scipy.org/doc/scipy-1.6.1/scipy-ref-1.6.1.pdf )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18ddf555b56117c85f6414cd8caec8a2
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.3 b/metadata/md5-cache/dev-python/scipy-1.6.3
index 43d7cb4ccbfd..31b7cbfbaca8 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.3
+++ b/metadata/md5-cache/dev-python/scipy-1.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.2/scipy-html-1.6.2.zip https://docs.scipy.org/doc/scipy-1.6.2/scipy-ref-1.6.2.pdf )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3176328aaed9cd9b2cf50b0c832c49e4
diff --git a/metadata/md5-cache/dev-python/scipy-1.7.1 b/metadata/md5-cache/dev-python/scipy-1.7.1
new file mode 100644
index 000000000000..f6867f890a61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scipy-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/fortran
+DESCRIPTION=Scientific algorithms library for Python
+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 ~x86
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scipy/scipy-1.7.1.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	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6c34184bc45e4c4aad9c179ce0e80054
diff --git a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1 b/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
index 6eee7371cfea..d3020ce7b135 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.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/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2da001ba09d88ee54fb1dcbf98b66524
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.16 b/metadata/md5-cache/dev-python/scrypt-0.8.16
index f333efb8027f..58f6fee8fb7e 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.16
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.16
@@ -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/s/scrypt/scrypt-0.8.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70c484c6d03ef88b04a0b9271787672e
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.18 b/metadata/md5-cache/dev-python/scrypt-0.8.18
index 074149606ad8..f3214bea4de7 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.18
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.18
@@ -5,12 +5,12 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=8
 HOMEPAGE=https://github.com/holgern/py-scrypt/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=499b77452cd86575102ad2db3c501269
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7a028eba21977b600e9cdd5d8d452932
diff --git a/metadata/md5-cache/dev-python/seaborn-0.11.1 b/metadata/md5-cache/dev-python/seaborn-0.11.1
index 3857639e151b..1d549d3c6e92 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.11.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b93bb9aa4e0be81fb715472f2f5760f
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.1 b/metadata/md5-cache/dev-python/secretstorage-3.3.1
index 9d76fbeb7f06..d166c0a5e06e 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-3.3.1
@@ -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/SecretStorage/SecretStorage-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7df14da3e02406a84d04a4a5f836f529
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0-r1 b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
index 19ff4c2bfb1e..52f5b7bf6e97 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.141.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/s/selenium/selenium-3.141.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-3.141.0.tar.gz -> selenium-3.141.0.gh.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8a7de368b6e942a4d48cd8d26dd77a5
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.5 b/metadata/md5-cache/dev-python/semantic_version-2.8.5
index e3aee4febf25..cfde36a9f16c 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.5
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.5
@@ -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/semantic_version/semantic_version-2.8.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41bbb1bc4cfdc9b1e315524f646243ac
diff --git a/metadata/md5-cache/dev-python/semver-2.13.0 b/metadata/md5-cache/dev-python/semver-2.13.0
index 4babf55acf44..b154870e747c 100644
--- a/metadata/md5-cache/dev-python/semver-2.13.0
+++ b/metadata/md5-cache/dev-python/semver-2.13.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/python-semver/python-semver/archive/2.13.0.tar.gz -> semver-2.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d8ead25376332ff68c7d3c19b79b439
diff --git a/metadata/md5-cache/dev-python/send2trash-1.5.0-r1 b/metadata/md5-cache/dev-python/send2trash-1.5.0-r1
index 4cd1e3ad09e5..d87c732d41a8 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/send2trash-1.5.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/S/Send2Trash/Send2Trash-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49c5f92093513653bc119b957c178c50
diff --git a/metadata/md5-cache/dev-python/send2trash-1.8.0 b/metadata/md5-cache/dev-python/send2trash-1.8.0
index 29367f6df6f1..a129d6c13caa 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.8.0
+++ b/metadata/md5-cache/dev-python/send2trash-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arsenetar/send2trash/archive/1.8.0.tar.gz -> send2trash-1.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a65dd1b1968e5b9ccd903a110d8fb7fc
diff --git a/metadata/md5-cache/dev-python/sentinels-1.0.0 b/metadata/md5-cache/dev-python/sentinels-1.0.0
index 7f36ca80988c..a24e0f5c8cd4 100644
--- a/metadata/md5-cache/dev-python/sentinels-1.0.0
+++ b/metadata/md5-cache/dev-python/sentinels-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sentinels/sentinels-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee70e68c122310861e5509cb64a56ba3
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.3.1 b/metadata/md5-cache/dev-python/sentry-sdk-1.3.1
index bd8f45269fa7..d1d9a00adcdf 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.3.1
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.3.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/getsentry/sentry-python/archive/1.3.1.tar.gz -> sentry-sdk-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19ae7fa78b6bba6ef8ceb2ef85d1a08c
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.4.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.4.0
index f293f6902f5e..e7cd06e5161e 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.4.0
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.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/getsentry/sentry-python/archive/1.4.0.tar.gz -> sentry-sdk-1.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e859cc29bd49e4326a33537a2973449
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.4.1 b/metadata/md5-cache/dev-python/sentry-sdk-1.4.1
index 7db6ed6657e5..3cb1918a91b5 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.4.1
+++ b/metadata/md5-cache/dev-python/sentry-sdk-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/getsentry/sentry-python/archive/1.4.1.tar.gz -> sentry-sdk-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e859cc29bd49e4326a33537a2973449
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.4.2 b/metadata/md5-cache/dev-python/sentry-sdk-1.4.2
new file mode 100644
index 000000000000..cd3b7ed7e451
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fakeredis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-login[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[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 client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://pypi.org/project/sentry-sdk/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/getsentry/sentry-python/archive/1.4.2.tar.gz -> sentry-sdk-1.4.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5e859cc29bd49e4326a33537a2973449
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.4.3 b/metadata/md5-cache/dev-python/sentry-sdk-1.4.3
new file mode 100644
index 000000000000..9d0c71e67d2b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.4.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fakeredis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-login[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[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 client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://pypi.org/project/sentry-sdk/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/getsentry/sentry-python/archive/1.4.3.tar.gz -> sentry-sdk-1.4.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5e859cc29bd49e4326a33537a2973449
diff --git a/metadata/md5-cache/dev-python/serpent-1.40 b/metadata/md5-cache/dev-python/serpent-1.40
index 960399444977..ac71e548fbd3 100644
--- a/metadata/md5-cache/dev-python/serpent-1.40
+++ b/metadata/md5-cache/dev-python/serpent-1.40
@@ -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/serpent/serpent-1.40.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ddb4b397ca11534bd78b7408f6ac1a8f
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
index 42b55d00e371..ccac557ded38 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.2.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6c6eb37371498c2049f4233ed99a18f
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.3.1 b/metadata/md5-cache/dev-python/serverfiles-0.3.1
index 63b22473eaef..d4a8b97252f2 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.3.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.3.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/s/serverfiles/serverfiles-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4ba87816d6c326645510fcb00069f8e
diff --git a/metadata/md5-cache/dev-python/service_identity-21.1.0 b/metadata/md5-cache/dev-python/service_identity-21.1.0
index 9a5e4db4c230..7413b2471ef7 100644
--- a/metadata/md5-cache/dev-python/service_identity-21.1.0
+++ b/metadata/md5-cache/dev-python/service_identity-21.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/pyca/service-identity/archive/21.1.0.tar.gz -> service_identity-21.1.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d82c3182ecd1b2a804154be306eb94b1
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2.2 b/metadata/md5-cache/dev-python/setproctitle-1.2.2
index 89929f0338ee..4020654627ba 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.2.2
+++ b/metadata/md5-cache/dev-python/setproctitle-1.2.2
@@ -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/setproctitle/setproctitle-1.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3e2f701c1dcf865527b0775c955e1d0
diff --git a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2 b/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
index 30cceb37cc4b..7d7279d2a985 100644
--- a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
+++ b/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
@@ -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/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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=888c73dea13d4f6e7b7bdd350cb8c954
diff --git a/metadata/md5-cache/dev-python/setuptools-57.5.0 b/metadata/md5-cache/dev-python/setuptools-57.5.0
index 7d7251ea6fb5..e756bcb67312 100644
--- a/metadata/md5-cache/dev-python/setuptools-57.5.0
+++ b/metadata/md5-cache/dev-python/setuptools-57.5.0
@@ -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/s/setuptools/setuptools-57.5.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1df5c6fb8ca6a4797b15bfb13973de51
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2 b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
index 291f27ff1821..f69a0950be5b 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a0a17a7954a11aba2e70a43303fc4b3
diff --git a/metadata/md5-cache/dev-python/setuptools_rust-0.12.1 b/metadata/md5-cache/dev-python/setuptools_rust-0.12.1
index 81069ddaf03f..01743cfd3221 100644
--- a/metadata/md5-cache/dev-python/setuptools_rust-0.12.1
+++ b/metadata/md5-cache/dev-python/setuptools_rust-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-rust/setuptools-rust-0.12.1.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cloudabi/0.1.0/download -> cloudabi-0.1.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/ctor/0.1.15/download -> ctor-0.1.15.crate https://crates.io/api/v1/crates/derive_more/0.99.10/download -> derive_more-0.99.10.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/dtoa-short/0.3.2/download -> dtoa-short-0.3.2.crate https://crates.io/api/v1/crates/futf/0.1.4/download -> futf-0.1.4.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.6/download -> instant-0.1.6.crate https://crates.io/api/v1/crates/inventory/0.1.9/download -> inventory-0.1.9.crate https://crates.io/api/v1/crates/inventory-impl/0.1.9/download -> inventory-impl-0.1.9.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/lock_api/0.4.1/download -> lock_api-0.4.1.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.0/download -> markup5ever-0.10.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/parking_lot/0.11.0/download -> parking_lot-0.11.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.0/download -> parking_lot_core-0.8.0.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-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/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.18/download -> proc-macro-hack-0.5.18.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/pyo3/0.12.1/download -> pyo3-0.12.1.crate https://crates.io/api/v1/crates/pyo3-derive-backend/0.12.1/download -> pyo3-derive-backend-0.12.1.crate https://crates.io/api/v1/crates/pyo3cls/0.12.1/download -> pyo3cls-0.12.1.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/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/serde/1.0.116/download -> serde-1.0.116.crate https://crates.io/api/v1/crates/serde_derive/1.0.116/download -> serde_derive-1.0.116.crate https://crates.io/api/v1/crates/serde_json/1.0.57/download -> serde_json-1.0.57.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/smallvec/1.4.2/download -> smallvec-1.4.2.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/string_cache/0.8.0/download -> string_cache-0.8.0.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tendril/0.4.1/download -> tendril-0.4.1.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unindent/0.1.6/download -> unindent-0.1.6.crate https://crates.io/api/v1/crates/utf-8/0.7.5/download -> utf-8-0.7.5.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c1bec1d6af732846ef3b2a84e16407df
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1 b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1
index e7f3eb6d5ae6..23cfeb720853 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1
@@ -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/setuptools_scm/setuptools_scm-6.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d3a3b74fb5e97e746376fd3ca4044a0
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1 b/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1
index c0ad0b49abaf..ccc845b9699d 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.3.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=mirror://pypi/s/setuptools_scm/setuptools_scm-6.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3020abb18dbac9807705ae0cd0bb4eb
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.3.2 b/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
index 250ad34c94bd..8403e23ec1a2 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
@@ -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/setuptools_scm/setuptools_scm-6.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3020abb18dbac9807705ae0cd0bb4eb
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3
index cf1a37eb3095..67583140df98 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3
@@ -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/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e787a5b35fe44fe598e2f8b0efe0f3c8
diff --git a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1 b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
index b5b81f7e0b72..ac9ad650f490 100644
--- a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/setuptools_trial-0.6.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/s/setuptools_trial/setuptools_trial-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d9611ffad13f8a12532f71db8a26a6e
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
index 49fca60bdbf8..261d195e5925 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -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/jd-boyd/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58da1d9c878c7e17cdf5fad24d3d9a79
diff --git a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0 b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
index 235ee63aa7f1..1bf546ce0c1c 100644
--- a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
+++ b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sgmllib3k/sgmllib3k-1.0.0.tar.gz test? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-python/sgmllib3k/test_sgmllib.py.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ef7041cbbf3dfbc0a86ede22961c899
diff --git a/metadata/md5-cache/dev-python/sh-1.14.2 b/metadata/md5-cache/dev-python/sh-1.14.2
index 484c7cef7cf7..b938a656115b 100644
--- a/metadata/md5-cache/dev-python/sh-1.14.2
+++ b/metadata/md5-cache/dev-python/sh-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.14.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57a48911e9a207f3ae27c65230590691
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-0.1.0 b/metadata/md5-cache/dev-python/signature_dispatch-0.1.0
index b711277e90fe..802157f1dae2 100644
--- a/metadata/md5-cache/dev-python/signature_dispatch-0.1.0
+++ b/metadata/md5-cache/dev-python/signature_dispatch-0.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/s/signature_dispatch/signature_dispatch-0.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aba762e60e19430b95d31f1d39ba153a
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-0.2.0 b/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
index 0ebb23c5d9f0..1e6e260cda80 100644
--- a/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
+++ b/metadata/md5-cache/dev-python/signature_dispatch-0.2.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/s/signature_dispatch/signature_dispatch-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce3f20af33d267d7c28439d986089179
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-1.0.0 b/metadata/md5-cache/dev-python/signature_dispatch-1.0.0
index 7ae57b9623f7..6a45cb0b746f 100644
--- a/metadata/md5-cache/dev-python/signature_dispatch-1.0.0
+++ b/metadata/md5-cache/dev-python/signature_dispatch-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/signature_dispatch/signature_dispatch-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce3f20af33d267d7c28439d986089179
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.8 b/metadata/md5-cache/dev-python/simplebayes-1.5.8
index 96eb3db6b1a7..0f01afd052b5 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.8
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.8
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplebayes/simplebayes-1.5.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3fbc75bb34af4575575536560154365d
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.10 b/metadata/md5-cache/dev-python/simpleeval-0.9.10
index 19766eaa4320..b010a7eef354 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.10
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a21ccba6c498409a22e848319e91b29
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index 3285febcb656..20fc84255103 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d484057ff6acc420522b8823fcf720f7
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.3 b/metadata/md5-cache/dev-python/simplejson-3.17.3
index 434a54c5bc40..9ce4c6263c9c 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.3
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.3
@@ -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/simplejson/simplejson-3.17.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19065628f62e98a7b4299359deb6e3ee
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.5 b/metadata/md5-cache/dev-python/simplejson-3.17.5
index d13839ad9ae1..afb74aa2c4ed 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.5
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.5
@@ -4,12 +4,12 @@ DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=8
 HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
 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 ~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=|| ( MIT AFL-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/s/simplejson/simplejson-3.17.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f7bbb51bbf34df107b2086dc1c679e8
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=15e635c1837d2f991c205da637aa707e
diff --git a/metadata/md5-cache/dev-python/simplekml-1.3.5 b/metadata/md5-cache/dev-python/simplekml-1.3.5
index 1b78aef1d6cc..45bdb0d3b390 100644
--- a/metadata/md5-cache/dev-python/simplekml-1.3.5
+++ b/metadata/md5-cache/dev-python/simplekml-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplekml/simplekml-1.3.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cac159263ce4ea48c9eef0fe45a35d02
diff --git a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1 b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
index 56e40cb7adca..110324cec29c 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplesoapy/archive/v1.5.1.tar.gz -> simplesoapy-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a58910b5ac3c38a89d01d37545c4129b
diff --git a/metadata/md5-cache/dev-python/simplesoapy-9999 b/metadata/md5-cache/dev-python/simplesoapy-9999
index 3115fe8d3b64..f7da9f9f09ed 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-9999
+++ b/metadata/md5-cache/dev-python/simplesoapy-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-wireless/soapysdr[python] net-wireless/soapysdr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a58910b5ac3c38a89d01d37545c4129b
diff --git a/metadata/md5-cache/dev-python/simplespectral-1.0.0 b/metadata/md5-cache/dev-python/simplespectral-1.0.0
index bbe6fe48ed52..1e18088f31c2 100644
--- a/metadata/md5-cache/dev-python/simplespectral-1.0.0
+++ b/metadata/md5-cache/dev-python/simplespectral-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[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/xmikos/simplespectral/archive/v1.0.0.tar.gz -> simplespectral-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c33fe86c887d29233b114450f705403
diff --git a/metadata/md5-cache/dev-python/simplespectral-9999 b/metadata/md5-cache/dev-python/simplespectral-9999
index 1fd618d35fe6..a6bf5c0ff82f 100644
--- a/metadata/md5-cache/dev-python/simplespectral-9999
+++ b/metadata/md5-cache/dev-python/simplespectral-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] faster? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) fastest? ( dev-python/pyFFTW[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c33fe86c887d29233b114450f705403
diff --git a/metadata/md5-cache/dev-python/simpy-4.0.1 b/metadata/md5-cache/dev-python/simpy-4.0.1
index 07ec1a92c00e..d13e96f0cc8e 100644
--- a/metadata/md5-cache/dev-python/simpy-4.0.1
+++ b/metadata/md5-cache/dev-python/simpy-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-4.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=658b382870b561a470264b9ab444d7cc
diff --git a/metadata/md5-cache/dev-python/sip-5.5.0-r2 b/metadata/md5-cache/dev-python/sip-5.5.0-r2
index 1b64b0ba2fbc..e3b83dda79cb 100644
--- a/metadata/md5-cache/dev-python/sip-5.5.0-r2
+++ b/metadata/md5-cache/dev-python/sip-5.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=5
 SRC_URI=mirror://pypi/s/sip/sip-5.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f170ebd209d9b39eefe342f459ccf8f
diff --git a/metadata/md5-cache/dev-python/sip-6.2.0_pre2108241238 b/metadata/md5-cache/dev-python/sip-6.2.0_pre2108241238
index c63bff327211..c489cdbcc5a7 100644
--- a/metadata/md5-cache/dev-python/sip-6.2.0_pre2108241238
+++ b/metadata/md5-cache/dev-python/sip-6.2.0_pre2108241238
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_
 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.dev2108241238.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c01034644ec6868229a291ea42b845f5
diff --git a/metadata/md5-cache/dev-python/six-1.16.0 b/metadata/md5-cache/dev-python/six-1.16.0
index 94f653e30765..4da5db3b0d81 100644
--- a/metadata/md5-cache/dev-python/six-1.16.0
+++ b/metadata/md5-cache/dev-python/six-1.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f9616b8e50ce4d632a101171346b57b2
diff --git a/metadata/md5-cache/dev-python/slackclient-2.5.0 b/metadata/md5-cache/dev-python/slackclient-2.5.0
index ad3f7da66036..6d47cd2c561f 100644
--- a/metadata/md5-cache/dev-python/slackclient-2.5.0
+++ b/metadata/md5-cache/dev-python/slackclient-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/slackclient/slackclient-2.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1b8f96bbcbd1267abc4cab7d157eb15
diff --git a/metadata/md5-cache/dev-python/slimit-0.8.1-r1 b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
index 228e9a5ea465..795416c801d5 100644
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/slimit-0.8.1-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/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c5ac22971e46831574285b8cba79a4b
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.7.1 b/metadata/md5-cache/dev-python/slixmpp-1.7.1
index 6408b8ebde44..dc9b247b1b05 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.7.1
+++ b/metadata/md5-cache/dev-python/slixmpp-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9f5d7c469633215ac5fd3aa2a1ab36b
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index 12d8f3690dd4..433e8221c2c8 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cd24fcc27c671e55982404e788dc19e
diff --git a/metadata/md5-cache/dev-python/smartypants-2.0.1 b/metadata/md5-cache/dev-python/smartypants-2.0.1
index 3f51e0e2adbf..4261f05b3f89 100644
--- a/metadata/md5-cache/dev-python/smartypants-2.0.1
+++ b/metadata/md5-cache/dev-python/smartypants-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/leohemsted/smartypants.py/archive/v2.0.1.tar.gz -> smartypants-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64a3aa0b8e21246f797d8384bccc484b
diff --git a/metadata/md5-cache/dev-python/smartypants-9999 b/metadata/md5-cache/dev-python/smartypants-9999
index 0cfb51b35dc1..c2ba6f6016e0 100644
--- a/metadata/md5-cache/dev-python/smartypants-9999
+++ b/metadata/md5-cache/dev-python/smartypants-9999
@@ -9,5 +9,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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf0b2f07b473fe15b84ea23c9928fa17
diff --git a/metadata/md5-cache/dev-python/smmap-4.0.0 b/metadata/md5-cache/dev-python/smmap-4.0.0
index c9cb797a4042..df3f9886807a 100644
--- a/metadata/md5-cache/dev-python/smmap-4.0.0
+++ b/metadata/md5-cache/dev-python/smmap-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f511af6d47c933478ca2a2856d59375
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.5 b/metadata/md5-cache/dev-python/snakeoil-0.9.5
index 0f4212ecad69..8c08f32dcb92 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49179e65f9bb759975b72c8318f87588
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.7 b/metadata/md5-cache/dev-python/snakeoil-0.9.7
index 1f39ab0676ef..c3877ab47a2b 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.7
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.7
@@ -4,12 +4,12 @@ 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6660f2cb264da231304fee5a4f37be15
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e2b6664c990e0a74c31181c4955220f7
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 36ae2193da4c..c9b49e3134e9 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a399f6c3bf682407ce076e08558bb16
diff --git a/metadata/md5-cache/dev-python/snaketrace-0.3.1 b/metadata/md5-cache/dev-python/snaketrace-0.3.1
index 3658c9ff0ccd..404958c4e91d 100644
--- a/metadata/md5-cache/dev-python/snaketrace-0.3.1
+++ b/metadata/md5-cache/dev-python/snaketrace-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dcoles/snaketrace/archive/v0.3.1.tar.gz -> snaketrace-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=297bf14ca95851357e085c36c4d39d5e
diff --git a/metadata/md5-cache/dev-python/snappy-0.6.0 b/metadata/md5-cache/dev-python/snappy-0.6.0
index e905ddeaaae0..f53bb3cbf3aa 100644
--- a/metadata/md5-cache/dev-python/snappy-0.6.0
+++ b/metadata/md5-cache/dev-python/snappy-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python3_8? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c478b7695358f98498eb26698871c68
diff --git a/metadata/md5-cache/dev-python/snapshottest-0.5.1 b/metadata/md5-cache/dev-python/snapshottest-0.5.1
index c46471be6b84..ca0caf5e9a98 100644
--- a/metadata/md5-cache/dev-python/snapshottest-0.5.1
+++ b/metadata/md5-cache/dev-python/snapshottest-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/syrusakbary/snapshottest/archive/4ac2b4fb09e9e7728bebb11967c164a914775d1d.tar.gz -> snapshottest-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3133acf18108123be30e7177186ef71
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0 b/metadata/md5-cache/dev-python/sniffio-1.2.0
index ce9422111bef..4fbd9685ed3c 100644
--- a/metadata/md5-cache/dev-python/sniffio-1.2.0
+++ b/metadata/md5-cache/dev-python/sniffio-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/sniffio/archive/v1.2.0.tar.gz -> sniffio-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f78d78b78557bc04e522993b57e8b81e
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.1.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.1.0
index dbbac17b1969..ee636701e8b1 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.1.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d867679a6bacba203d417cf5a939e4c4
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.7.2 b/metadata/md5-cache/dev-python/socketio-client-0.7.2
index dab7c06d3ded..9fd08fec8a18 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.7.2
+++ b/metadata/md5-cache/dev-python/socketio-client-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client/socketIO-client-0.7.2.tar.gz -> socketio-client-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd6251239d24738a7adc8d750de50271
diff --git a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6 b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
index 2c9d79472199..10432a6e2b38 100644
--- a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
+++ b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client-nexus/socketIO-client-nexus-0.7.6.tar.gz -> socketio-client-nexus-0.7.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10a21b29d4c80e06aece1ac68f2ffab3
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
index 1fff46198b79..f51968284268 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
@@ -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/socketpool/socketpool-0.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07c9a6cf4970075ff48cfcb0d6487026
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.4.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.4.0
index 62a1db8198fa..c664220ef4be 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.4.0
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.4.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/grantjenks/python-sortedcontainers/archive/v2.4.0.tar.gz -> python-sortedcontainers-2.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4efe21ea05f5e1740d9eb126d63dc6b4
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.2.1 b/metadata/md5-cache/dev-python/soupsieve-2.2.1
index c915951e6217..2c50b8fd0875 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.2.1
+++ b/metadata/md5-cache/dev-python/soupsieve-2.2.1
@@ -4,12 +4,12 @@ DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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/facelessuser/soupsieve/archive/2.2.1.tar.gz -> soupsieve-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aad438e6613d46684755001177d2a7fa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6329330027acb02e3a275a2af605f0c3
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
index eab4204de9aa..349b21ec3c1d 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=76c07dbb965a926e2a99574a60a3dd7b
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 2af5c7fd7dd2..4ee4a8ba844d 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1ddaca2f25c866143d9d5f25dda9104
diff --git a/metadata/md5-cache/dev-python/speg-0.3-r2 b/metadata/md5-cache/dev-python/speg-0.3-r2
index 283987968b41..a182e21678ae 100644
--- a/metadata/md5-cache/dev-python/speg-0.3-r2
+++ b/metadata/md5-cache/dev-python/speg-0.3-r2
@@ -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 )
 SLOT=0
 SRC_URI=https://github.com/avakar/speg/archive/v0.3.tar.gz -> speg-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63826eb7d93731d84dfbe5f0f774880f
diff --git a/metadata/md5-cache/dev-python/sphinx-3.5.4 b/metadata/md5-cache/dev-python/sphinx-3.5.4
index bcc448677d59..a07383a9a4c5 100644
--- a/metadata/md5-cache/dev-python/sphinx-3.5.4
+++ b/metadata/md5-cache/dev-python/sphinx-3.5.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/S/Sphinx/Sphinx-3.5.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c438c60aedd39fc1d1a87317a53a7e10
diff --git a/metadata/md5-cache/dev-python/sphinx-4.1.2 b/metadata/md5-cache/dev-python/sphinx-4.1.2
index a2f40864b5fe..8362f604dc4a 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.1.2
+++ b/metadata/md5-cache/dev-python/sphinx-4.1.2
@@ -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/Sphinx/Sphinx-4.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de2c78f3ba4c88932a43577d6d1fcd0c
diff --git a/metadata/md5-cache/dev-python/sphinx-4.2.0 b/metadata/md5-cache/dev-python/sphinx-4.2.0
index ab2de8db0291..fa1f04ea57d5 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=238b0cdcc23b630c8f697fa1be0ad0fd
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
index 7474d86bcb29..ed69d59e0b23 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7ff916a1d77c6474e64cae402bcfb82
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.12.0 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.12.0
index 3af6e92c92e3..f4122c622e4d 100644
--- a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.12.0
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe5a5489e7261957a27653e540795bc6
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
index 0473237a5aa3..fcbbb4fbc241 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b.tar.gz -> sphinx-bootstrap-theme-a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ce46d478763f8a4d031edda4c7a1ea6
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
index c3415931487c..d16c971d8f38 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/v0.8.0.tar.gz -> sphinx-bootstrap-theme-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4d3d54552a59d672f10008d27cfd8ce
diff --git a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4 b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
index 05e409722596..ff5464b02df9 100644
--- a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+++ b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.7.5[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-epytext/sphinx-epytext-0.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=80761d506ab085d882eeaf2f8f138ede
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.10.0 b/metadata/md5-cache/dev-python/sphinx-gallery-0.10.0
index ad86037821a9..7ec3001fc73d 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.10.0
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-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/s/sphinx-gallery/sphinx-gallery-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9672ff24ec7f50bfce4aa9ad63868729
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.9.0 b/metadata/md5-cache/dev-python/sphinx-gallery-0.9.0
index ce5e55cebf12..3ccb62a3b2a4 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.9.0
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0609778395edd9e3906df5c1302f5a0
diff --git a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0 b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
index 76ee221967a4..6f175e9dc57d 100644
--- a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Sphinx extension for linking to your project's issue tracker
 EAPI=7
 HOMEPAGE=https://github.com/sloria/sphinx-issues
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sloria/sphinx-issues/archive/1.2.0.tar.gz -> sphinx-issues-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6905dd1f6cbede5b226907aa39c93c30
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ed797951434fb86329020258f7f77104
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0 b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
index 3b06908278ee..b23583819f12 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe9e075380813480109b164ad9a4a569
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-1.1.0 b/metadata/md5-cache/dev-python/sphinx-jinja-1.1.0
index 40a78872dd8b..255a14902c7c 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-1.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/s/sphinx-jinja/sphinx-jinja-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d0433ebb32bcca7785fe0dbe584e157
diff --git a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4 b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
index 03dcfc73c6b7..76484327398b 100644
--- a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
@@ -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/Holzhaus/sphinx-multiversion/archive/v0.2.4.tar.gz -> sphinx-multiversion-0.2.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=557632b2ecda26256eb950b7292478f6
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
index 64cb2b031bcc..997ba174f35a 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.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/readthedocs/sphinx-notfound-page/archive/0.7.1.tar.gz -> sphinx-notfound-page-0.7.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7aaa01d0fa6ea3bbea46b178f58ac6a
diff --git a/metadata/md5-cache/dev-python/sphinx-panels-0.6.0 b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
index 8bc1e3ed599d..02409f723c2a 100644
--- a/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
+++ b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/sphinx-panels/archive/v0.6.0.tar.gz -> sphinx-panels-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=85bb0ff607cb6a8ac4e4b673dce9810f
diff --git a/metadata/md5-cache/dev-python/sphinx-prompt-1.5.0 b/metadata/md5-cache/dev-python/sphinx-prompt-1.5.0
index e11053ba39c9..f6df41bcbb9c 100644
--- a/metadata/md5-cache/dev-python/sphinx-prompt-1.5.0
+++ b/metadata/md5-cache/dev-python/sphinx-prompt-1.5.0
@@ -4,12 +4,12 @@ DESCRIPTION=Sphinx directive to add unselectable prompt
 EAPI=8
 HOMEPAGE=https://github.com/sbrunner/sphinx-prompt/
 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 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sbrunner/sphinx-prompt/archive/1.5.0.tar.gz -> sphinx-prompt-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c58935a3532cf49a100d2a659f7dcab5
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba793b5c0fa13f1580a975b0a85d1cc3
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
index a519b71e0341..5e5decf5c84c 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced Sphinx theme (based on Python 3 docs)
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx_py3doc_enhanced_theme/
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=586517e391e768dd56f8101ca7af0d4e
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0103ab344b5d5b0dd299da56a49cf881
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 f55413c1e88f..72cf52e16da1 100644
--- a/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0
+++ b/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0
@@ -4,12 +4,12 @@ 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 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/sphinx-tabs/archive/v3.1.0.tar.gz -> sphinx-tabs-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc7c43cfa43df21e3d76aee34fa7709a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0031e106b4bd26d01c201281db577962
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
index 956aa331ebe5..720a13ffed43 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Testing utility classes and functions for Sphinx extensions
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-doc/sphinx-testing
 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=49a6c3c438e76a91abffd41b5ec1378e
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d1be76d49b02b8b782198dbbb5be736
diff --git a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0 b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0
index 8378901b86ef..1f024f883cd7 100644
--- a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0
+++ b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_ansible_theme/sphinx_ansible_theme-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c77870833d8cb79a493375fb4d2f4fd
diff --git a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.8.0 b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.8.0
index 20c3c5653227..35d4f5320a96 100644
--- a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.8.0
+++ b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-ansible-theme/sphinx-ansible-theme-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b1354176f27cf35090cef41aaebc869
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
index a2050028d538..b56c3e8fe9cc 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sphinx-2.0.0[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1513503983d2b1505160a5cc9cac86e
diff --git a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
index fd9a16913a2d..7f19005f8f6c 100644
--- a/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/lv2/sphinx_lv2_theme/-/archive/v1.0.0/sphinx_lv2_theme-v1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1e5c8d46772faa9e939c935aed53284
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
index a9ec16d8053e..fd3c1ef1e188 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
@@ -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/s/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b02d7c87fc4dc52d49826d192fde340f
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0
index c5235a82d14d..6e5afa5426bf 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=ReadTheDocs.org theme for Sphinx
 EAPI=8
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=<dev-python/docutils-0.18[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(-)?]
@@ -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/s/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c0e2b6dad626be908451f201e38b984
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49eaf9069857c223126dee0be2c2ef63
diff --git a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3 b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
index 000e28a80ad7..fc94fbf5ca96 100644
--- a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
@@ -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=mirror://pypi/s/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f35ac42a0d0ba349497f3e7b95105777
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0
new file mode 100644
index 000000000000..a93e725283ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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=Sphinx extension for running sphinx-apidoc on each build
+EAPI=8
+HOMEPAGE=https://pypi.org/project/sphinxcontrib-apidoc/ https://github.com/sphinx-contrib/apidoc
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1dca2623708e412dfa6790c812f3130e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
index b15aafc0a28a..14d17fa0d222 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
@@ -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/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3bc43f40633cc3a113b4c418093202c
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
index 3f784cf62922..3726a5bb84ce 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c6decefc017ad91cb257ea1a03ff04b
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7 b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
index 278e62d0b43c..629d41d1875c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e428718068c975f0713e0412abaf793
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.3.0
index 336458c27e96..20763417dd79 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.3.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/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=550c11e55c2ddd508724df10c6cc4637
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.4.1 b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.4.1
index 8c69fcf64754..44e4e87a0ef9 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.4.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.4.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/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3e65364917aba8d10b951bb9be5ed23
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
index 64667c8cd3bf..42020ab75ce9 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/2.0.0.tar.gz -> sphinxcontrib-blockdiag-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=348eabb2c0b0ed041e7d4545070b28e8
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
index 88c457234245..f831b9f50a1c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
@@ -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/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7553f3e792d46a2b6caf74fa9839b80a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
index 5cdda317b25d..e60fbd20855a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
@@ -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/sphinx-contrib/doxylink/archive/refs/tags/1.10.tar.gz -> sphinxcontrib-doxylink-1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cd3b68300ed1df11e6cb300e54676fc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.11 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.11
new file mode 100644
index 000000000000..2a843f04de09
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-doc/doxygen dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extension to link to external Doxygen API documentation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/sphinx-contrib/doxylink/archive/refs/tags/1.11.tar.gz -> sphinxcontrib-doxylink-1.11.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=24bbaa338a445eedddd512a7df9e3fa1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
index 9cce5c408b19..bd9c1a20429d 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
@@ -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/sphinx-contrib/doxylink/archive/refs/tags/1.8.tar.gz -> sphinxcontrib-doxylink-1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56222e8c076f810ca3c61ca59c3b0ec0
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9
index 2ae41dcf0d4c..1d67d5adcf50 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9
@@ -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/sphinx-contrib/doxylink/archive/refs/tags/1.9.tar.gz -> sphinxcontrib-doxylink-1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cd3b68300ed1df11e6cb300e54676fc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
index 5f6b45775599..93b06da7aa3b 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?] python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.1.tar.gz -> sphinxcontrib-github-alt-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c13ab0e40b57aae10c6764bab0dbf49
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
index 72a8d6ab8343..e95d25273a7c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.2.tar.gz -> sphinxcontrib-github-alt-1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d534e87242d63d8e5db6e48255de155
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1081f9d98932bbf78b7d0ee8a2e71e7a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
index 990dd2e576f7..f6d74e9b43fe 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
@@ -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/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8f04d7865efe6b4c27ed0b4a25cbbaf
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
index 70ad0f700370..6855184d0caa 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.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/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5683ee6d6734b647d5f9a6c91b59f6a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1 b/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1
index caf2d78a4f79..88fa20a92c8c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Organize changelog directives in Sphinx docs
 EAPI=7
 HOMEPAGE=https://github.com/davidism/sphinxcontrib-log-cabinet
 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 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-log_cabinet/sphinxcontrib-log-cabinet-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5bbf43f6dafd93aa912f482b6b8096a2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=283ae79a86ce30a5fdfc271c309e267d
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
index 2aea31bfd2ab..8b1714d199ad 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c2a637cf379993a40698271e2e8af37
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
index e22d79e843d4..7c273f5ee260 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8f440b6838becb5e1d4be10e8a86e52
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
index 0d446e19dc20..4615ee35778f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.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/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4add293b7f0791deab0b673f0cf79a94
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
index 28ccdc6c8b87..785cd3238939 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
@@ -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/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d67580db5b6dfcc08edc5276e8f2a44
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
index 816c3f3060b0..c419ad2984ca 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.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/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df90f7fb21bcca0ca4728a30aee6ba1a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index be11f4d7f17b..e9e82ac0f38c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.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=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa7f22183bdaf52219c5352a5cb5d969
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
index 4936d68e622c..cdeea93757bc 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx websupport extension
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-websupport
 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 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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(-)?]
@@ -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/sphinx-doc/sphinxcontrib-websupport/archive/1.2.4.tar.gz -> sphinxcontrib-websupport-1.2.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40a61deca7f51e5134d1373cf03bf1da
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7343f25cfcb4cb8a8022800b1942f41b
diff --git a/metadata/md5-cache/dev-python/sphobjinv-2.1 b/metadata/md5-cache/dev-python/sphobjinv-2.1
index e3bf492b1547..80c6b73525f6 100644
--- a/metadata/md5-cache/dev-python/sphobjinv-2.1
+++ b/metadata/md5-cache/dev-python/sphobjinv-2.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/bskinn/sphobjinv/archive/v2.1.tar.gz -> sphobjinv-2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e44ab8751c8c6072d646575a6a19bd60
diff --git a/metadata/md5-cache/dev-python/sphobjinv-2.1-r1 b/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
index f78fa382945e..8fe6d32ae565 100644
--- a/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
+++ b/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
@@ -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/bskinn/sphobjinv/archive/v2.1.tar.gz -> sphobjinv-2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a75d5dd64cf8926a371612c1212b51d5
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
index 21128639be61..840c89629ff9 100644
--- a/metadata/md5-cache/dev-python/spur-0.3.22
+++ b/metadata/md5-cache/dev-python/spur-0.3.22
@@ -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/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0fd5efcc681b5f2d567bd15f66475cf
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 2cab8afffa26..c14dd2e4944f 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	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 ae14598ab57c..b29595976928 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=23d75cfb7c283e25b26635827dc21b6f
diff --git a/metadata/md5-cache/dev-python/spyder-5.1.5 b/metadata/md5-cache/dev-python/spyder-5.1.5
deleted file mode 100644
index 53673795ebc0..000000000000
--- a/metadata/md5-cache/dev-python/spyder-5.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-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.1[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.1[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.5.tar.gz -> spyder-5.1.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz -> spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=548586c79a3aa72ea167f0dc1e335bc8
diff --git a/metadata/md5-cache/dev-python/spyder-5.1.5-r1 b/metadata/md5-cache/dev-python/spyder-5.1.5-r1
new file mode 100644
index 000000000000..b6659a07bccd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-5.1.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-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.1[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.1[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.5.tar.gz -> spyder-5.1.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz -> spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=337d947f98d0cadf1f5678a0e54a1278
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.10.2 b/metadata/md5-cache/dev-python/spyder-kernels-1.10.2
index 83a44028b855..537658dec74d 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-1.10.2
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.10.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/spyder-ide/spyder-kernels/archive/v1.10.2.tar.gz -> spyder-kernels-1.10.2-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=431ab853948c5d2357c5c079a5847ab1
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.0.5 b/metadata/md5-cache/dev-python/spyder-kernels-2.0.5
index f709c12f5e3c..dcaa90f53dfa 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-2.0.5
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.0.5
@@ -11,5 +11,5 @@ 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.0.5.tar.gz -> spyder-kernels-2.0.5-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87c60c4333c410ce9a7072376c3d4ef3
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.1.1 b/metadata/md5-cache/dev-python/spyder-kernels-2.1.1
index 55a522efa9c7..b8f01fa23c41 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-2.1.1
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.1.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/spyder-ide/spyder-kernels/archive/v2.1.1.tar.gz -> spyder-kernels-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98feda77561ce06c3d0ee2d6ce221e0c
diff --git a/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1 b/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
index 24d0d4e9e431..c618ba75083c 100644
--- a/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
+++ b/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.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/spyder-ide/spyder-line-profiler/archive/v0.2.1.tar.gz -> spyder-line-profiler-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=a600117b861144398869fbbf9c51b7f8
diff --git a/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1 b/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
index 81fef6c5fbef..8c826e79756d 100644
--- a/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
+++ b/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.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/spyder-ide/spyder-memory-profiler/archive/v0.2.1.tar.gz -> spyder-memory-profiler-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e56a2ad90599880415554dc9a5d71345
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
index 07dff4b88a9d..363fd0a67a32 100644
--- a/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r2
+++ b/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r2
@@ -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/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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6969378882d4552dfbf87bb8314174fd
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
index d62cd06dd564..f64843f86e7d 100644
--- a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coloredlogs[python_targets_python3_8(-)?,python_targets_pytho
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9075732ca6dc26024c9ca97c73d7392e
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-1.1.0 b/metadata/md5-cache/dev-python/spyder-terminal-1.1.0
index 4cb49069d911..19ef70e909b7 100644
--- a/metadata/md5-cache/dev-python/spyder-terminal-1.1.0
+++ b/metadata/md5-cache/dev-python/spyder-terminal-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coloredlogs[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3c6b62ba08badf97d8a20981425e6d8
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
index 9ed4a2c64620..8624519f82cf 100644
--- a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1-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-unittest/archive/v0.4.1.tar.gz -> spyder-unittest-0.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=7f9b9cf8ff15765111a43f958044050e
diff --git a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1 b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1
index 34e87e755484..cd69b88a0a83 100644
--- a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1
+++ b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1
@@ -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/spyder-ide/spyder-vim/archive/4d0bf821abb193bfd158e2489970e1873a9f1138.tar.gz -> spyder-vim-0_pre20201026.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _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 bf5ec404265e..e6747d851187 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03b714f7ed983230a3195d2cf700d5d3
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
index af50e5bd0878..662a7205bf4b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
@@ -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.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 4dbcc2357de4..fb3f121a94ef 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a97f4c527eb86bc28fc38e1515a870d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.23 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.23
index ae6ff0b11aff..b2d09f514bf3 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.23
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.23
@@ -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.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be913e3a3a8651234bec5bfcf0876332
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.25 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.25
index a1d0913f3709..9ce67eb9e12f 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.25
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.25
@@ -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 ~m68k ~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.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=18d073423cfa219715432a37213a8ccf
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e83724977259a77ec4df3fb6cd2e7415
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
index 45c21b6e7d4a..3c68a8d831e3 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.9.6[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26de55060364640a9f33baff740e0cf9
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.1 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.1
index 2b5e8ca4be3f..c95f2cb46fb3 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.1
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.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/rqlite/sqlalchemy-rqlite/archive//v1.1.tar.gz -> sqlalchemy-rqlite-1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea2774ee0172f42c65cced0913c93abd
diff --git a/metadata/md5-cache/dev-python/sqlitedict-1.7.0 b/metadata/md5-cache/dev-python/sqlitedict-1.7.0
index 1f06a9b2f68b..b5ed2d8d679f 100644
--- a/metadata/md5-cache/dev-python/sqlitedict-1.7.0
+++ b/metadata/md5-cache/dev-python/sqlitedict-1.7.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/s/sqlitedict/sqlitedict-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2301d0ec83547935fd20af2e47d40401
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.2 b/metadata/md5-cache/dev-python/sqlparse-0.4.2
index 31c2172ed7b7..4132e387133c 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.4.2
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.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/s/sqlparse/sqlparse-0.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b860cbebc01ec6f95e101b42c1b87b9f
diff --git a/metadata/md5-cache/dev-python/ssh2-python-0.26.0 b/metadata/md5-cache/dev-python/ssh2-python-0.26.0
index 1d13af79040c..d0b022803116 100644
--- a/metadata/md5-cache/dev-python/ssh2-python-0.26.0
+++ b/metadata/md5-cache/dev-python/ssh2-python-0.26.0
@@ -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 )
 SLOT=0
 SRC_URI=https://github.com/ParallelSSH/ssh2-python/archive/refs/tags/0.26.0.tar.gz -> ssh2-python-0.26.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=725425ce004e398d314027e419f4e5f0
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.3.1 b/metadata/md5-cache/dev-python/sshtunnel-0.3.1
index 8353b2396e82..31eebbbb36d3 100644
--- a/metadata/md5-cache/dev-python/sshtunnel-0.3.1
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/sshtunnel/sshtunnel-0.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6870779df8965fe9cca001e28520d8a1
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4 b/metadata/md5-cache/dev-python/ssl-fetch-0.4
index a8ffefbc8e94..05a71971aad4 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.4
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8244ad1c99ac015b0c7ecd880adaad80
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-9999 b/metadata/md5-cache/dev-python/ssl-fetch-9999
index 53bd69817a56..5a5497346864 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-9999
+++ b/metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a5ec1edd793d45822ebfd1953221215
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
index 40438a4944ee..2b4d62d465aa 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
@@ -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/hellerbarde/stapler/archive/1cabc85521e2badfc1e0d690086e286e701c2d9e.tar.gz -> stapler-1.0.0_p20200531.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58ee8504cbc192cffd8c9d32fe936d05
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
index 63fd16991873..d7217aca9fa0 100644
--- a/metadata/md5-cache/dev-python/statsd-3.3.0
+++ b/metadata/md5-cache/dev-python/statsd-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69b1a20b1e14738b72cade3eb4879a19
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 43a8714d0096..03700f316d5b 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6c9edc4bf83ecdac35a3fd018e6c309
diff --git a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1 b/metadata/md5-cache/dev-python/stdio-mgr-1.0.1
index 3fa9226d53da..9efa34c47069 100644
--- a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1
+++ b/metadata/md5-cache/dev-python/stdio-mgr-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bskinn/stdio-mgr/archive/v1.0.1.tar.gz -> stdio-mgr-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e408c5fbc21af68b5839436b0e40f069
diff --git a/metadata/md5-cache/dev-python/stestr-2.1.0-r1 b/metadata/md5-cache/dev-python/stestr-2.1.0-r1
index 21d303d2864d..c526d52b118f 100644
--- a/metadata/md5-cache/dev-python/stestr-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/stestr-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c93bb252b7874dcbf0113f534d5125d3
diff --git a/metadata/md5-cache/dev-python/stestr-3.2.0 b/metadata/md5-cache/dev-python/stestr-3.2.0
index 994c359b7353..ad021e6889f7 100644
--- a/metadata/md5-cache/dev-python/stestr-3.2.0
+++ b/metadata/md5-cache/dev-python/stestr-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e85214b3213cfff00cfc5a83c21a297a
diff --git a/metadata/md5-cache/dev-python/stestr-3.2.1 b/metadata/md5-cache/dev-python/stestr-3.2.1
index 235a067f7419..96726d23b8c9 100644
--- a/metadata/md5-cache/dev-python/stestr-3.2.1
+++ b/metadata/md5-cache/dev-python/stestr-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f25f3ea197f608fd92c3b62521e83b7
diff --git a/metadata/md5-cache/dev-python/stevedore-3.3.0 b/metadata/md5-cache/dev-python/stevedore-3.3.0
deleted file mode 100644
index 6d090ab5ab91..000000000000
--- a/metadata/md5-cache/dev-python/stevedore-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-)] >=dev-python/reno-2.5.0[python_targets_python3_9(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-)] >=dev-python/reno-2.5.0[python_targets_python3_8(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage dynamic plugins for Python applications
-EAPI=7
-HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stevedore/stevedore-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=462c9b2d89fe1d0abb2e35286e676813
diff --git a/metadata/md5-cache/dev-python/stevedore-3.4.0 b/metadata/md5-cache/dev-python/stevedore-3.4.0
index ef9425f41fc0..4d949b791c23 100644
--- a/metadata/md5-cache/dev-python/stevedore-3.4.0
+++ b/metadata/md5-cache/dev-python/stevedore-3.4.0
@@ -4,12 +4,12 @@ DESCRIPTION=Manage dynamic plugins for Python applications
 EAPI=8
 HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.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/s/stevedore/stevedore-3.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9d1d3b030fc1469ddb51e39078d032b
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6b7b77989319c4179f230b4961040ab9
diff --git a/metadata/md5-cache/dev-python/stomp-py-7.0.0 b/metadata/md5-cache/dev-python/stomp-py-7.0.0
index 8826f10de870..88ab7be8e764 100644
--- a/metadata/md5-cache/dev-python/stomp-py-7.0.0
+++ b/metadata/md5-cache/dev-python/stomp-py-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/stomp.py/stomp.py-7.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ede24f9f43aaf93736cd6712826a516f
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
index 32e5cd2f2692..140f835905ac 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-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/danielrichman/strict-rfc3339/archive/version-0.7.tar.gz -> strict-rfc3339-version-0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aaa2908af465651b80696df4c49625d8
diff --git a/metadata/md5-cache/dev-python/stripe-2.60.0 b/metadata/md5-cache/dev-python/stripe-2.60.0
index b66e0f31079f..698c999d751d 100644
--- a/metadata/md5-cache/dev-python/stripe-2.60.0
+++ b/metadata/md5-cache/dev-python/stripe-2.60.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.60.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05443a157f252b7c8206d28bdebc321f
diff --git a/metadata/md5-cache/dev-python/subprocess-tee-0.3.2 b/metadata/md5-cache/dev-python/subprocess-tee-0.3.2
index 1e72d365fd2e..05bf10df74fe 100644
--- a/metadata/md5-cache/dev-python/subprocess-tee-0.3.2
+++ b/metadata/md5-cache/dev-python/subprocess-tee-0.3.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/s/subprocess-tee/subprocess-tee-0.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9290c0d4a08a0dcbdf5f202227a26a42
diff --git a/metadata/md5-cache/dev-python/subprocess-tee-0.3.4 b/metadata/md5-cache/dev-python/subprocess-tee-0.3.4
index d5911805230a..e9b76043f530 100644
--- a/metadata/md5-cache/dev-python/subprocess-tee-0.3.4
+++ b/metadata/md5-cache/dev-python/subprocess-tee-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=test-full? ( test ) || ( python_targets_python3_8 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess-tee/subprocess-tee-0.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e199c7c57be031532cf81c07e5ba2d1
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0 b/metadata/md5-cache/dev-python/subunit-1.4.0
index d3c525f997b8..4dafa17455bc 100644
--- a/metadata/md5-cache/dev-python/subunit-1.4.0
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20de1b9b383270099d8905245227c8d5
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0_p20210729 b/metadata/md5-cache/dev-python/subunit-1.4.0_p20210729
new file mode 100644
index 000000000000..581a98649ac2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0_p20210729
@@ -0,0 +1,16 @@
+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(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-lang/perl:= >=dev-libs/check-0.9.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(-)?] >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1 test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=A streaming protocol for test results
+EAPI=7
+HOMEPAGE=https://launchpad.net/subunit https://pypi.org/project/python-subunit/
+IUSE=static-libs test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 BSD
+RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-lang/perl:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/testing-cabal/subunit/archive/c87ffbd904627d777aa1430963dced92a36aa033.tar.gz -> subunit-1.4.0_p20210729.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4df01f865756c4c67503582884670184
diff --git a/metadata/md5-cache/dev-python/suds-0.8.4 b/metadata/md5-cache/dev-python/suds-0.8.4
index f8742dcd0417..a8201bba2019 100644
--- a/metadata/md5-cache/dev-python/suds-0.8.4
+++ b/metadata/md5-cache/dev-python/suds-0.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-community/suds-community-0.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fcc1b4802e555302898458fb4e80e09
diff --git a/metadata/md5-cache/dev-python/sure-2.0.0 b/metadata/md5-cache/dev-python/sure-2.0.0
index b285b3bbe0b1..9639f82bdc19 100644
--- a/metadata/md5-cache/dev-python/sure-2.0.0
+++ b/metadata/md5-cache/dev-python/sure-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b81aad0bb8d4b2f89a375925a755353
diff --git a/metadata/md5-cache/dev-python/svg-path-4.1 b/metadata/md5-cache/dev-python/svg-path-4.1
index 60aaf6541eea..da42449e8756 100644
--- a/metadata/md5-cache/dev-python/svg-path-4.1
+++ b/metadata/md5-cache/dev-python/svg-path-4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/regebro/svg.path/archive/4.1.tar.gz -> svg.path-4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d8cf324690a2b999095b0e384a66cf3
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4 b/metadata/md5-cache/dev-python/svgwrite-1.4
index 377624922486..6bee3de51867 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.4
+++ b/metadata/md5-cache/dev-python/svgwrite-1.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/mozman/svgwrite/archive/v1.4.tar.gz -> svgwrite-1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45e4258e231da5b4eb48a5b5b9a756a6
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4.1 b/metadata/md5-cache/dev-python/svgwrite-1.4.1
index 2396549aa827..c3e89572173b 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.4.1
+++ b/metadata/md5-cache/dev-python/svgwrite-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozman/svgwrite/archive/v1.4.1.tar.gz -> svgwrite-1.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8cb2d394619dc81bc1de2af667754db
diff --git a/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.3 b/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.3
index 64461efcaf7f..8c2c7e900da0 100644
--- a/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.3
+++ b/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/swagger-spec-validator/swagger-spec-validator-2.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a186ef5946c7ef8e7061758b83b29650
diff --git a/metadata/md5-cache/dev-python/sybil-2.0.1 b/metadata/md5-cache/dev-python/sybil-2.0.1
index 360d511c62eb..9616199c8df3 100644
--- a/metadata/md5-cache/dev-python/sybil-2.0.1
+++ b/metadata/md5-cache/dev-python/sybil-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sybil/sybil-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e0d698a99eff2d9d6a8dc932e0671c2
diff --git a/metadata/md5-cache/dev-python/symengine-0.7.2-r2 b/metadata/md5-cache/dev-python/symengine-0.7.2-r2
index a3f9b7af2ec7..17e351a41a26 100644
--- a/metadata/md5-cache/dev-python/symengine-0.7.2-r2
+++ b/metadata/md5-cache/dev-python/symengine-0.7.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.7.2.tar.gz -> symengine.py-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc0114df9201cc884aae01787b5234f0
diff --git a/metadata/md5-cache/dev-python/sympy-1.8 b/metadata/md5-cache/dev-python/sympy-1.8
index 3cff81c0d743..86151c89cdeb 100644
--- a/metadata/md5-cache/dev-python/sympy-1.8
+++ b/metadata/md5-cache/dev-python/sympy-1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=261076debc5a6eb30c49b408b0865255
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.9 b/metadata/md5-cache/dev-python/tabulate-0.8.9
index abdfe28bca4a..35a40200e3c4 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.8.9
+++ b/metadata/md5-cache/dev-python/tabulate-0.8.9
@@ -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/astanin/python-tabulate/archive/v0.8.9.tar.gz -> tabulate-0.8.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc689619287e1202c57490102491b50b
diff --git a/metadata/md5-cache/dev-python/tagpy-2018.1-r2 b/metadata/md5-cache/dev-python/tagpy-2018.1-r2
index 687e8d2d9d3f..39931d7112f9 100644
--- a/metadata/md5-cache/dev-python/tagpy-2018.1-r2
+++ b/metadata/md5-cache/dev-python/tagpy-2018.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/t/tagpy/tagpy-2018.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d50bb045554d24bd076a20b064ce7fd6
diff --git a/metadata/md5-cache/dev-python/tappy-3.0 b/metadata/md5-cache/dev-python/tappy-3.0
index 3da955624e27..b3a7ec1014af 100644
--- a/metadata/md5-cache/dev-python/tappy-3.0
+++ b/metadata/md5-cache/dev-python/tappy-3.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/t/tap.py/tap.py-3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55744fc698d0ae0f0b7f0b377d70fd96
diff --git a/metadata/md5-cache/dev-python/tblib-1.7.0 b/metadata/md5-cache/dev-python/tblib-1.7.0
index f4fb1e8f7ff3..32620da55d53 100644
--- a/metadata/md5-cache/dev-python/tblib-1.7.0
+++ b/metadata/md5-cache/dev-python/tblib-1.7.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/t/tblib/tblib-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a6d6383509a1e2942414d311238a20c
diff --git a/metadata/md5-cache/dev-python/tekore-3.7.1 b/metadata/md5-cache/dev-python/tekore-3.7.1
index 13249e6d79fa..31c14274be03 100644
--- a/metadata/md5-cache/dev-python/tekore-3.7.1
+++ b/metadata/md5-cache/dev-python/tekore-3.7.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/felix-hilden/tekore/archive/v3.7.1.tar.gz -> tekore-3.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e5b56c3d992d9fcec56ac614f00908a
diff --git a/metadata/md5-cache/dev-python/tekore-4.0.0 b/metadata/md5-cache/dev-python/tekore-4.0.0
index e51d3670c0c6..9303194a7633 100644
--- a/metadata/md5-cache/dev-python/tekore-4.0.0
+++ b/metadata/md5-cache/dev-python/tekore-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/felix-hilden/tekore/archive/v4.0.0.tar.gz -> tekore-4.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b445706f635b6207b120da96ce4fc8d3
diff --git a/metadata/md5-cache/dev-python/tempest-29.0.0-r1 b/metadata/md5-cache/dev-python/tempest-29.0.0-r1
new file mode 100644
index 000000000000..a32e9e60c12c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempest-29.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/stestr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenStack Integration Testing
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tempest/tempest-29.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c51378a1cafcfc5cb7e21d821b99b285
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r3 b/metadata/md5-cache/dev-python/tempita-0.5.3-r3
index b23c15aadedc..6a52d419e518 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r3
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/tempita/get/97392d008cc8.tar.gz -> tempita-0.5.3-bitbucket.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23aa561a986522b0135f80f552bbe18b
diff --git a/metadata/md5-cache/dev-python/tempora-4.1.1 b/metadata/md5-cache/dev-python/tempora-4.1.1
index aae54f757a46..20f246e5dd31 100644
--- a/metadata/md5-cache/dev-python/tempora-4.1.1
+++ b/metadata/md5-cache/dev-python/tempora-4.1.1
@@ -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/t/tempora/tempora-4.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=066c39485360987930c342169206852e
diff --git a/metadata/md5-cache/dev-python/tenacity-8.0.1 b/metadata/md5-cache/dev-python/tenacity-8.0.1
index 2615acfaca64..907fae3e870a 100644
--- a/metadata/md5-cache/dev-python/tenacity-8.0.1
+++ b/metadata/md5-cache/dev-python/tenacity-8.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-8.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7385ee53ed3035428967f3d576733fe
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index c42a9d90d9bf..403b8d1e4da9 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a716893b2696f064791db5aae4bb544f
diff --git a/metadata/md5-cache/dev-python/terminado-0.11.1 b/metadata/md5-cache/dev-python/terminado-0.11.1
index 0fdbd790b9da..07602a98110f 100644
--- a/metadata/md5-cache/dev-python/terminado-0.11.1
+++ b/metadata/md5-cache/dev-python/terminado-0.11.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/t/terminado/terminado-0.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7482786bfd5720c3ffc476f6b12d4ef5
diff --git a/metadata/md5-cache/dev-python/terminado-0.12.1 b/metadata/md5-cache/dev-python/terminado-0.12.1
index 7fcb853e5a38..e9c0454fce0b 100644
--- a/metadata/md5-cache/dev-python/terminado-0.12.1
+++ b/metadata/md5-cache/dev-python/terminado-0.12.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/t/terminado/terminado-0.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04632ef71f5a60c7779b7e783e8efbb9
diff --git a/metadata/md5-cache/dev-python/terminaltables-3.1.0 b/metadata/md5-cache/dev-python/terminaltables-3.1.0
index 0d9f9df0b98f..9c7f647d3b50 100644
--- a/metadata/md5-cache/dev-python/terminaltables-3.1.0
+++ b/metadata/md5-cache/dev-python/terminaltables-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/terminaltables/archive/v3.1.0.tar.gz -> terminaltables-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45fbaec60e01cea2d359952c8f1a0239
diff --git a/metadata/md5-cache/dev-python/terminaltables-9999 b/metadata/md5-cache/dev-python/terminaltables-9999
index bffc8037d41d..f1254b61ce28 100644
--- a/metadata/md5-cache/dev-python/terminaltables-9999
+++ b/metadata/md5-cache/dev-python/terminaltables-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=456e3e01264e9358acfbefc7624ed34c
diff --git a/metadata/md5-cache/dev-python/test_server-0.0.31 b/metadata/md5-cache/dev-python/test_server-0.0.31
index dca6823b32bc..36c2425df29c 100644
--- a/metadata/md5-cache/dev-python/test_server-0.0.31
+++ b/metadata/md5-cache/dev-python/test_server-0.0.31
@@ -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/lorien/test_server/archive/v0.0.31.tar.gz -> test_server-0.0.31.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=272be78dd534b65426d550baf8e33624
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.18.0 b/metadata/md5-cache/dev-python/testfixtures-6.18.0
deleted file mode 100644
index 2fc6a70dbd59..000000000000
--- a/metadata/md5-cache/dev-python/testfixtures-6.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/twisted-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of helpers and mock objects for unit tests and doc tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae082fcc2dcd20e4935af9c77a87cd3a
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.18.1 b/metadata/md5-cache/dev-python/testfixtures-6.18.1
deleted file mode 100644
index 9fc5820b34f7..000000000000
--- a/metadata/md5-cache/dev-python/testfixtures-6.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[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(-)] ) ) ) 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 collection of helpers and mock objects for unit tests and doc tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.18.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6e32e3f019f9b1856f622e92f2bf4af8
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.18.2 b/metadata/md5-cache/dev-python/testfixtures-6.18.2
index cc8ed18e5395..90d79a5e132b 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.18.2
+++ b/metadata/md5-cache/dev-python/testfixtures-6.18.2
@@ -4,12 +4,12 @@ DESCRIPTION=A collection of helpers and mock objects for unit tests and doc test
 EAPI=8
 HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.18.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa61c30e90ba297e453ba792de8a10ce
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=24b61f2a697d72f76f22c2b6f78249ad
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.18.3 b/metadata/md5-cache/dev-python/testfixtures-6.18.3
new file mode 100644
index 000000000000..b4fc9b6a2e79
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testfixtures-6.18.3
@@ -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/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[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(-)] ) ) ) 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 collection of helpers and mock objects for unit tests and doc tests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.18.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aa61c30e90ba297e453ba792de8a10ce
diff --git a/metadata/md5-cache/dev-python/testpath-0.5.0 b/metadata/md5-cache/dev-python/testpath-0.5.0
index b31cd20fc585..11d089c26a5b 100644
--- a/metadata/md5-cache/dev-python/testpath-0.5.0
+++ b/metadata/md5-cache/dev-python/testpath-0.5.0
@@ -4,12 +4,12 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
 IUSE=test doc python_targets_pypy3 python_targets_python3_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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.5.0.tar.gz -> testpath-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=09bf7189785df9e41d052aa0d4b8f8f9
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8f763f4fd9b43b7789571ad34087bc5f
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1 b/metadata/md5-cache/dev-python/testresources-2.0.1
index 12ac1a534cf9..75fe03f3b2ed 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1
@@ -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/t/testresources/testresources-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d370faa299d27e87f59cda0a8478fd27
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1 b/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
index cdb3209f4e5e..fbec36d20517 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.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=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f38842be91063fe49d72c119120774b9
diff --git a/metadata/md5-cache/dev-python/testtools-2.5.0 b/metadata/md5-cache/dev-python/testtools-2.5.0
index b72d817fda9f..6dd2a8c686fb 100644
--- a/metadata/md5-cache/dev-python/testtools-2.5.0
+++ b/metadata/md5-cache/dev-python/testtools-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=324f26912f1bc89dc54cd253ffe36e63
diff --git a/metadata/md5-cache/dev-python/text-unidecode-1.3 b/metadata/md5-cache/dev-python/text-unidecode-1.3
index 736b23f7eeeb..df4391558f91 100644
--- a/metadata/md5-cache/dev-python/text-unidecode-1.3
+++ b/metadata/md5-cache/dev-python/text-unidecode-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=mirror://pypi/t/text-unidecode/text-unidecode-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1315ad89c77da8ed9bb8fb2f42a9a7e
diff --git a/metadata/md5-cache/dev-python/textdistance-4.2.1-r1 b/metadata/md5-cache/dev-python/textdistance-4.2.1-r1
index fc40700bab50..7a209add5d72 100644
--- a/metadata/md5-cache/dev-python/textdistance-4.2.1-r1
+++ b/metadata/md5-cache/dev-python/textdistance-4.2.1-r1
@@ -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/life4/textdistance/archive/v.4.2.1.tar.gz -> textdistance-4.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa1f20c5fe9a6ce6a5fbdfa3e7a95f88
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.4 b/metadata/md5-cache/dev-python/texttable-1.6.4
index 21634c89dee8..785b20a314a6 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=935e50b0d8940c5e164f465ba3386617
diff --git a/metadata/md5-cache/dev-python/textx-1.4 b/metadata/md5-cache/dev-python/textx-1.4
index 5cb992f00e3e..70817b825d15 100644
--- a/metadata/md5-cache/dev-python/textx-1.4
+++ b/metadata/md5-cache/dev-python/textx-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/textX/textX-1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3ef99a53a426f52b4d3217a8908be8e7
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 2a5ab825ad46..32ee3bedb4c2 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=62eb6154d443e8de6521453152cbc3a4
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 ff2721df7cc6..52d17f433c49 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7ec9b31447c3b9f469d56683d0043d8
diff --git a/metadata/md5-cache/dev-python/threadpoolctl-2.2.0 b/metadata/md5-cache/dev-python/threadpoolctl-2.2.0
index c2d724fe23c5..a575ff62d2cb 100644
--- a/metadata/md5-cache/dev-python/threadpoolctl-2.2.0
+++ b/metadata/md5-cache/dev-python/threadpoolctl-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/threadpoolctl/archive/2.2.0.tar.gz -> threadpoolctl-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=628f387b0b374b1142f715f1141581c2
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1 b/metadata/md5-cache/dev-python/three-merge-0.1.1
index ea3514401b1b..de9ace4487b3 100644
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1
+++ b/metadata/md5-cache/dev-python/three-merge-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1-gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd10c9045b194d0bd65901e328850836
diff --git a/metadata/md5-cache/dev-python/thrift-0.14.1 b/metadata/md5-cache/dev-python/thrift-0.14.1
index fa126161724a..5dbf57fe5b6a 100644
--- a/metadata/md5-cache/dev-python/thrift-0.14.1
+++ b/metadata/md5-cache/dev-python/thrift-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.apache.org/thrift/0.14.1//thrift-0.14.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d396c87835802224cf081a282b7aa9b8
diff --git a/metadata/md5-cache/dev-python/thriftpy2-0.4.14 b/metadata/md5-cache/dev-python/thriftpy2-0.4.14
index 243026ae397c..475b3d03034f 100644
--- a/metadata/md5-cache/dev-python/thriftpy2-0.4.14
+++ b/metadata/md5-cache/dev-python/thriftpy2-0.4.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v0.4.14.tar.gz -> thriftpy2-0.4.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ebeb03f4149c25e34399264e7d7c8cd
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.11 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.11
index 4eb936db4e4d..357589eae254 100644
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.11
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.11
@@ -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/nschloe/tikzplotlib/archive/0.9.11.tar.gz -> tikzplotlib-0.9.11.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=32bcfa41c03f6dbe61c071a7f7fffd6f
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.12 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.12
index 6754ba266d90..f022e6f016c1 100644
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.12
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.12
@@ -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/nschloe/tikzplotlib/archive/0.9.12.tar.gz -> tikzplotlib-0.9.12.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=32bcfa41c03f6dbe61c071a7f7fffd6f
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.13 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.13
new file mode 100644
index 000000000000..c224557b423e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/exdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,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[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/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[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/pyproject2setuppy-18[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 prepare test
+DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
+EAPI=8
+HOMEPAGE=https://github.com/nschloe/tikzplotlib
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/nschloe/tikzplotlib/archive/v0.9.13.tar.gz -> tikzplotlib-0.9.13.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=9b2434aa0330655d85f6b194e3faa6c6
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.9 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.9
index a74044a62610..c11afd9480ef 100644
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.9
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.9.tar.gz -> tikzplotlib-0.9.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6f660fff45842f97b609e2b805a1b416
diff --git a/metadata/md5-cache/dev-python/timeout-decorator-0.5.0 b/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
index c6b0b43e3fa6..82d8454616fb 100644
--- a/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
+++ b/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/timeout-decorator/archive/9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz -> timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90f64755e526f53ac80af765a6c77a56
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index e13dd08fd858..d23570d128d2 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -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/t/tinycss/tinycss-0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49560743908cb482414b95deb4ff4f03
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.1.0 b/metadata/md5-cache/dev-python/tinycss2-1.1.0
index 5d4733573ad0..f920cd939eb2 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.1.0
+++ b/metadata/md5-cache/dev-python/tinycss2-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/tinycss2/archive/v1.1.0.tar.gz -> tinycss2-1.1.0.gh.tar.gz test? ( https://github.com/SimonSapin/css-parsing-tests/archive/c5749e51dda3868b3e8062e65a36584c2fec8059.tar.gz -> css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d2dc9bbaf2f6562fa908c109252d971
diff --git a/metadata/md5-cache/dev-python/tld-0.12.2 b/metadata/md5-cache/dev-python/tld-0.12.2
index 3106760aea42..53a8e0d2af49 100644
--- a/metadata/md5-cache/dev-python/tld-0.12.2
+++ b/metadata/md5-cache/dev-python/tld-0.12.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.2.tar.gz -> tld-0.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c3b2297d3b94c23546dd702c68f8428
diff --git a/metadata/md5-cache/dev-python/tld-0.12.3 b/metadata/md5-cache/dev-python/tld-0.12.3
index 92f236a4c63d..5a1e96f915cd 100644
--- a/metadata/md5-cache/dev-python/tld-0.12.3
+++ b/metadata/md5-cache/dev-python/tld-0.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.3.tar.gz -> tld-0.12.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=713e245d444b539a228d9ea9c963ebb9
diff --git a/metadata/md5-cache/dev-python/tld-0.12.5 b/metadata/md5-cache/dev-python/tld-0.12.5
index c6dd7c29dcf5..65f0f996cd55 100644
--- a/metadata/md5-cache/dev-python/tld-0.12.5
+++ b/metadata/md5-cache/dev-python/tld-0.12.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.5.tar.gz -> tld-0.12.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cf85a58fdc24d0b0b71aebe7890fdd3
diff --git a/metadata/md5-cache/dev-python/tld-0.12.6 b/metadata/md5-cache/dev-python/tld-0.12.6
index 13486cac7e5c..dbb456321468 100644
--- a/metadata/md5-cache/dev-python/tld-0.12.6
+++ b/metadata/md5-cache/dev-python/tld-0.12.6
@@ -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/barseghyanartur/tld/archive/0.12.6.tar.gz -> tld-0.12.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4618673f2c7b8cae1efa4249baded093
diff --git a/metadata/md5-cache/dev-python/tldextract-2.2.1 b/metadata/md5-cache/dev-python/tldextract-2.2.1
index 8109a19da21e..6884b2668ada 100644
--- a/metadata/md5-cache/dev-python/tldextract-2.2.1
+++ b/metadata/md5-cache/dev-python/tldextract-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tldextract/tldextract-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f301b2034337df2c364ee28f8362805
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.0 b/metadata/md5-cache/dev-python/tldextract-3.1.0
index 80d88e4e7f50..e12721182c67 100644
--- a/metadata/md5-cache/dev-python/tldextract-3.1.0
+++ b/metadata/md5-cache/dev-python/tldextract-3.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/t/tldextract/tldextract-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c1d82ed85c6d423d3e7f022403a43111
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.1 b/metadata/md5-cache/dev-python/tldextract-3.1.1
index 1c8e134d73ea..fed36e01529b 100644
--- a/metadata/md5-cache/dev-python/tldextract-3.1.1
+++ b/metadata/md5-cache/dev-python/tldextract-3.1.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/t/tldextract/tldextract-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0e054afab93d3734d192d5dbdfdb311
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.2 b/metadata/md5-cache/dev-python/tldextract-3.1.2
index 200d638f0e10..881ccc62aeca 100644
--- a/metadata/md5-cache/dev-python/tldextract-3.1.2
+++ b/metadata/md5-cache/dev-python/tldextract-3.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=mirror://pypi/t/tldextract/tldextract-3.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e2bf99e8347b66007aac31010205ee7
diff --git a/metadata/md5-cache/dev-python/toml-0.10.2 b/metadata/md5-cache/dev-python/toml-0.10.2
index 469183548c59..68a05b55e524 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.2
+++ b/metadata/md5-cache/dev-python/toml-0.10.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/uiri/toml/archive/0.10.2.tar.gz -> toml-0.10.2-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2b3bb4a118cd698e07298748fa2c9ac
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
index dcc06e1d25ec..f99d384ec624 100644
--- a/metadata/md5-cache/dev-python/tomli-1.0.4
+++ b/metadata/md5-cache/dev-python/tomli-1.0.4
@@ -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/hukkin/tomli/archive/1.0.4.tar.gz -> tomli-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6f74a3ceca49151ad817f773c3487dc
diff --git a/metadata/md5-cache/dev-python/tomli-1.2.1 b/metadata/md5-cache/dev-python/tomli-1.2.1
index 99064b832067..929f6f90b8a1 100644
--- a/metadata/md5-cache/dev-python/tomli-1.2.1
+++ b/metadata/md5-cache/dev-python/tomli-1.2.1
@@ -1,7 +1,7 @@
 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
+EAPI=7
 HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
@@ -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/hukkin/tomli/archive/1.2.1.tar.gz -> tomli-1.2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11e6abac75d80de760d328ffdb03e462
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=69a6d9541c787a92184c7f22ebc7c937
diff --git a/metadata/md5-cache/dev-python/tomlkit-0.7.2 b/metadata/md5-cache/dev-python/tomlkit-0.7.2
index 653829835f8a..248ee5bc9cd5 100644
--- a/metadata/md5-cache/dev-python/tomlkit-0.7.2
+++ b/metadata/md5-cache/dev-python/tomlkit-0.7.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/t/tomlkit/tomlkit-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27c4bc2fe950d9d65ce0d84ebbcc8f3b
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.1 b/metadata/md5-cache/dev-python/toolz-0.11.1
index 887fb0d1c249..afd7030c40fe 100644
--- a/metadata/md5-cache/dev-python/toolz-0.11.1
+++ b/metadata/md5-cache/dev-python/toolz-0.11.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/t/toolz/toolz-0.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f93f67cbd0583d11febc98420fb3ebc
diff --git a/metadata/md5-cache/dev-python/toposort-1.6 b/metadata/md5-cache/dev-python/toposort-1.6
index 0f2302f8f33e..0f2da0609b80 100644
--- a/metadata/md5-cache/dev-python/toposort-1.6
+++ b/metadata/md5-cache/dev-python/toposort-1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/t/toposort/toposort-1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54c2e53ab0ae3d2f00754c3eb423233d
diff --git a/metadata/md5-cache/dev-python/toposort-1.7 b/metadata/md5-cache/dev-python/toposort-1.7
new file mode 100644
index 000000000000..d150fc75e7ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toposort-1.7
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Implements a topological sort algorithm
+EAPI=8
+HOMEPAGE=https://gitlab.com/ericvsmith/toposort
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/toposort/toposort-1.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=31b195a6399ebb028a04945958f1be29
diff --git a/metadata/md5-cache/dev-python/towncrier-21.3.0 b/metadata/md5-cache/dev-python/towncrier-21.3.0
index 57d115f613bc..92e4b57c90d4 100644
--- a/metadata/md5-cache/dev-python/towncrier-21.3.0
+++ b/metadata/md5-cache/dev-python/towncrier-21.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/towncrier/archive/21.3.0.tar.gz -> towncrier-21.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0549558196ad4ff910e1b58b70cbcba6
diff --git a/metadata/md5-cache/dev-python/tox-3.24.3 b/metadata/md5-cache/dev-python/tox-3.24.3
index c2d86c992e7e..ff0c4b55d783 100644
--- a/metadata/md5-cache/dev-python/tox-3.24.3
+++ b/metadata/md5-cache/dev-python/tox-3.24.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/tox-dev/tox/archive/3.24.3.tar.gz -> tox-3.24.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cdeec9ec5869273f5db0d0e2cc7d949
diff --git a/metadata/md5-cache/dev-python/tox-3.24.4 b/metadata/md5-cache/dev-python/tox-3.24.4
index 2740aeb1d27c..d5497ecae019 100644
--- a/metadata/md5-cache/dev-python/tox-3.24.4
+++ b/metadata/md5-cache/dev-python/tox-3.24.4
@@ -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/tox-dev/tox/archive/3.24.4.tar.gz -> tox-3.24.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1744a82ca037ecdd113797a3f4ba1936
diff --git a/metadata/md5-cache/dev-python/tqdm-4.62.0 b/metadata/md5-cache/dev-python/tqdm-4.62.0
deleted file mode 100644
index 6c220c899422..000000000000
--- a/metadata/md5-cache/dev-python/tqdm-4.62.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-asyncio[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(-)?] ) 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=Add a progress meter to your loops in a second
-EAPI=8
-HOMEPAGE=https://github.com/tqdm/tqdm
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tqdm/tqdm-4.62.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a4025af58bb161bb95afcdb61d6f87d
diff --git a/metadata/md5-cache/dev-python/tqdm-4.62.2 b/metadata/md5-cache/dev-python/tqdm-4.62.2
index 850eccf8e5bf..1680e2d11f31 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.62.2
+++ b/metadata/md5-cache/dev-python/tqdm-4.62.2
@@ -4,12 +4,12 @@ DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=8
 HOMEPAGE=https://github.com/tqdm/tqdm
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.62.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=371002b80430ed56ae171cdeed4ede93
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a4025af58bb161bb95afcdb61d6f87d
diff --git a/metadata/md5-cache/dev-python/tqdm-4.62.3 b/metadata/md5-cache/dev-python/tqdm-4.62.3
index 9b6d2f525b40..bdca78001d24 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.62.3
+++ b/metadata/md5-cache/dev-python/tqdm-4.62.3
@@ -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/t/tqdm/tqdm-4.62.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=371002b80430ed56ae171cdeed4ede93
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.3 b/metadata/md5-cache/dev-python/traitlets-4.3.3
index f4a52575a6e6..791b7ece276a 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.3
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=33e3c05a3fc555de7fbdf6f1fdd5de17
diff --git a/metadata/md5-cache/dev-python/traitlets-5.0.5 b/metadata/md5-cache/dev-python/traitlets-5.0.5
index 8da1bb72e329..1f87de58ce47 100644
--- a/metadata/md5-cache/dev-python/traitlets-5.0.5
+++ b/metadata/md5-cache/dev-python/traitlets-5.0.5
@@ -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/t/traitlets/traitlets-5.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=477ece2e8428829ba68d2a7a34da110e
diff --git a/metadata/md5-cache/dev-python/traitlets-5.1.0 b/metadata/md5-cache/dev-python/traitlets-5.1.0
index ebad8e6453b5..388288d6c9cf 100644
--- a/metadata/md5-cache/dev-python/traitlets-5.1.0
+++ b/metadata/md5-cache/dev-python/traitlets-5.1.0
@@ -4,12 +4,12 @@ DESCRIPTION=A configuration system for Python applications
 EAPI=8
 HOMEPAGE=https://github.com/ipython/traitlets
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 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=mirror://pypi/t/traitlets/traitlets-5.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=054ceecb970f635e1204207c423c798a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49a5112e44a3422dc6315567607b850d
diff --git a/metadata/md5-cache/dev-python/transitions-0.8.8 b/metadata/md5-cache/dev-python/transitions-0.8.8
index 7ca032b230d8..76a384b6ca54 100644
--- a/metadata/md5-cache/dev-python/transitions-0.8.8
+++ b/metadata/md5-cache/dev-python/transitions-0.8.8
@@ -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/pytransitions/transitions/archive/0.8.8.tar.gz -> transitions-0.8.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcbe069e0c8e5ed3742fdd70c90bf7b2
diff --git a/metadata/md5-cache/dev-python/transitions-0.8.9 b/metadata/md5-cache/dev-python/transitions-0.8.9
index b6038b006d5e..654f9ed4121f 100644
--- a/metadata/md5-cache/dev-python/transitions-0.8.9
+++ b/metadata/md5-cache/dev-python/transitions-0.8.9
@@ -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/pytransitions/transitions/archive/0.8.9.tar.gz -> transitions-0.8.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=033c59b33cc97e17932d797d9de47795
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.6 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.6
deleted file mode 100644
index a71c620e5c08..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=7
-HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/refs/tags/3.3.6.tar.gz -> translate-3.3.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5903b4ef210e8ec7856da5dcac72a747
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.4.0 b/metadata/md5-cache/dev-python/translate-toolkit-3.4.0
deleted file mode 100644
index 70d219370228..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10[sqlite] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[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(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=7
-HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[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(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/archive/refs/tags/3.4.0.tar.gz -> translate-3.4.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fcae6bf0cd63d893e2457a7e37143612
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.4.1 b/metadata/md5-cache/dev-python/translate-toolkit-3.4.1
index 6b912b3a317d..8ddd959b6097 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.4.1
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.4.1
@@ -4,12 +4,12 @@ DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=8
 HOMEPAGE=https://github.com/translate/translate
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[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(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/refs/tags/3.4.1.tar.gz -> translate-3.4.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4d72148dd317402366cbe3eab54079a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2f03813492545f970166763088f0e3c0
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
index 8ba3dcfa9a44..bbb5ea78d597 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
@@ -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/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz https://github.com/tree-sitter/tree-sitter/archive/v0.19.5.tar.gz -> tree-sitter-0.19.5.gh.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6a22e770e76c5f1958034b84c01f270
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
index 482d99638a03..5fce1adbfd37 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
@@ -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/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63c010723c402d987119892084e7b30c
diff --git a/metadata/md5-cache/dev-python/treq-20.9.0 b/metadata/md5-cache/dev-python/treq-20.9.0
index e2d08734732c..a9f71402d4cb 100644
--- a/metadata/md5-cache/dev-python/treq-20.9.0
+++ b/metadata/md5-cache/dev-python/treq-20.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-20.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34592fc801077ec82b286f27143e032b
diff --git a/metadata/md5-cache/dev-python/treq-21.1.0 b/metadata/md5-cache/dev-python/treq-21.1.0
index b315807b5a8a..e7d2cf6b011b 100644
--- a/metadata/md5-cache/dev-python/treq-21.1.0
+++ b/metadata/md5-cache/dev-python/treq-21.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/t/treq/treq-21.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6f1ea4231f9339641343343408407b6
diff --git a/metadata/md5-cache/dev-python/treq-21.5.0 b/metadata/md5-cache/dev-python/treq-21.5.0
index 0de46c7f25a6..3f7afbef5fc9 100644
--- a/metadata/md5-cache/dev-python/treq-21.5.0
+++ b/metadata/md5-cache/dev-python/treq-21.5.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/t/treq/treq-21.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3d42e3b3cd7d9a1a469342b4bfac180
diff --git a/metadata/md5-cache/dev-python/trio-0.19.0 b/metadata/md5-cache/dev-python/trio-0.19.0
index 6f824bd337e3..ae29c5102997 100644
--- a/metadata/md5-cache/dev-python/trio-0.19.0
+++ b/metadata/md5-cache/dev-python/trio-0.19.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/python-trio/trio/archive/v0.19.0.tar.gz -> trio-0.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a7189878e924bbd7af834393c392682d
diff --git a/metadata/md5-cache/dev-python/trio-asyncio-0.12.0 b/metadata/md5-cache/dev-python/trio-asyncio-0.12.0
index 9110e57b3fa5..0fa64ea73482 100644
--- a/metadata/md5-cache/dev-python/trio-asyncio-0.12.0
+++ b/metadata/md5-cache/dev-python/trio-asyncio-0.12.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/python-trio/trio-asyncio/archive/v0.12.0.tar.gz -> trio-asyncio-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c44bb82d4349fb801602efc51e11465
diff --git a/metadata/md5-cache/dev-python/trustme-0.9.0 b/metadata/md5-cache/dev-python/trustme-0.9.0
index 7263241f7802..982452f4edbc 100644
--- a/metadata/md5-cache/dev-python/trustme-0.9.0
+++ b/metadata/md5-cache/dev-python/trustme-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97b120f7a6d9416494794194bdb3a3cc
diff --git a/metadata/md5-cache/dev-python/tubes-0.2.0-r1 b/metadata/md5-cache/dev-python/tubes-0.2.0-r1
index 10c0acaeb1bd..6ca71f702a22 100644
--- a/metadata/md5-cache/dev-python/tubes-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/tubes-0.2.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=https://github.com/twisted/tubes/archive/v0.2.0.tar.gz -> tubes-0.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67c66820a5a0d54eeec892bb90fcff1f
diff --git a/metadata/md5-cache/dev-python/tvdb_api-3.0.2 b/metadata/md5-cache/dev-python/tvdb_api-3.0.2
index 71e6eddf2ee3..d027db3ab129 100644
--- a/metadata/md5-cache/dev-python/tvdb_api-3.0.2
+++ b/metadata/md5-cache/dev-python/tvdb_api-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvdb_api/tvdb_api-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3811e20c43ee9a9b369fc057bc39f923
diff --git a/metadata/md5-cache/dev-python/twine-3.4.2 b/metadata/md5-cache/dev-python/twine-3.4.2
index 517cebe7d61b..7f539b57912a 100644
--- a/metadata/md5-cache/dev-python/twine-3.4.2
+++ b/metadata/md5-cache/dev-python/twine-3.4.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/pypa/twine/archive/3.4.2.tar.gz -> twine-3.4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b910bbf4ee73f921e0940067367f8c7
diff --git a/metadata/md5-cache/dev-python/twisted-21.2.0-r1 b/metadata/md5-cache/dev-python/twisted-21.2.0-r1
index d810b956aabf..6dff9cb5a47b 100644
--- a/metadata/md5-cache/dev-python/twisted-21.2.0-r1
+++ b/metadata/md5-cache/dev-python/twisted-21.2.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=https://github.com/twisted/twisted/archive/twisted-21.2.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=3b04e764f20e7c6ac82cdc6161f695bf
diff --git a/metadata/md5-cache/dev-python/twisted-21.7.0 b/metadata/md5-cache/dev-python/twisted-21.7.0
index ba58a7a724b6..40c4d8f3109b 100644
--- a/metadata/md5-cache/dev-python/twisted-21.7.0
+++ b/metadata/md5-cache/dev-python/twisted-21.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.7.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=c7d2eeeb1bcd2e720f5cc7ef66b895f8
diff --git a/metadata/md5-cache/dev-python/twython-3.9.1 b/metadata/md5-cache/dev-python/twython-3.9.1
index 69d1f2585a93..37ce8be9d84f 100644
--- a/metadata/md5-cache/dev-python/twython-3.9.1
+++ b/metadata/md5-cache/dev-python/twython-3.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanmcgrath/twython/archive/v3.9.1.tar.gz -> twython-3.9.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81f574818bebb8b34ca233d2ca7f94c6
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.8.2 b/metadata/md5-cache/dev-python/txAMQP-0.8.2
index e63a5fb08a01..8313f389afff 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.8.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/txamqp/txamqp/archive/0.8.2.tar.gz -> txamqp-0.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=571eb10d6bc71622d28931167acce3c3
diff --git a/metadata/md5-cache/dev-python/txaio-21.2.1 b/metadata/md5-cache/dev-python/txaio-21.2.1
index dafc10c6d0a4..e9e306d92850 100644
--- a/metadata/md5-cache/dev-python/txaio-21.2.1
+++ b/metadata/md5-cache/dev-python/txaio-21.2.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/t/txaio/txaio-21.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcd8329d1aa186d58f08f2789b5f2fec
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
index 23b08d304e12..2b5974c8b3e6 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dc232a2f97c691d3b842d9ba5266fb97
diff --git a/metadata/md5-cache/dev-python/txrequests-0.9.6 b/metadata/md5-cache/dev-python/txrequests-0.9.6
index a7a05774d1d3..d25d93ddf1fd 100644
--- a/metadata/md5-cache/dev-python/txrequests-0.9.6
+++ b/metadata/md5-cache/dev-python/txrequests-0.9.6
@@ -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/t/txrequests/txrequests-0.9.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e15ed536e2bd18b37b7e74558b8f19fc
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.3 b/metadata/md5-cache/dev-python/typed-ast-1.4.3
index 83f16690cb4b..d235a16dac99 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.3
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.3
@@ -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/t/typed_ast/typed_ast-1.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78da7ce20486e0f4f23e1eb966baf422
diff --git a/metadata/md5-cache/dev-python/typeguard-2.12.1 b/metadata/md5-cache/dev-python/typeguard-2.12.1
index c596da5283c5..0ec2614a2989 100644
--- a/metadata/md5-cache/dev-python/typeguard-2.12.1
+++ b/metadata/md5-cache/dev-python/typeguard-2.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/agronholm/typeguard/archive/2.12.1.tar.gz -> typeguard-2.12.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5317d342652cf7572680403923e90953
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0 b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
index 573cec060e34..72699d57c77a 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.10.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2079c9c2008a8420b881b1ce9efa7254
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.2 b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.2
index fc701c7c71b2..b558db48934d 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.2
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.10.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d4c81819d4e0a6382bee783551ac2e7
diff --git a/metadata/md5-cache/dev-python/typogrify-2.0.7 b/metadata/md5-cache/dev-python/typogrify-2.0.7
index a4795bae9aaf..98de450159d7 100644
--- a/metadata/md5-cache/dev-python/typogrify-2.0.7
+++ b/metadata/md5-cache/dev-python/typogrify-2.0.7
@@ -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/t/typogrify/typogrify-2.0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=563f6a66835dabdd18987150a88cbba9
diff --git a/metadata/md5-cache/dev-python/tzlocal-2.1 b/metadata/md5-cache/dev-python/tzlocal-2.1
index 9ed805086d28..eeee4d1b1b16 100644
--- a/metadata/md5-cache/dev-python/tzlocal-2.1
+++ b/metadata/md5-cache/dev-python/tzlocal-2.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/regebro/tzlocal/archive/2.1.tar.gz -> tzlocal-2.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=236054289ce3163450a201b3e960ccb7
diff --git a/metadata/md5-cache/dev-python/tzlocal-3.0 b/metadata/md5-cache/dev-python/tzlocal-3.0
index 270261c94334..0d5ae1e4c26c 100644
--- a/metadata/md5-cache/dev-python/tzlocal-3.0
+++ b/metadata/md5-cache/dev-python/tzlocal-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/regebro/tzlocal/archive/3.0.tar.gz -> tzlocal-3.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fce8ecceb04d8d7ea070b4fa8eebaca
diff --git a/metadata/md5-cache/dev-python/u-msgpack-python-2.7.1 b/metadata/md5-cache/dev-python/u-msgpack-python-2.7.1
index 3d90ae9f353e..579403a5fde7 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-python-2.7.1
+++ b/metadata/md5-cache/dev-python/u-msgpack-python-2.7.1
@@ -4,12 +4,12 @@ DESCRIPTION=A portable, lightweight MessagePack serializer and deserializer
 EAPI=7
 HOMEPAGE=https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/
 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f81ffd7627e5a978f76b61e89a2da743
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c998c895019041e82f751ced7e4d10ce
diff --git a/metadata/md5-cache/dev-python/ubelt-0.10.0 b/metadata/md5-cache/dev-python/ubelt-0.10.0
index 8975d61fc6d3..615d2f213c0b 100644
--- a/metadata/md5-cache/dev-python/ubelt-0.10.0
+++ b/metadata/md5-cache/dev-python/ubelt-0.10.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/Erotemic/ubelt/archive/0.10.0.tar.gz -> ubelt-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00aae720b2f7a93d9cf3dc2ff8df088d
diff --git a/metadata/md5-cache/dev-python/ubelt-0.10.1 b/metadata/md5-cache/dev-python/ubelt-0.10.1
index 86e44646ac86..6638f2fc47e5 100644
--- a/metadata/md5-cache/dev-python/ubelt-0.10.1
+++ b/metadata/md5-cache/dev-python/ubelt-0.10.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/Erotemic/ubelt/archive/0.10.1.tar.gz -> ubelt-0.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00aae720b2f7a93d9cf3dc2ff8df088d
diff --git a/metadata/md5-cache/dev-python/ubelt-0.9.5 b/metadata/md5-cache/dev-python/ubelt-0.9.5
index 22b3fd38b6aa..002258f3e152 100644
--- a/metadata/md5-cache/dev-python/ubelt-0.9.5
+++ b/metadata/md5-cache/dev-python/ubelt-0.9.5
@@ -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/Erotemic/ubelt/archive/0.9.5.tar.gz -> ubelt-0.9.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc11abb185f2537c387070768ec5b362
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.2 b/metadata/md5-cache/dev-python/ujson-4.0.2
index 5a26ccf1289f..b0799a00056b 100644
--- a/metadata/md5-cache/dev-python/ujson-4.0.2
+++ b/metadata/md5-cache/dev-python/ujson-4.0.2
@@ -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/u/ujson/ujson-4.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c838529fc16a248d27cf7b3ed9f125b
diff --git a/metadata/md5-cache/dev-python/ujson-4.1.0 b/metadata/md5-cache/dev-python/ujson-4.1.0
index 9092b35d4fe9..82144199b2fb 100644
--- a/metadata/md5-cache/dev-python/ujson-4.1.0
+++ b/metadata/md5-cache/dev-python/ujson-4.1.0
@@ -4,12 +4,12 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
 IUSE=test python_targets_pypy3 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=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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/u/ujson/ujson-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ef7620d0bc99ca5b3c17718055a29f2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=71c0f1ba8c30a1b40f7fc46c9fb76aa5
diff --git a/metadata/md5-cache/dev-python/ujson-4.2.0 b/metadata/md5-cache/dev-python/ujson-4.2.0
index 4f7f6b2e0e9e..462a5f36fb3d 100644
--- a/metadata/md5-cache/dev-python/ujson-4.2.0
+++ b/metadata/md5-cache/dev-python/ujson-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-4.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=901f09e81dcff43bab33ce5ff9ac2c2c
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1 b/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
index 73c9be6234e6..cdaee86bd131 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dee9d9bc03521242ec550407dea3952b
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.6 b/metadata/md5-cache/dev-python/uncertainties-3.1.6
index e78a216d1a5e..afd6d945bab9 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.6
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.6
@@ -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/u/uncertainties/uncertainties-3.1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=06963ac294d79042416aeec903f90ccf
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
index e5e060357f7f..50c17bafb126 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-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/u/unicodecsv/unicodecsv-0.14.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=175af1968758ea0bde66e7d4768f4dfe
diff --git a/metadata/md5-cache/dev-python/unidecode-1.2.0 b/metadata/md5-cache/dev-python/unidecode-1.2.0
index 751dd117b7dc..8933bc198e2c 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.2.0
+++ b/metadata/md5-cache/dev-python/unidecode-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd4d47ae9e1c4ad590971509f7b52fbe
diff --git a/metadata/md5-cache/dev-python/unidecode-1.3.0 b/metadata/md5-cache/dev-python/unidecode-1.3.0
index 0715aaee1b2d..1af6f5d256c8 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.3.0
+++ b/metadata/md5-cache/dev-python/unidecode-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba03140f9de2ed16598910b7d179b0b0
diff --git a/metadata/md5-cache/dev-python/unidiff-0.6.0 b/metadata/md5-cache/dev-python/unidiff-0.6.0
index 396982f2158a..9a3ceaca8856 100644
--- a/metadata/md5-cache/dev-python/unidiff-0.6.0
+++ b/metadata/md5-cache/dev-python/unidiff-0.6.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/u/unidiff/unidiff-0.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=117e05d63089deb4479b764325a374ce
diff --git a/metadata/md5-cache/dev-python/unidiff-0.7.0 b/metadata/md5-cache/dev-python/unidiff-0.7.0
index b5f0a777c06d..632cad5ab3cb 100644
--- a/metadata/md5-cache/dev-python/unidiff-0.7.0
+++ b/metadata/md5-cache/dev-python/unidiff-0.7.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/u/unidiff/unidiff-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f9f70e13f48e9da13f1f585518cd8bd
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1 b/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
index 5fb894fff1f5..14de9744610b 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.6-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/nedbat/unittest-mixins/archive/v1.6.tar.gz -> unittest-mixins-1.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8acec7f6412e1e8419b8f9c959a8e242
diff --git a/metadata/md5-cache/dev-python/unittest-or-fail-1 b/metadata/md5-cache/dev-python/unittest-or-fail-1
index f015af2c491c..0d3bc0d11f4d 100644
--- a/metadata/md5-cache/dev-python/unittest-or-fail-1
+++ b/metadata/md5-cache/dev-python/unittest-or-fail-1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/unittest-or-fail/archive/v1.tar.gz -> unittest-or-fail-1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07ef6f9005ec29888e6fc50f7a88ee1f
diff --git a/metadata/md5-cache/dev-python/untangle-1.1.1 b/metadata/md5-cache/dev-python/untangle-1.1.1
index 3e4919ae5d37..853930c52066 100644
--- a/metadata/md5-cache/dev-python/untangle-1.1.1
+++ b/metadata/md5-cache/dev-python/untangle-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/untangle/untangle-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ed54d343cb14ca0d39a7980bbcf09b4
diff --git a/metadata/md5-cache/dev-python/uranium-4.9.1 b/metadata/md5-cache/dev-python/uranium-4.9.1
index c4da3f83f4eb..136635f5ac58 100644
--- a/metadata/md5-cache/dev-python/uranium-4.9.1
+++ b/metadata/md5-cache/dev-python/uranium-4.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.9.1.tar.gz -> uranium-4.9.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b0cf7d02bcece805c2e49353003059f6
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.5 b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.5
index 5299565d625a..b7361601dbc6 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.5
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.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://github.com/ros/urdf_parser_py/archive/0.4.5.tar.gz -> urdf_parser_py-0.4.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bd430939e362edd7d959a7e5e92c7cc
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1 b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
index c47ba7549a11..dac8970383eb 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6032685cbf3c37c6d8ebc7e781d51903
diff --git a/metadata/md5-cache/dev-python/url-normalize-1.4.3 b/metadata/md5-cache/dev-python/url-normalize-1.4.3
index 3f62956481d3..4b9bb66e77fa 100644
--- a/metadata/md5-cache/dev-python/url-normalize-1.4.3
+++ b/metadata/md5-cache/dev-python/url-normalize-1.4.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/niksite/url-normalize/archive/1.4.3.tar.gz -> url-normalize-1.4.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d75f2c3c7cf24ad00ded8720002ce8c8
diff --git a/metadata/md5-cache/dev-python/urlgrabber-4.1.0 b/metadata/md5-cache/dev-python/urlgrabber-4.1.0
index c9f7313699fc..295e1dd714f3 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-4.1.0
+++ b/metadata/md5-cache/dev-python/urlgrabber-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rpm-software-management/urlgrabber/archive/urlgrabber-4-1-0.tar.gz -> urlgrabber-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b4f577e771f55d980dff35ac76a5d33
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.6 b/metadata/md5-cache/dev-python/urllib3-1.26.6
index f865de701543..13366dca1076 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.6
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.6
@@ -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/u/urllib3/urllib3-1.26.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=925b697435d45b5532595fd22b264d5f
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.7 b/metadata/md5-cache/dev-python/urllib3-1.26.7
index b09207f7586a..8fdd13db29a4 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.7
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.7
@@ -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/u/urllib3/urllib3-1.26.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f0cbbeed1808b1d48a8ba94aacbe60c
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.1 b/metadata/md5-cache/dev-python/urwid-2.1.1
index cb5fb032401a..938c4882ab6d 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.1
+++ b/metadata/md5-cache/dev-python/urwid-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee90af3c9f9f6066c095c7f6b77bc35d
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.3 b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
index 4f050b83fde1..1d38774ca4cd 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.3
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.3.tar.gz -> urwidtrees-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=943c2d102734a06814c6790d0746d71b
diff --git a/metadata/md5-cache/dev-python/utidylib-0.6-r2 b/metadata/md5-cache/dev-python/utidylib-0.6-r2
index 8cb0ee7d8a7f..106b3fe2886c 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.6-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.6-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( pytho
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/utidylib/uTidylib-0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ebab543d0e80ad80bd1b77588ff16970
diff --git a/metadata/md5-cache/dev-python/utidylib-0.7-r2 b/metadata/md5-cache/dev-python/utidylib-0.7-r2
index 455ac4480801..03281abd3357 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.7-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.7-r2
@@ -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/nijel/utidylib/archive/v0.7.tar.gz -> utidylib-0.7.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9e70aa1175a2ce08a94d927dfd9a45ee
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.13.4 b/metadata/md5-cache/dev-python/uvicorn-0.13.4
index 1f45025e4394..3711e9c1a1d3 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.13.4
+++ b/metadata/md5-cache/dev-python/uvicorn-0.13.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/encode/uvicorn/archive/0.13.4.tar.gz -> uvicorn-0.13.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8aa6533987f8ccd2c83bb371f3fd3bba
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.14.0 b/metadata/md5-cache/dev-python/uvicorn-0.14.0
index 54af1a7feda5..3f1aad1ec5ac 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.14.0
+++ b/metadata/md5-cache/dev-python/uvicorn-0.14.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/encode/uvicorn/archive/0.14.0.tar.gz -> uvicorn-0.14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4fd219e8e3cbd1358464fbde90357a4
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 0919c753ff33..b61109bde22b 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/uvicorn-0.14.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=https://github.com/encode/uvicorn/archive/0.14.0.tar.gz -> uvicorn-0.14.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fb0fcb1bd0b49e2cf7abb21f1f69710
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913 b/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
index 2d50e8881ca6..2600c2acd16e 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
+++ b/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
@@ -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/encode/uvicorn/archive/99acac598682b45be98094216f7db223c1fdf5f2.tar.gz -> uvicorn-0.15.0_p20210913.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=313a5f69f77e5ae0b853dad073d03c12
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.2 b/metadata/md5-cache/dev-python/uvloop-0.15.2
index 21f913ff76e3..f02bae52f716 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.2
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _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 1b0381e44b63..e20c7c6dc545 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e139133627668b3545ad101f4f57a1b
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 1678cfbaaf61..a0f9849b38b5 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
@@ -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/u/uvloop/uvloop-0.15.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2768816977b0c57a7da74030f66fa4d1
diff --git a/metadata/md5-cache/dev-python/uvloop-0.16.0 b/metadata/md5-cache/dev-python/uvloop-0.16.0
index c31d73eaffac..e534ca7db62a 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.16.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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-0.29.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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/libuv-1.11.0:=
 DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
@@ -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/u/uvloop/uvloop-0.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8a6d30a732612549d7a418def7847c56
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d6438356b03553c34af1b5e2e378322f
diff --git a/metadata/md5-cache/dev-python/validators-0.18.2 b/metadata/md5-cache/dev-python/validators-0.18.2
index 9cd70195f529..f36a69c84ab4 100644
--- a/metadata/md5-cache/dev-python/validators-0.18.2
+++ b/metadata/md5-cache/dev-python/validators-0.18.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/v/validators/validators-0.18.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bf3819f3ae5133386c6a61ef2bb73a1
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.1 b/metadata/md5-cache/dev-python/vcrpy-4.1.1
index 4608f75bbb6d..8f5195d1b042 100644
--- a/metadata/md5-cache/dev-python/vcrpy-4.1.1
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.1.tar.gz -> vcrpy-4.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5a4307c99cb223cc6b7e8a0c736027e2
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.42 b/metadata/md5-cache/dev-python/vcstools-0.1.42
index ead01bc8addb..919a50262a16 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.42
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -1,16 +1,15 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git dev-vcs/mercurial dev-vcs/subversion ) test? ( dev-python/pyyaml[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/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
-DEPEND=dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?]
 DESCRIPTION=Python library for interacting with various VCS systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/vcstools
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/python-dateutil[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 )
+RDEPEND=dev-python/pyyaml[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(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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=http://download.ros.org/downloads/vcstools/vcstools-0.1.42.tar.gz https://github.com/vcstools/vcstools/archive/0.1.42.tar.gz -> vcstools-0.1.42.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1e0031da5cd3b50f69de6b6792e94b9
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9d18debc39c2952232cc7f23e2f86cc6
diff --git a/metadata/md5-cache/dev-python/vdf-3.4 b/metadata/md5-cache/dev-python/vdf-3.4
index 77fcd0c4e3e3..fe45e740470c 100644
--- a/metadata/md5-cache/dev-python/vdf-3.4
+++ b/metadata/md5-cache/dev-python/vdf-3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/ValvePython/vdf/tar.gz/v3.4 -> vdf-3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f103946dad732a513e1baad51d2137a
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
index 0a60e51720ba..fa11b11ace5b 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=50dc00493a1d7427f07c741964b73ac9
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0
index 86bed3138418..89d05cb5ac81 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0a7f6f7d6296e8290038b95a6a0ad12
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2
index 41cf73839db2..0ad45be5d404 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r2
@@ -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/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe4cac35b59c4e3847bb03ef406ed195
diff --git a/metadata/md5-cache/dev-python/vecrec-0.3.0 b/metadata/md5-cache/dev-python/vecrec-0.3.0
index 038d65bc7249..37228fd32e37 100644
--- a/metadata/md5-cache/dev-python/vecrec-0.3.0
+++ b/metadata/md5-cache/dev-python/vecrec-0.3.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/v/vecrec/vecrec-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18bd6eebc7d9f10f54a34d4fa32ebc6c
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.7 b/metadata/md5-cache/dev-python/verboselogs-1.7
index 2e5f171b4c59..39b383eeec7e 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.7
+++ b/metadata/md5-cache/dev-python/verboselogs-1.7
@@ -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/v/verboselogs/verboselogs-1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a29036d1157488b432053c862e13ff4c
diff --git a/metadata/md5-cache/dev-python/versioneer-0.20 b/metadata/md5-cache/dev-python/versioneer-0.20
index 8be41401c782..7e626a18137e 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.20
+++ b/metadata/md5-cache/dev-python/versioneer-0.20
@@ -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/v/versioneer/versioneer-0.20.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5909163a8b57c1a5a486d11b189ab36f
diff --git a/metadata/md5-cache/dev-python/vine-5.0.0 b/metadata/md5-cache/dev-python/vine-5.0.0
index 68054a3258b2..81f819b08055 100644
--- a/metadata/md5-cache/dev-python/vine-5.0.0
+++ b/metadata/md5-cache/dev-python/vine-5.0.0
@@ -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/v/vine/vine-5.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b39eab590bfaa9e9e9727562a8dd113a
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.4.7 b/metadata/md5-cache/dev-python/virtualenv-20.4.7
index cc355edc20e0..f4a27c0aeac1 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.4.7
+++ b/metadata/md5-cache/dev-python/virtualenv-20.4.7
@@ -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/v/virtualenv/virtualenv-20.4.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee2f060d9b10a616450ee89fb120a777
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.6.0 b/metadata/md5-cache/dev-python/virtualenv-20.6.0
index 9eb6b6f1950d..a5ec60901f8b 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.6.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=603fc08a4fb8b6ba67117701176dfdd2
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.7.0 b/metadata/md5-cache/dev-python/virtualenv-20.7.0
index 8fd018c83392..8b0e626ebb37 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.7.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c69b5e054a83fe1e15069e0ac61068a
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.7.1 b/metadata/md5-cache/dev-python/virtualenv-20.7.1
index 0e5b315669e7..dbff023e7b9c 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.7.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.7.1
@@ -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/v/virtualenv/virtualenv-20.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c69b5e054a83fe1e15069e0ac61068a
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.7.2 b/metadata/md5-cache/dev-python/virtualenv-20.7.2
index 583f4e23f738..0ead47f6ba57 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.7.2
+++ b/metadata/md5-cache/dev-python/virtualenv-20.7.2
@@ -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/v/virtualenv/virtualenv-20.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e24b3a38ebc6119cef8686ed6e38458
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.8.0 b/metadata/md5-cache/dev-python/virtualenv-20.8.0
index b03dee626bb9..a3efca6fce8d 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.8.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bd1c27b6b49338b789c75d0be72f894
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.8.1 b/metadata/md5-cache/dev-python/virtualenv-20.8.1
index 282af35bc951..c76dd3d551c4 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.8.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.8.1
@@ -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/v/virtualenv/virtualenv-20.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5367733944def2432a018cdd59713359
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.6 b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.6
index 3754ab025888..4e288517c6bf 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.6
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.6
@@ -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/edwardgeorge/virtualenv-clone/archive/0.5.6.tar.gz -> virtualenv-clone-0.5.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45cf1682a482a24ea05f17b56cb982c1
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
index 366daadec2ac..0996872c5a9b 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b99b5f76ca6e45f4dae6500d481927f4
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.3-r1 b/metadata/md5-cache/dev-python/visitor-0.1.3-r1
index f4276907f0fe..88a896cd389c 100644
--- a/metadata/md5-cache/dev-python/visitor-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/visitor-0.1.3-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/mbr/visitor/archive/0.1.3.tar.gz -> visitor-0.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c86b7c444663d3123a5bd92a8da33afa
diff --git a/metadata/md5-cache/dev-python/vncdotool-0.13.0 b/metadata/md5-cache/dev-python/vncdotool-0.13.0
index f46b562145c0..83af29780e1d 100644
--- a/metadata/md5-cache/dev-python/vncdotool-0.13.0
+++ b/metadata/md5-cache/dev-python/vncdotool-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v0.13.0.tar.gz -> vncdotool-0.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd8b123fb52675ba68577ce07a151907
diff --git a/metadata/md5-cache/dev-python/vncdotool-1.0.0 b/metadata/md5-cache/dev-python/vncdotool-1.0.0
index b1334255e795..6c423c6586e6 100644
--- a/metadata/md5-cache/dev-python/vncdotool-1.0.0
+++ b/metadata/md5-cache/dev-python/vncdotool-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v1.0.0.tar.gz -> vncdotool-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd8b123fb52675ba68577ce07a151907
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
index 69dd3d74c873..379d1969b0cc 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=debdcbebf54ce2af930e22c470a49229
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.12.1 b/metadata/md5-cache/dev-python/voluptuous-0.12.1
index f4402df75bc1..debcbe9367f0 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.12.1
+++ b/metadata/md5-cache/dev-python/voluptuous-0.12.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/v/voluptuous/voluptuous-0.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=180aa9f4107e46fbe8dc56464867c890
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.12.2 b/metadata/md5-cache/dev-python/voluptuous-0.12.2
index f50d7f9baf73..91b67d8f7923 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.12.2
+++ b/metadata/md5-cache/dev-python/voluptuous-0.12.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/v/voluptuous/voluptuous-0.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fbda570f325df73fbd3baa127149a1c
diff --git a/metadata/md5-cache/dev-python/vpython-7.6.1-r3 b/metadata/md5-cache/dev-python/vpython-7.6.1-r3
index bb9ffa196944..fdb2296fd683 100644
--- a/metadata/md5-cache/dev-python/vpython-7.6.1-r3
+++ b/metadata/md5-cache/dev-python/vpython-7.6.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/autobahn[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1aff2821cb8a503c21a7b33d4a027a48
diff --git a/metadata/md5-cache/dev-python/waitress-2.0.0 b/metadata/md5-cache/dev-python/waitress-2.0.0
index 94f94dbb5c08..9961316f65aa 100644
--- a/metadata/md5-cache/dev-python/waitress-2.0.0
+++ b/metadata/md5-cache/dev-python/waitress-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8643ad5aec79b55999fbfd2bd767c60c
diff --git a/metadata/md5-cache/dev-python/wand-0.6.5 b/metadata/md5-cache/dev-python/wand-0.6.5
index 6664a4819199..2718b139cbd4 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.5
+++ b/metadata/md5-cache/dev-python/wand-0.6.5
@@ -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/w/wand/Wand-0.6.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64b50865aca0c555a53cf939d6728fe1
diff --git a/metadata/md5-cache/dev-python/wand-0.6.6 b/metadata/md5-cache/dev-python/wand-0.6.6
index f889375c6875..920c22c68512 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.6
+++ b/metadata/md5-cache/dev-python/wand-0.6.6
@@ -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/w/wand/Wand-0.6.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee70a78a077d4eb138ae07892a6a342
diff --git a/metadata/md5-cache/dev-python/wand-0.6.7 b/metadata/md5-cache/dev-python/wand-0.6.7
index d30cd844f78a..f97c96bb5ffa 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.7
+++ b/metadata/md5-cache/dev-python/wand-0.6.7
@@ -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/w/wand/Wand-0.6.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d75d2c50888ad3b3cb748be13db4d80
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.3 b/metadata/md5-cache/dev-python/warlock-1.3.3
index fbb1cc2ec628..83e3dad4167d 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.3
+++ b/metadata/md5-cache/dev-python/warlock-1.3.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/bcwaldon/warlock/archive/1.3.3.tar.gz -> warlock-1.3.3.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93e9ab20fd5edff5c8e29fd80d870c39
diff --git a/metadata/md5-cache/dev-python/watchdog-1.0.2 b/metadata/md5-cache/dev-python/watchdog-1.0.2
index b60981b9d64b..9f592be490c2 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af288aff885f2b1922dc9de55e1b41bd
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.2 b/metadata/md5-cache/dev-python/watchdog-2.1.2
index 9806bd2a240e..d11ba869e311 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=523623be6ab8f7d460806b9c3258dd73
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.4 b/metadata/md5-cache/dev-python/watchdog-2.1.4
index 878ef00e8021..51df7c884699 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.4
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.4
@@ -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.4.tar.gz -> watchdog-2.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3dedb723669673975deb024c02b4c79b
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.5 b/metadata/md5-cache/dev-python/watchdog-2.1.5
index 5364f241a3c4..33809774f090 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.5
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.5
@@ -5,12 +5,12 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argh[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/gorakhargosh/watchdog/archive/v2.1.5.tar.gz -> watchdog-2.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12733cdffc7e0a063cb8f0928f6ce140
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=360e2025310884448ff2734ffd735b26
diff --git a/metadata/md5-cache/dev-python/watchgod-0.7 b/metadata/md5-cache/dev-python/watchgod-0.7
index 69b7f28801e8..62f2d67745ff 100644
--- a/metadata/md5-cache/dev-python/watchgod-0.7
+++ b/metadata/md5-cache/dev-python/watchgod-0.7
@@ -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/samuelcolvin/watchgod/archive/v0.7.tar.gz -> watchgod-0.7.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45ab7bd18902f7b60951e4c218076608
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.1.2 b/metadata/md5-cache/dev-python/wcmatch-8.1.2
index 47093850fb12..ba815e391d2d 100644
--- a/metadata/md5-cache/dev-python/wcmatch-8.1.2
+++ b/metadata/md5-cache/dev-python/wcmatch-8.1.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/facelessuser/wcmatch/archive/8.1.2.tar.gz -> wcmatch-8.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.2 b/metadata/md5-cache/dev-python/wcmatch-8.2
index a060d20423b4..4706db659118 100644
--- a/metadata/md5-cache/dev-python/wcmatch-8.2
+++ b/metadata/md5-cache/dev-python/wcmatch-8.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/facelessuser/wcmatch/archive/8.2.tar.gz -> wcmatch-8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=520bb8f1337ccbfef70b8ff9c2516311
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1 b/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
index 317e6c783c16..57575bd8db75 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.5-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/jquast/wcwidth/archive/0.2.5.tar.gz -> wcwidth-0.2.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a7096834ff24bce6d80dbc15845e0b3
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.0 b/metadata/md5-cache/dev-python/weasyprint-53.0
index a6a11bd732fe..3dc69849a8ce 100644
--- a/metadata/md5-cache/dev-python/weasyprint-53.0
+++ b/metadata/md5-cache/dev-python/weasyprint-53.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/w/weasyprint/weasyprint-53.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69a1bb560cc57588cf6a4478afa9cf40
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.2 b/metadata/md5-cache/dev-python/weasyprint-53.2
index 2e4f56423e4e..410289b9a493 100644
--- a/metadata/md5-cache/dev-python/weasyprint-53.2
+++ b/metadata/md5-cache/dev-python/weasyprint-53.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/w/weasyprint/weasyprint-53.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69a1bb560cc57588cf6a4478afa9cf40
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.3 b/metadata/md5-cache/dev-python/weasyprint-53.3
index 824e3acda28f..936933e5079e 100644
--- a/metadata/md5-cache/dev-python/weasyprint-53.3
+++ b/metadata/md5-cache/dev-python/weasyprint-53.3
@@ -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/w/weasyprint/weasyprint-53.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69a1bb560cc57588cf6a4478afa9cf40
diff --git a/metadata/md5-cache/dev-python/webassets-2.0 b/metadata/md5-cache/dev-python/webassets-2.0
index 460d5e46b242..d273f9ee9995 100644
--- a/metadata/md5-cache/dev-python/webassets-2.0
+++ b/metadata/md5-cache/dev-python/webassets-2.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/miracle2k/webassets/archive/2.0.tar.gz -> webassets-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d4087226e182332a5d95029e1da5322
diff --git a/metadata/md5-cache/dev-python/webcolors-1.11.1 b/metadata/md5-cache/dev-python/webcolors-1.11.1
index d432ae5deb50..b95356d195ee 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.11.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.11.1
@@ -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/w/webcolors/webcolors-1.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8b0f772b7dc4ecd185f2f7d018d337d
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1 b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
index 5ddac8a538a9..34fa0304ab60 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Character encoding aliases for legacy web content
 EAPI=7
 HOMEPAGE=https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings/
 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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/webencodings/webencodings-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d66fdb17d7ceb55ccfcc6bf4e42ad7b5
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b0c8f65f343bf81add998f83cdd73750
diff --git a/metadata/md5-cache/dev-python/webob-1.8.7 b/metadata/md5-cache/dev-python/webob-1.8.7
index f4c8bc890626..81a1ff6ca83b 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.7
+++ b/metadata/md5-cache/dev-python/webob-1.8.7
@@ -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/W/WebOb/WebOb-1.8.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b697c5601f5ab02f98237ad47697b56
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.2.1 b/metadata/md5-cache/dev-python/websocket-client-1.2.1
index 3e20080d932d..f1626641be46 100644
--- a/metadata/md5-cache/dev-python/websocket-client-1.2.1
+++ b/metadata/md5-cache/dev-python/websocket-client-1.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=mirror://pypi/w/websocket-client/websocket-client-1.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f01f470843e35eedaaf3632df61967e1
diff --git a/metadata/md5-cache/dev-python/websockets-10.0 b/metadata/md5-cache/dev-python/websockets-10.0
index 39ecc36e3f98..0fa073fd180c 100644
--- a/metadata/md5-cache/dev-python/websockets-10.0
+++ b/metadata/md5-cache/dev-python/websockets-10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aaugustin/websockets/archive/10.0.tar.gz -> websockets-10.0-src.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=479bb54a022d08267cc4f44e1c04602d
diff --git a/metadata/md5-cache/dev-python/websockets-9.1-r1 b/metadata/md5-cache/dev-python/websockets-9.1-r1
index 489ab9dc9440..86419c2f6a2c 100644
--- a/metadata/md5-cache/dev-python/websockets-9.1-r1
+++ b/metadata/md5-cache/dev-python/websockets-9.1-r1
@@ -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/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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=107ae055963505bcae9411c30a039e74
diff --git a/metadata/md5-cache/dev-python/websockify-0.10.0 b/metadata/md5-cache/dev-python/websockify-0.10.0
index 7bb501905786..e42c64369693 100644
--- a/metadata/md5-cache/dev-python/websockify-0.10.0
+++ b/metadata/md5-cache/dev-python/websockify-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/novnc/websockify/archive/v0.10.0.tar.gz -> websockify-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=984575f6a6f504f2aeebc30e8437b975
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.35 b/metadata/md5-cache/dev-python/webtest-2.0.35
index 20284e9864b3..f3b8d5b4d9fa 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.35
+++ b/metadata/md5-cache/dev-python/webtest-2.0.35
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.35.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3ca33aeae1faac00ae2c89953f199bd
diff --git a/metadata/md5-cache/dev-python/webtest-3.0.0 b/metadata/md5-cache/dev-python/webtest-3.0.0
index 76e2652a44d2..78fe4b866482 100644
--- a/metadata/md5-cache/dev-python/webtest-3.0.0
+++ b/metadata/md5-cache/dev-python/webtest-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-3.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c65efb2c84f7f5dcc45ff159a610afe
diff --git a/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1 b/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
index d4ae7eaa5eb0..d3dc08e7e724 100644
--- a/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/werkzeug-1.0.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=https://github.com/pallets/werkzeug/archive/1.0.1.tar.gz -> werkzeug-1.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=958d378be12ea085490df038aa5e8f69
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.0.0 b/metadata/md5-cache/dev-python/werkzeug-2.0.0
index a8926abc61b2..41bb272da2b6 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.0.0
+++ b/metadata/md5-cache/dev-python/werkzeug-2.0.0
@@ -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/pallets/werkzeug/archive/2.0.0.tar.gz -> werkzeug-2.0.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53e87f98da99f28c3ee489d51deb6320
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.0.1 b/metadata/md5-cache/dev-python/werkzeug-2.0.1
index 6eeae90d6a4e..2d6e9d4b5cba 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.0.1
+++ b/metadata/md5-cache/dev-python/werkzeug-2.0.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/pallets/werkzeug/archive/2.0.1.tar.gz -> werkzeug-2.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53e87f98da99f28c3ee489d51deb6320
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1 b/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
index a9671708e51d..6c063a886274 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/werkzeug-2.0.1-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/pallets/werkzeug/archive/2.0.1.tar.gz -> werkzeug-2.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c43487a8cd6fa123d43de2d4be4b685
diff --git a/metadata/md5-cache/dev-python/whatever-0.6 b/metadata/md5-cache/dev-python/whatever-0.6
index 50ae29240ee0..a7173ae97975 100644
--- a/metadata/md5-cache/dev-python/whatever-0.6
+++ b/metadata/md5-cache/dev-python/whatever-0.6
@@ -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/Suor/whatever/archive/0.6.tar.gz -> whatever-0.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f9fff97b86444e4754cc608074166926
diff --git a/metadata/md5-cache/dev-python/wheel-0.37.0 b/metadata/md5-cache/dev-python/wheel-0.37.0
index ab25254aa9c0..42effff31541 100644
--- a/metadata/md5-cache/dev-python/wheel-0.37.0
+++ b/metadata/md5-cache/dev-python/wheel-0.37.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/pypa/wheel/archive/0.37.0.tar.gz -> wheel-0.37.0.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e8a13c039202bb970dde969de2091f2
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.6.1 b/metadata/md5-cache/dev-python/whichcraft-0.6.1
index 70fd68f9fb65..a7d15f39f48f 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.6.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cookiecutter/whichcraft/archive/0.6.1.tar.gz -> whichcraft-0.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=724cc2f5f83f43773802b34e529f119d
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.5 b/metadata/md5-cache/dev-python/whisper-1.1.5
index 465ca024bea7..d25ec616f8bf 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.5
+++ b/metadata/md5-cache/dev-python/whisper-1.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.5.tar.gz -> whisper-1.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04b30de95e10bec01fd606aa2410dc97
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.7 b/metadata/md5-cache/dev-python/whisper-1.1.7
index 31c22ab3c96e..120136b4012f 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.7
+++ b/metadata/md5-cache/dev-python/whisper-1.1.7
@@ -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/graphite-project/whisper/archive/1.1.7.tar.gz -> whisper-1.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=095862d57d83eb6604cdfea6789a2645
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1 b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
index 76055c062fea..3443f33b30d2 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Fast, pure-Python full text indexing, search and spell checking libr
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Whoosh/
 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-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD-2
 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/Whoosh/Whoosh-2.7.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b5a6ca4afcd584bfc419352577241e82
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1f7630db712f32508f8ae4f5abbc579d
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1 b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
index 3b24e26d6941..a126bd776d17 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a7379187d69f2685b68f75ec2a29a4f1
diff --git a/metadata/md5-cache/dev-python/wrapt-1.12.1 b/metadata/md5-cache/dev-python/wrapt-1.12.1
index c190b03e1641..ceaabf33b6ed 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.12.1
+++ b/metadata/md5-cache/dev-python/wrapt-1.12.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/GrahamDumpleton/wrapt/archive/1.12.1.tar.gz -> wrapt-1.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb862c88eedd1a3dd369a2218a3e49db
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1 b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
index fbe80fedda2b..93a3acccfd05 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69b1fffdd1033f52a3454c695b2b018f
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index 5176047f2447..3a57a1c6dc58 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=145519f8172e60d7b7c665615e6a6104
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.3 b/metadata/md5-cache/dev-python/wsaccel-0.6.3
index 0ae91a07f534..856835272f1c 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.3
+++ b/metadata/md5-cache/dev-python/wsaccel-0.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/methane/wsaccel/archive/v0.6.3.tar.gz -> wsaccel-0.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=04b49fff43486e91a1e6997f60a7e5f3
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
index 84b88f7067fd..3061949b49e0 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
@@ -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/W/WSGIProxy2/WSGIProxy2-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da0e6358106fe082db230f6d21a2f2b9
diff --git a/metadata/md5-cache/dev-python/wsproto-0.15.0 b/metadata/md5-cache/dev-python/wsproto-0.15.0
index ced59523f204..0d215123fa49 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.15.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.15.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a1a791ebc5b61ffc8cef6aa389bbf35
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index 5d908cfc4e02..a093272d993d 100644
--- a/metadata/md5-cache/dev-python/wsproto-1.0.0
+++ b/metadata/md5-cache/dev-python/wsproto-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f54cb5086d557a336bc6b4278a1ece6a
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.8 b/metadata/md5-cache/dev-python/wstools-0.4.8
index 70e0536b29ba..f46dc105c066 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.8
+++ b/metadata/md5-cache/dev-python/wstools-0.4.8
@@ -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/w/wstools/wstools-0.4.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07e2bd06fe04c1bb14ccbc310f3e66c2
diff --git a/metadata/md5-cache/dev-python/wtforms-2.3.3 b/metadata/md5-cache/dev-python/wtforms-2.3.3
index 3af1e634826f..edd4bf035e68 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.3.3
+++ b/metadata/md5-cache/dev-python/wtforms-2.3.3
@@ -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/W/WTForms/WTForms-2.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e549599b19539096516e36ca3b00d3c2
diff --git a/metadata/md5-cache/dev-python/wurlitzer-2.1.1 b/metadata/md5-cache/dev-python/wurlitzer-2.1.1
index cf1fd8cb9002..d2316eaba3b1 100644
--- a/metadata/md5-cache/dev-python/wurlitzer-2.1.1
+++ b/metadata/md5-cache/dev-python/wurlitzer-2.1.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/w/wurlitzer/wurlitzer-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19e8f2542d18c980aae86093172347be
diff --git a/metadata/md5-cache/dev-python/wurlitzer-3.0.2 b/metadata/md5-cache/dev-python/wurlitzer-3.0.2
index b8be7aeac747..ac480d0f74e0 100644
--- a/metadata/md5-cache/dev-python/wurlitzer-3.0.2
+++ b/metadata/md5-cache/dev-python/wurlitzer-3.0.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/w/wurlitzer/wurlitzer-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d781c5e9ab1e8429f369374906ee8e8
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
index b2a892261f38..29f45491cb5f 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.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/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08b4d33cca0635a52267784573f6ab70
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 2c2049e4880e..b889dc392244 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=9b8d5b07316371f0d0e1b103a3fbf755
diff --git a/metadata/md5-cache/dev-python/xapp-2.2.1 b/metadata/md5-cache/dev-python/xapp-2.2.1
index 0350b86ea8e6..fde9617eac7f 100644
--- a/metadata/md5-cache/dev-python/xapp-2.2.1
+++ b/metadata/md5-cache/dev-python/xapp-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/xapps-2.2.0[introspection] dev-python/psutil[python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.2.1.tar.gz -> xapp-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=183728e3dfdfaeb3206279de3d9c559b
diff --git a/metadata/md5-cache/dev-python/xarray-0.19.0 b/metadata/md5-cache/dev-python/xarray-0.19.0
index 46ff7abe041b..264f96ce4207 100644
--- a/metadata/md5-cache/dev-python/xarray-0.19.0
+++ b/metadata/md5-cache/dev-python/xarray-0.19.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/x/xarray/xarray-0.19.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d1a40f1f7e2b5f2f9d110ca5b9f3fff
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index d5bfb589ee15..60413c712d47 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -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/x/xcffib/xcffib-0.11.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7262a67d9aeec466573911e42cd9b50a
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.8 b/metadata/md5-cache/dev-python/xdoctest-0.15.8
index 70c371d65e25..51eb387f8908 100644
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.8
+++ b/metadata/md5-cache/dev-python/xdoctest-0.15.8
@@ -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/Erotemic/xdoctest/archive/0.15.8.tar.gz -> xdoctest-0.15.8.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5aaccb877d6d20488ca140eab750822d
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.9 b/metadata/md5-cache/dev-python/xdoctest-0.15.9
index 84eb21fa3a2c..15bea0153396 100644
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.9
+++ b/metadata/md5-cache/dev-python/xdoctest-0.15.9
@@ -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/Erotemic/xdoctest/archive/0.15.9.tar.gz -> xdoctest-0.15.9.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e369c491330438a346c0d5d8f039f68
diff --git a/metadata/md5-cache/dev-python/xlrd-2.0.1 b/metadata/md5-cache/dev-python/xlrd-2.0.1
index bdac12c75656..406d7d0df153 100644
--- a/metadata/md5-cache/dev-python/xlrd-2.0.1
+++ b/metadata/md5-cache/dev-python/xlrd-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-excel/xlrd/archive/2.0.1.tar.gz -> xlrd-2.0.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa16c2db9e418e662f8452392c4abd17
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.1 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.1
index 637d2d6c1c22..1c03b36d5352 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.1
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.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/jmcnamara/XlsxWriter/archive/RELEASE_3.0.1.tar.gz -> XlsxWriter-RELEASE_3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5298cbb7d6f39024acb674b044e7efe8
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1 b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
index 94b8820dc28c..9943d3a5dc49 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/xlwt-1.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/x/xlwt/xlwt-1.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b830d2c175b1cf80bc61f5b67449c31d
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.0 b/metadata/md5-cache/dev-python/xmlschema-1.7.0
index 2374a51a4ca1..a760b1e4df39 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.7.0
+++ b/metadata/md5-cache/dev-python/xmlschema-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c423b96e6182d95edeb238d1d41b751f
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.1 b/metadata/md5-cache/dev-python/xmlschema-1.7.1
index e54da4e94efe..c90854f99bc3 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.7.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.7.1
@@ -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/x/xmlschema/xmlschema-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb6d0e5a386174ea15fd1baa61228f7e
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.8.0 b/metadata/md5-cache/dev-python/xmlschema-1.8.0
new file mode 100644
index 000000000000..cb8fc2c368a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlschema-1.8.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 ~m68k ~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.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eb6d0e5a386174ea15fd1baa61228f7e
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1 b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
index 4b65821e70ba..a0cd7852cff9 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.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=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=442d13a8886acd8b7677b1e45c816e4f
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
index 98b771883e93..9bedb909980f 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -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/x/xvfbwrapper/xvfbwrapper-0.2.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0ed07fd177e1de914af81d6a2b804c4
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.2 b/metadata/md5-cache/dev-python/xxhash-2.0.2
index 6090ff89d1c3..0c74fd7d4b66 100644
--- a/metadata/md5-cache/dev-python/xxhash-2.0.2
+++ b/metadata/md5-cache/dev-python/xxhash-2.0.2
@@ -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/x/xxhash/xxhash-2.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=481d7345fd52c3a7fd2a0ab08bd3203d
diff --git a/metadata/md5-cache/dev-python/yamlpath-3.6.1 b/metadata/md5-cache/dev-python/yamlpath-3.6.1
index 91451ccac370..0b19527d8a7b 100644
--- a/metadata/md5-cache/dev-python/yamlpath-3.6.1
+++ b/metadata/md5-cache/dev-python/yamlpath-3.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wwkimball/yamlpath/archive/refs/tags/v3.6.1.tar.gz -> yamlpath-3.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a809deb8b5273a60cba843523da6c8cc
diff --git a/metadata/md5-cache/dev-python/yapf-0.31.0 b/metadata/md5-cache/dev-python/yapf-0.31.0
index d2da1bb2d28c..498d5b6f478e 100644
--- a/metadata/md5-cache/dev-python/yapf-0.31.0
+++ b/metadata/md5-cache/dev-python/yapf-0.31.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.31.0.tar.gz -> yapf-0.31.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41e2b1b58d2107790bff7ca8f7a634ba
diff --git a/metadata/md5-cache/dev-python/yappi-1.3.2 b/metadata/md5-cache/dev-python/yappi-1.3.2
index caaaa12c82b2..f5e7087ccef3 100644
--- a/metadata/md5-cache/dev-python/yappi-1.3.2
+++ b/metadata/md5-cache/dev-python/yappi-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sumerc/yappi/archive/c256f28d3ccc2bc1692a5a090dc8f774c4933c16.tar.gz -> yappi-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=47ab504aa4e1de2754f512c42195b15e
diff --git a/metadata/md5-cache/dev-python/yapsy-1.12.2 b/metadata/md5-cache/dev-python/yapsy-1.12.2
index fad790c0187f..2bd8679e05cd 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.12.2
+++ b/metadata/md5-cache/dev-python/yapsy-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.12.2/Yapsy-1.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee0629e5a6cd1d5e1230915b49368414
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.3 b/metadata/md5-cache/dev-python/yarl-1.6.3
index 305502467116..04427800c52d 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.3
+++ b/metadata/md5-cache/dev-python/yarl-1.6.3
@@ -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/y/yarl/yarl-1.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4e4605e85cb915d3ef6f1207841569e
diff --git a/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1 b/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
index b55a4560d4fa..2dc9943ddf7f 100644
--- a/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaswfp/yaswfp-0.9.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=feada03b2a0d3db36f7f26a4103ac504
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-2.0 b/metadata/md5-cache/dev-python/zc-lockfile-2.0
index ff28cd0d304a..4f821ae40913 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-2.0
+++ b/metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60968f5e61d9af536a2f755bdf13ddf9
diff --git a/metadata/md5-cache/dev-python/zconfig-3.6.0 b/metadata/md5-cache/dev-python/zconfig-3.6.0
index e368df9914f8..1c44c3c5d510 100644
--- a/metadata/md5-cache/dev-python/zconfig-3.6.0
+++ b/metadata/md5-cache/dev-python/zconfig-3.6.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/Z/ZConfig/ZConfig-3.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69cd7e1c4252ec286d676a2ebc756b23
diff --git a/metadata/md5-cache/dev-python/zeep-4.1.0 b/metadata/md5-cache/dev-python/zeep-4.1.0
index 9fddd4f4533f..22ef7ac3a963 100644
--- a/metadata/md5-cache/dev-python/zeep-4.1.0
+++ b/metadata/md5-cache/dev-python/zeep-4.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/z/zeep/zeep-4.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91b86a10fce742574bddd057c243b689
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.35.1 b/metadata/md5-cache/dev-python/zeroconf-0.35.1
index 3414320640c1..9e4e251e4f51 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.35.1
+++ b/metadata/md5-cache/dev-python/zeroconf-0.35.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.35.1.tar.gz -> python-zeroconf-0.35.1.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce1dc3b8e2a204375be044f008c261a1
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.36.4 b/metadata/md5-cache/dev-python/zeroconf-0.36.4
index 0141edd955ea..f36fabe82db2 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.36.4
+++ b/metadata/md5-cache/dev-python/zeroconf-0.36.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/jstasiak/python-zeroconf/archive/0.36.4.tar.gz -> python-zeroconf-0.36.4.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=015894f26dc58c55925b5c56e9ae8293
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.36.5 b/metadata/md5-cache/dev-python/zeroconf-0.36.5
index a7b318193320..44a56c71b587 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.36.5
+++ b/metadata/md5-cache/dev-python/zeroconf-0.36.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://github.com/jstasiak/python-zeroconf/archive/0.36.5.tar.gz -> python-zeroconf-0.36.5.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=015894f26dc58c55925b5c56e9ae8293
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.36.6 b/metadata/md5-cache/dev-python/zeroconf-0.36.6
index 37527d8bacf6..8695d4392c5f 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.36.6
+++ b/metadata/md5-cache/dev-python/zeroconf-0.36.6
@@ -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/jstasiak/python-zeroconf/archive/0.36.6.tar.gz -> python-zeroconf-0.36.6.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=015894f26dc58c55925b5c56e9ae8293
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.36.7 b/metadata/md5-cache/dev-python/zeroconf-0.36.7
index 5b7ef8ac8623..f511f1bf1cb2 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.36.7
+++ b/metadata/md5-cache/dev-python/zeroconf-0.36.7
@@ -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/jstasiak/python-zeroconf/archive/0.36.7.tar.gz -> python-zeroconf-0.36.7.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=015894f26dc58c55925b5c56e9ae8293
diff --git a/metadata/md5-cache/dev-python/zipp-3.5.0 b/metadata/md5-cache/dev-python/zipp-3.5.0
index 93b826e392e6..0fa19e57ac05 100644
--- a/metadata/md5-cache/dev-python/zipp-3.5.0
+++ b/metadata/md5-cache/dev-python/zipp-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-3.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4149fd74b03a08d823763b3276e319fa
diff --git a/metadata/md5-cache/dev-python/zipp-3.5.1 b/metadata/md5-cache/dev-python/zipp-3.5.1
new file mode 100644
index 000000000000..b087437507cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-3.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/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=Backport of pathlib-compatible object wrapper for zip files
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/zipp
+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=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/z/zipp/zipp-3.5.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0eba6982c1c09e087bf37ff325ac0bad
diff --git a/metadata/md5-cache/dev-python/zipp-3.6.0 b/metadata/md5-cache/dev-python/zipp-3.6.0
new file mode 100644
index 000000000000..f4cbc7178c46
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-3.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/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=Backport of pathlib-compatible object wrapper for zip files
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/zipp
+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=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/z/zipp/zipp-3.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0eba6982c1c09e087bf37ff325ac0bad
diff --git a/metadata/md5-cache/dev-python/zope-component-4.4.1 b/metadata/md5-cache/dev-python/zope-component-4.4.1
index 382232f56314..b5015a4ff222 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7031588857b4315d597f719760d2fc1
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.0 b/metadata/md5-cache/dev-python/zope-configuration-4.4.0
index a14c00afae12..7a5aef9bbdad 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.0
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d0de0a2094a786046c8099f6ded80a4
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1 b/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1
index ea5e46308c3e..1ec42707ed5e 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.4.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/z/zope.configuration/zope.configuration-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d4e410129f0c7a5796b327c69a0fbfa
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0 b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
index d70a34a1b07e..355afd2415d3 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71e165f5793f7c46b985d99c49aaa8e
diff --git a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1 b/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
index 6efd948f100d..45ce354793d6 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
+++ b/metadata/md5-cache/dev-python/zope-event-4.5.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=mirror://pypi/z/zope.event/zope.event-4.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c5e99b57ca29209bbd388dee4de548f
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.4 b/metadata/md5-cache/dev-python/zope-exceptions-4.4
index 41db8361b2d5..6086c5503876 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.4
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.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/z/zope.exceptions/zope.exceptions-4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=335078e7c9aa42c3139248e52e90f20b
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
index b45a1fba564a..67859bf86568 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
@@ -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/z/zope.i18nmessageid/zope.i18nmessageid-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd458984857c531414124f20ed52bbc7
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.4.0 b/metadata/md5-cache/dev-python/zope-interface-5.4.0
index dca16840063a..64577d604436 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.4.0
+++ b/metadata/md5-cache/dev-python/zope-interface-5.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a3a656d1d7db175e9fc0bfcb7696717
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.1.0 b/metadata/md5-cache/dev-python/zope-schema-6.1.0
index b5fbcee6e61f..4d9529b4ae2a 100644
--- a/metadata/md5-cache/dev-python/zope-schema-6.1.0
+++ b/metadata/md5-cache/dev-python/zope-schema-6.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=mirror://pypi/z/zope.schema/zope.schema-6.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=393157b68337dc60afb4e2387615f0d2
diff --git a/metadata/md5-cache/dev-python/zope-testing-4.9 b/metadata/md5-cache/dev-python/zope-testing-4.9
index 8c2d051eda63..34d17a67ea99 100644
--- a/metadata/md5-cache/dev-python/zope-testing-4.9
+++ b/metadata/md5-cache/dev-python/zope-testing-4.9
@@ -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/z/zope.testing/zope.testing-4.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6477c6da1e8dbd0dda872cdd8e6dce77
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.2 b/metadata/md5-cache/dev-python/zope-testrunner-5.2
index 0586db121e38..727fc895157a 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.2
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.2
@@ -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/z/zope.testrunner/zope.testrunner-5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=929dfa6ed55af1197e744ccd31f23111
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.3.0 b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
index 764163fe94cd..3890d0d2b4a4 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79543afc9c5ccbbad65e19cbafc19746
diff --git a/metadata/md5-cache/dev-python/zstandard-0.15.2-r1 b/metadata/md5-cache/dev-python/zstandard-0.15.2-r1
index d0f77525af77..de172dfd70d6 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.15.2-r1
+++ b/metadata/md5-cache/dev-python/zstandard-0.15.2-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/z/zstandard/zstandard-0.15.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02ff174c77977a2daeb051af632df460
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.0.2 b/metadata/md5-cache/dev-python/zstd-1.5.0.2
index ca4b564034a2..0ecccfc54474 100644
--- a/metadata/md5-cache/dev-python/zstd-1.5.0.2
+++ b/metadata/md5-cache/dev-python/zstd-1.5.0.2
@@ -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/z/zstd/zstd-1.5.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86d9818a7fb69488e54e655eb269ed04
diff --git a/metadata/md5-cache/dev-python/zxcvbn-4.4.28 b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
index 40fb4eb12c34..76423b829aa2 100644
--- a/metadata/md5-cache/dev-python/zxcvbn-4.4.28
+++ b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
@@ -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/dwolfhub/zxcvbn-python/archive/v4.4.28.tar.gz -> zxcvbn-4.4.28.gh.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ae0c9221326d848d9e845becf8d5d98
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 10aa637f229d..1d9967644210 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/assistant-5.15.2-r11 b/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
index 2f6a90b2b39c..c7a015b4cc9e 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[png] =dev-qt/qthelp-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8bc5e2549cad93cd8473b48d09df84a5
+_md5_=8920e7b8403330d2fd885966c8d7168d
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.2-r11 b/metadata/md5-cache/dev-qt/designer-5.15.2-r11
index 6b836319533b..6f871db9f37a 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/designer-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=declarative debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* declarative? ( =dev-qt/qtdeclarative-5.15.2*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=779881ef404c5d9d39f3405c391267cc
+_md5_=fdfbc390e62106a9e3f42bf7f920ceed
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11 b/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
index 229e16d039dc..9e022f9ddf3a 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0285ef8b1352b0ae074691926ebf71fd
+_md5_=244f23fcd6b54f85bea816d279a87779
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
index be01bdef59e3..562e16a26928 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtxml-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=42f132f7275a5275158320dc93fdb853
+_md5_=61f8b995932294580a57aa7e67d0e176
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11 b/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
index 5dc019bed197..4bdcdd8cf587 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=bb946875b73024ceabba2a6c43c5cdc2
+_md5_=ad00d07d5bb5cb6208cb18f0d201302b
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
index da2c480e21de..c579809fedfd 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=81c3d2fa6c64d8da2162da96411ed022
+_md5_=eee345494a3b0623a3962b26806dc2f0
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
index 54db4490c6aa..bf2d5b756903 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=09c722899c3e32fc982756d28f90047b
+_md5_=02b0f2f4ac3c5e15e76bd9da36f1ec38
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
index a0f378a609f5..1c178d7d0300 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=bab57f07029e54826b450c08ed302c47
+_md5_=01e0a4119836dfab0adc4970486ad615
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10 b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
index 88d0633bc28c..91cb61a43225 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[vulkan=] =dev-qt/qtnetwork-5.15.2* >=media-libs/assimp-4.0.0 gamepad? ( =dev-qt/qtgamepad-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=3D rendering module for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] )
+RDEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[vulkan=] =dev-qt/qtnetwork-5.15.2* >=media-libs/assimp-4.0.0 gamepad? ( =dev-qt/qtgamepad-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qt3d/-/archive/7edec6e014de27b9dd03f63875c471aac606a918/qt3d-7edec6e014de27b9dd03f63875c471aac606a918.tar.gz -> qt3d-5.15.2-7edec6e0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=0b23b914740043f2622763d43a38e949
+_md5_=d6a24946ccb324e1c3ea7db44480d373
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66-r1 b/metadata/md5-cache/dev-qt/qtchooser-66-r1
index 4b2f0583bb8a..aa185ddc016f 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66-r1
+++ b/metadata/md5-cache/dev-qt/qtchooser-66-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to quickly switch between multiple Qt installations
 EAPI=8
 HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!<dev-qt/qtcore-5.15.2-r10:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=836127b48db9c96392157c006260105a
+_md5_=41e2dd9b8dbf5cd5ab0dd31dbecae339
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
index b4c363195b19..5561e965c537 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d1a8744eea70bc9c204b7889a2d2c739
+_md5_=e82d5c72eee81f65237269b7cf00a5d5
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
index 8b6e6db2ea80..54bd4724a7ba 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) >=dev-qt/qtchooser-66-r1
 RESTRICT=test
 SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/64a0068011e12f178fb7ff65fafe7cfaa4620719/qtbase-64a0068011e12f178fb7ff65fafe7cfaa4620719.tar.gz -> qtbase-5.15.2-64a00680.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=646214a35934a10bac601ba60367a3b1
+_md5_=fd13daffc0aba2f1a376c7a4789bb7ec
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
index 838f64fdaa52..bbe5636b23c3 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2*:5= >=sys-apps/dbus-1.4.20 test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20
+RDEPEND==dev-qt/qtcore-5.15.2*:5= >=sys-apps/dbus-1.4.20
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=83f4afdb0fb1c8f6bf9653ed2ab31dda
+_md5_=9af07bb5b764584a50c7b79810e97caa
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r11
deleted file mode 100644
index 5b8ef18f0815..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtdeclarative/-/archive/92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7/qtdeclarative-92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7.tar.gz -> qtdeclarative-5.15.2-92225b72.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=893e5c97ca6b9ed42adbe6d6e706498d
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12
new file mode 100644
index 000000000000..e4144fac66c2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
+DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] ) test? ( =dev-qt/qttest-5.15.2* )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=gles2-only +jit localstorage vulkan +widgets debug test
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtdeclarative/-/archive/1c33a9d045897ce755a818ebff7ddecae97885d3/qtdeclarative-1c33a9d045897ce755a818ebff7ddecae97885d3.tar.gz -> qtdeclarative-5.15.2-1c33a9d0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=92579e0dc18e576c701d8a0a4b1480e5
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
index f01a49013781..8a0c26ed576a 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for reporting diagnostic information about Qt and its environme
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5= network? ( =dev-qt/qtnetwork-5.15.2*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=53e1955ecb6f124620364fedcd7482ee
+_md5_=ae73e8ff155993ef454ca9977f9a9cab
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
index 488b1fc55117..5538a8d04612 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl2 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.2* ) sdl? ( media-libs/libsdl2 ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Qt module to support gamepad hardware
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=evdev qml sdl debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl2 )
+RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.2* ) sdl? ( media-libs/libsdl2 )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=1f8b3465fb181735e39ec1e3b2143dbe
+_md5_=97cc644dc449bee4b34143db3c4e8b11
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
index 9cf2fa56af51..84c80e68f6a5 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
@@ -5,7 +5,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.2* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.2*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/libglvnd sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.2* ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.2* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.2* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15.2
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=3c52522f6b8ea97f1b5213699865f6b6
+_md5_=601f6bf0d32ac841a700eb82f05ef9c7
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10 b/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
index 880d9182f472..8d1f6af5dc75 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=fa8bf70c69766c80ae24a0d572e044b4
+_md5_=b0e8346cbed42fb3539c672ab7c9207e
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
index 23ea95e20a9f..a5d1d8d8f2ed 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
+RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtimageformats/-/archive/cb82c74310837fe4e832c8ab72176a5d63e4355f/qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.gz -> qtimageformats-5.15.2-cb82c743.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=25a793629d0d5ce5cabbe95cd41cc7ec
+_md5_=7af48dec1809c71896b3d3f63fae3f15
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
index cf8ebc76d414..49cc7704a383 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib ~dev-qt/qtconcurrent-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
+DEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtpositioning-5.15.2*[qml] =dev-qt/qtsql-5.15.2* sys-libs/zlib =dev-qt/qtconcurrent-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib
+RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtpositioning-5.15.2*[qml] =dev-qt/qtsql-5.15.2* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtlocation/-/archive/861e372b6ad81570d4f496e42fb25a6699b72f2f/qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.gz -> qtlocation-5.15.2-861e372b.tar.gz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/d3101bbc22edd41c9036ea487d4a71eabd97823d/qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.gz -> qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=99bdd6809fab3f250d066e734870706b
+_md5_=c7b0747e0033900c7a998f6900638ed4
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
index bed7ece7e7cd..5f80ef87e69a 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=808b770e8aa5d2ec11be2ba1c8143a19
+_md5_=973ee97b0c9572bcec4610007978a0af
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
index b5b12babd9c3..512617776afd 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=13166ee2aa3072d27d373546d7ab4473
+_md5_=e628bc35855569fbb518d49426da27f8
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
index 78b3233c9d1f..8e72439eb829 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=gles2-only test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=ab8be04dcdc794289ff27633fc54c72b
+_md5_=a5274c9e728407e47407e7bd50ba25b3
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
index 1fe6a78a3faf..f81b6bf53a08 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=834d2e01eb815dca472128e7f2a1ae7d
+_md5_=d5a633ee21cd4ffd7084c6ed2f1e29c8
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
index 3be4fd974a91..6f8acde96c21 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( =dev-qt/qtnetwork-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=cups gles2-only test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 )
+RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] cups? ( >=net-print/cups-1.4 )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=74161741cc9f58c9bdaa0d1a89e14e88
+_md5_=b2ea1879f616e058df16b792bacc1285
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
index 1b6f48ebee59..9f537d28ffb9 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* widgets? ( =dev-qt/qtwidgets-5.15.2* ) =dev-qt/qtgraphicaleffects-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtquickcontrols2/-/archive/be66bf9a5618c745d2a6ee2262967af6307b3b07/qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.gz -> qtquickcontrols2-5.15.2-be66bf9a.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=01b144cade20baa8b1c9bf59af2cf1bd
+_md5_=fc85ed612bfa79d128787be0cad199db
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
index 7b23bb7478cb..ed98ac7d6153 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 flite? ( >=app-accessibility/flite-2[alsa?] ~dev-qt/qtmultimedia-5.15.2[alsa?] alsa? ( media-libs/alsa-lib ) ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.2* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.2*[alsa?] alsa? ( media-libs/alsa-lib ) ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa flite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 flite? ( >=app-accessibility/flite-2[alsa?] ~dev-qt/qtmultimedia-5.15.2[alsa?] alsa? ( media-libs/alsa-lib ) )
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.2* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.2*[alsa?] alsa? ( media-libs/alsa-lib ) )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=4e255ce4daa59cb2be904cb73627053d
+_md5_=a8433179e878604debfb6b15c137443a
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
index 04dc30155d9e..45447051359f 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND==dev-qt/qtcore-5.15.2*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=7880b8e9085ecee19f5566ddaebba6e3
+_md5_=49856772ae3e0f03a1ce05283ec57eda
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
index d3b62259768c..53970f13dcdc 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* sys-libs/zlib:= test? ( =dev-qt/qtxml-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:=
+RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtsvg/-/archive/cfc616978b52a396b2ef6900546f7fc086d7cab3/qtsvg-cfc616978b52a396b2ef6900546f7fc086d7cab3.tar.gz -> qtsvg-5.15.2-cfc61697.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=a9ab2a5a0d538334666eb5619ad9fe57
+_md5_=0a0cee36294d0abee3547a7eb86d5501
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
index 2187bfdd6a83..279ef38f8ea9 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtxml-5.15.2 )
+DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qtgui-5.15.2* =dev-qt/qtxml-5.15.2* )
 DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=c9e5e438f62dbdf3c1c4ff46a802c4d7
+_md5_=551e9149f72cfb8fa412386e5edb0c99
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
index 5036aae4363b..bdfa0c7dffa7 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
@@ -5,10 +5,10 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttranslations/-/archive/68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f/qttranslations-68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f.tar.gz -> qttranslations-5.15.2-68f420eb.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=dc6dc8b88145ff8d42a93e5b89031463
+_md5_=14513d15058162b28746102c4c6e1a84
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
index cd30f0aa627d..98a0212638ce 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Customizable input framework and virtual keyboard for Qt
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=handwriting +spell +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtsvg-5.15.2* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtvirtualkeyboard/-/archive/353b75b2e34bdae901625bbddf5c5e3f3e6c0de5/qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.gz -> qtvirtualkeyboard-5.15.2-353b75b2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=0c86d3340c417e357a1c6070180830e5
+_md5_=765d430bd21a7f3fdb94327cb317ae37
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r12 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r12
deleted file mode 100644
index d54cefe1d582..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=vulkan X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/3c420cd180397e3f42c8a436a7f1b11465925bdd/qtwayland-3c420cd180397e3f42c8a436a7f1b11465925bdd.tar.gz -> qtwayland-5.15.2-3c420cd1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e3f75822edd79b265fea901aeb5e7007
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r13 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r13
new file mode 100644
index 000000000000..585b27601fd3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r13
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.2* )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
+IUSE=vulkan X debug test
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/efe6edcaf8eba601dff99ec6ad4457c8a4442f86/qtwayland-efe6edcaf8eba601dff99ec6ad4457c8a4442f86.tar.gz -> qtwayland-5.15.2-efe6edca.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=58495b7580bf2e8d8d60db6782d35c6f
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
index 614759307728..4810c362f7e0 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 )
+RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtwebsockets/-/archive/e7883bc64440b1ff4666272ac6eb710ee4bc221b/qtwebsockets-e7883bc64440b1ff4666272ac6eb710ee4bc221b.tar.gz -> qtwebsockets-5.15.2-e7883bc6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=822ead4a4d1f7a63d4d1c5fc124e9edd
+_md5_=d32453aab9c167f2715ed4f75123bcd5
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
index a57e352bd6d7..f02f48a254e6 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=8e838fc2a3392c4f94b15e1f85c6343b
+_md5_=d424e8bfdcf97751a66a64b449c3ea1a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
index 717de259822a..f3a65684fb64 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
@@ -5,12 +5,12 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.2* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.2*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=69102774b240ff5b88ee9ff18a8172f2
+_md5_=18459e97c13edd5a2014f69a22bbc00c
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
index 918ec17cca10..0b0bbdf5070a 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
+DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qtnetwork-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
 DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
+RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/c2ea67ecefe049f6e9bb8f910d7f9c60319d8619/qtbase-c2ea67ecefe049f6e9bb8f910d7f9c60319d8619.tar.gz -> qtbase-5.15.2-c2ea67ec.tar.gz
+SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=19be9e35dedb70d5637a606e0ac7d0c5
+_md5_=d6625f1e97faf2fe82b2b518b9026350
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index c387965eb06f..4a150b499624 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/ament_copyright-0.10.4 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
index 3e0b1a5e4741..34b82ce58b36 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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
index dc32af2b91fd..0565da49411a 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.11.2
@@ -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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc1579b0a07f6261e3d8db363d65eb60
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-9999 b/metadata/md5-cache/dev-ros/ament_copyright-9999
index e4cc0d24254b..95f0a75d3755 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_copyright-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc1579b0a07f6261e3d8db363d65eb60
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 59d4aa922307..94c77deb1a06 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _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
index 1fd5af4bc375..012cafa4165d 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 ec6935a69854..f27fc4b8e062 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2a0730b2096d27a012b50052cab4aca
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
index 2582a69c670a..a500969ad356 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
index ddb5637ecb39..c1dbc2d4a6bb 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
index fe566ea9e955..fda74366d452 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2 b/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2
index 02300c537fac..44c42c6a5b39 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.11.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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e543ff14cfe0b5d65a92e0e00b6df4b9
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cpplint-9999
index 27fe6abc734c..0d34cfd48f05 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e543ff14cfe0b5d65a92e0e00b6df4b9
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
index 8d6f4d33162c..e296b35d02b7 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.1 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
index d3b63d453dc5..e2e4e1c3ffa9 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.4 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
index 4696cf430f7c..46b089f0b3a9 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.11.2 b/metadata/md5-cache/dev-ros/ament_flake8-0.11.2
index 239d3e58dc18..8acdc8389e4b 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.11.2
@@ -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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82dc5dc885195538de97b73bc36b1d41
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-9999 b/metadata/md5-cache/dev-ros/ament_flake8-9999
index ddba8539c9e6..26992ccd37b1 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-9999
+++ b/metadata/md5-cache/dev-ros/ament_flake8-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82dc5dc885195538de97b73bc36b1d41
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
index 8f22972cf20e..082f1b16ba38 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.4-r1
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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
index 1ef37f82cd81..690a20a413ab 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0267933552a22718cc2a0135d723c762
diff --git a/metadata/md5-cache/dev-ros/ament_lint-9999 b/metadata/md5-cache/dev-ros/ament_lint-9999
index 25e3a629722f..b6597158d2c1 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0267933552a22718cc2a0135d723c762
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
index c492b4845e6c..274f4d4bf680 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
index 7dc60e98358b..1b407e930d80 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
index 41f3a24acb28..54581bb4c912 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
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
index f877fddb8ded..898ba5d99b5c 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.11.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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a2cce71853bc5daf01f04188624f267
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
index 7e440d0a8cf4..9ec52d4ad30e 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
index 5bcdf15d6c2c..f3d6dc4d730e 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.1 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
index a8836a2e37bf..7f4c3e6ca1ce 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.4 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
index f92b2274b14f..0c955231792c 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.11.2 b/metadata/md5-cache/dev-ros/ament_pep257-0.11.2
index d424e583f783..ef3d637eded8 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.11.2
@@ -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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d7a108606d9f239af5d4f0f83704487
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-9999 b/metadata/md5-cache/dev-ros/ament_pep257-9999
index 54df02e8394f..240c1c97ea78 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-9999
+++ b/metadata/md5-cache/dev-ros/ament_pep257-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d7a108606d9f239af5d4f0f83704487
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 9b1c66308125..0b8877b719e6 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _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
index 7d846e4cc4df..f7272de1bb1b 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 9915a1986414..ef02ec4e0faf 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c1c739314c35b8a50438d69be9ca796f
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
index 61e3c51b1976..b43911f9e0d3 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
index 48d10964bf62..8532a388d111 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
index d685e419054a..19df39524864 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2 b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
index ac936687afd1..87940ee86b85 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.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/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75fa3a1c25127a3b8a1403d6154fe656
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_xmllint-9999
index ad2e2e196f85..72207ae60f88 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75fa3a1c25127a3b8a1403d6154fe656
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-1.2.1 b/metadata/md5-cache/dev-ros/poco_vendor-1.2.1
index 78d0156dd7f0..ed75d57be564 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-1.2.1
+++ b/metadata/md5-cache/dev-ros/poco_vendor-1.2.1
@@ -1,4 +1,4 @@
-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-3.20.5
+BDEPEND=|| ( ( dev-lang/python:3.10 ros-meta/ament_cmake[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ros-meta/ament_cmake[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
 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
@@ -10,4 +10,4 @@ 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	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dbff2d50781ba4b78191e465efc1536b
+_md5_=ddce1f3a0ef36d497aec24d5cf98c582
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-9999 b/metadata/md5-cache/dev-ros/poco_vendor-9999
index 6964760caf28..0fee7e55a3d6 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-9999
+++ b/metadata/md5-cache/dev-ros/poco_vendor-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) test? ( dev-ros/ament_cmake_copyright dev-ros/ament_cmake_lint_cmake dev-ros/ament_cmake_xmllint dev-ros/ament_cmake_test ) || ( dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.10 ros-meta/ament_cmake[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ros-meta/ament_cmake[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) test? ( dev-ros/ament_cmake_copyright dev-ros/ament_cmake_lint_cmake dev-ros/ament_cmake_xmllint dev-ros/ament_cmake_test ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=CMake shim over the poco library
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32d157f0dad8a0fa3aca039e065b7f93
+_md5_=efd155b3fe910aa87c1f80648af3567a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 89d9fd464fe8..3fb3694211b5 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/eventmachine-1.2.7-r3 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
new file mode 100644
index 000000000000..01dee1de1907
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[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=dev-libs/openssl:0= 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=EventMachine is a fast, simple event-processing library for Ruby programs
+EAPI=7
+HOMEPAGE=https://github.com/eventmachine/eventmachine
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby )
+RDEPEND=dev-libs/openssl:0= 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 )
+SLOT=0
+SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ruby/eventmachine/eventmachine-1.2.7-openssl-patches.tar.bz2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6091b76b81443a0a89e1e2b3be4e1cd5
diff --git a/metadata/md5-cache/dev-ruby/excon-0.73.0 b/metadata/md5-cache/dev-ruby/excon-0.73.0
new file mode 100644
index 000000000000..c393177730ce
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/excon-0.73.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby26(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby26(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby26(-)] dev-ruby/open4[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] dev-ruby/sinatra[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby27(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby27(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby27(-)] dev-ruby/open4[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/sinatra[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=EXtended http(s) CONnections
+EAPI=7
+HOMEPAGE=https://github.com/excon/excon
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_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 )
+SLOT=0
+SRC_URI=https://github.com/excon/excon/archive/v0.73.0.tar.gz -> excon-0.73.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=40f49ef5358757e6ed566b357b0b6b64
diff --git a/metadata/md5-cache/dev-ruby/net-scp-3.0.0 b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
index 4593726f788a..e31fd82d0683 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
@@ -9,8 +9,8 @@ KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby26? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby26(-)] dev-ruby/net-ssh:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/net-ssh:6[ruby_targets_ruby27(-)] dev-ruby/net-ssh:5[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 )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v3.0.0.tar.gz -> net-scp-3.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9eff7f82f165b30b45e0ddfb220b9b9a
+_md5_=b0cc17454609b31e3a38448e8360c599
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
index d128b4a3d4d8..321a82d8af0d 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
@@ -9,8 +9,8 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby26(-)] dev-ruby/x25519[ruby_targets_ruby26(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby27(-)] dev-ruby/x25519[ruby_targets_ruby27(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51ed2707d6f953df46c88d552103546a
+_md5_=e71e07afcf5a6a3549410b87b7520d51
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index 7d805238a050..fac5948842c8 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=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_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=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4083bf7dc475903708ac2c56c92b5cd2
+_md5_=b32e0f4d6860b0d57ba112b125a8ce33
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
index d1f865453222..c39be7f087ef 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
@@ -1,15 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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(-)] ) )
+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=Parse and decompose a domain name into top level domain, domain and subdomains
-EAPI=6
+EAPI=7
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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_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 )
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/public_suffix-3.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc2c11c6f9c5728369c201a9df2189d0
+_md5_=c0255de1017037823ce09499ef81da56
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
index 11c7492adee2..5ac64e4b25d0 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
@@ -5,7 +5,7 @@ DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshne
 EAPI=7
 HOMEPAGE=https://github.com/rtomayko/rack-cache
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 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 ~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/rack:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rack:*[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=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.12.1.tar.gz -> rack-cache-1.12.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5be29691542afbbbdc98d1977466f515
+_md5_=7387153f3776c13a697b5b47f7f0474e
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
new file mode 100644
index 000000000000..fc5869ef2cfd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/maxitest-3.4.0[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/maxitest-3.4.0[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
+EAPI=8
+HOMEPAGE=https://github.com/rtomayko/rack-cache
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rack:*[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.2
+SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.13.0.tar.gz -> rack-cache-1.13.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c76603ce2206d1aff3679bd22b341c8
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
index 6de1807bd89e..f066fee8a017 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=7
 HOMEPAGE=https://github.com/nex3/rb-inotify
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ffi[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi[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=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1e199c6a59aad82f032b9260025bfdb
+_md5_=a0709ce67e5a6a567f0bd028c2665086
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0 b/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0
new file mode 100644
index 000000000000..c7bb5a7bb6c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby26(-)] || ( dev-ruby/railties:6.1[ruby_targets_ruby26(-)] dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/railties:5.2[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] || ( dev-ruby/rails:6.1[ruby_targets_ruby26(-)] dev-ruby/rails:6.0[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] ) dev-ruby/rspec-rails[ruby_targets_ruby26(-)] dev-ruby/rspec-collection_matchers[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Hooks Roadie into your Rails application to help with email generation
+EAPI=7
+HOMEPAGE=https://github.com/Mange/roadie-rails
+IUSE=test ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby26(-)] || ( dev-ruby/railties:6.1[ruby_targets_ruby26(-)] dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/railties:5.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.2.0.tar.gz -> roadie-rails-2.2.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3f83c4db2b4929d965432713e428eb6a
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.0 b/metadata/md5-cache/dev-ruby/rotp-6.2.0
new file mode 100644
index 000000000000..c3607e94984c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/timecop-0.8[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/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=The Ruby One Time Password Library
+EAPI=8
+HOMEPAGE=https://github.com/mdp/rotp
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/openssl ruby_targets_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/mdp/rotp/archive/refs/tags/v6.2.0.tar.gz -> rotp-6.2.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e8877f4d28b83aa430db10d606cc65f6
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2 b/metadata/md5-cache/dev-ruby/serialport-1.3.2
new file mode 100644
index 000000000000..027fdb352707
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2
@@ -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? ( 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 library for serial port (rs232) access in ruby
+EAPI=8
+HOMEPAGE=https://github.com/hparra/ruby-serialport/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=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 )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0432cbd7d2b3f2370d9a50cb545d0332
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 0acc6162f8ee..d67dbc9ef85a 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 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://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e868e94f1f6e48207ae688fbebdc0f9e
+_md5_=f78808e9e880333ddc8ace6fb46c64ea
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 fc99f562b51e..5414e6e92c46 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 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://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b3dc020513f409f29b0510c0bb08b4e
+_md5_=d04ab32eb3c05109703ce1144c209ca1
diff --git a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0 b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
index 7b1d7f254d97..367d48333833 100644
--- a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
+++ b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
@@ -5,7 +5,7 @@ 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 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 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 )
@@ -13,4 +13,4 @@ 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	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ca432733b43ae5dd5dbc4d8de5b0236c
+_md5_=eda3c7bd446cecabbee6cfa06e852c30
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 fad09b45ea20..38dee18111f7 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -5,7 +5,7 @@ DESCRIPTION=A beautiful and powerful interactive command line prompt
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-prompt
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=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_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=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	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac27cc233a1b90eb5d8d2379cf4a1702
+_md5_=d0638a74493b81496071f5e90ba06bb2
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 d81383b39c53..31ee9ed9dad8 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=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_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=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	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aca014d8e054a8d7e7c37fc28c8225d3
+_md5_=b550daad0128a3ee75fd96464414f339
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 2adea556526c..51d8a0b1ad97 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 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://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=60566c4a3d27451a8d7acb1f71ca6534
+_md5_=be1d13ed8c31519a1a7070540ba81e30
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
new file mode 100644
index 000000000000..1d0680a65bce
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/excon-0.73[ruby_targets_ruby26(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/rake-12.3[ruby_targets_ruby26(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3[ruby_targets_ruby27(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Vagrant Cloud API Library
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/vagrant_cloud
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/excon-0.73[ruby_targets_ruby26(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.2.tar.gz -> vagrant_cloud-3.0.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1bf0098fd198cace20c0f1ff1c719435
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
new file mode 100644
index 000000000000..d7663659f866
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/excon-0.73[ruby_targets_ruby26(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/rake-12.3[ruby_targets_ruby26(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3[ruby_targets_ruby27(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Vagrant Cloud API Library
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/vagrant_cloud
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/excon-0.73[ruby_targets_ruby26(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.5.tar.gz -> vagrant_cloud-3.0.5.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bddad77b64d9e92af9b1543a05016315
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index 4c487b796ed5..a5f633e3b2e6 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
 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/wisper-2.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8123098a5187fdfbb6ec9c20f9443a9
+_md5_=67aac73b6a9f41576f2ed27c13dc636e
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 3465e30bb85c..7cacf1ebb9c7 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
index 009d5b8b2733..f1c3b3d520a0 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=3bd1a0fab6431e3f949be09442294995
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 8accc5b87570..99b373c85349 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/dot2tex-2.11.3 b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
index f9f9c3103886..5fd6bcb27782 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.11.3
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pydot[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/kjellmf/dot2tex/archive/2.11.3.tar.gz -> dot2tex-2.11.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e99b98ae82bb13ed339f02bc33eabb6
diff --git a/metadata/md5-cache/dev-tex/rubber-1.5.1-r1 b/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
index 228781413d9c..b89a2e3ea540 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
+++ b/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/rubber/trunk/1.5.1/+download/rubber-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=400c824825324af94e778a4ed0f06b85
diff --git a/metadata/md5-cache/dev-tex/rubber-1.6.0-r1 b/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
index 1beb50bd34a6..550cf330b4b7 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
+++ b/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/latex-rubber/rubber/-/archive/1.6.0/rubber-1.6.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9e2a2e426d01376820a9241985c32b0e
diff --git a/metadata/md5-cache/dev-tex/rubber-9999 b/metadata/md5-cache/dev-tex/rubber-9999
index 745250d1d750..1e68a4155d2c 100644
--- a/metadata/md5-cache/dev-tex/rubber-9999
+++ b/metadata/md5-cache/dev-tex/rubber-9999
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9e2a2e426d01376820a9241985c32b0e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0c4001305bd9..93b80260289d 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-studio-2020.3.1.24 b/metadata/md5-cache/dev-util/android-studio-2020.3.1.24
new file mode 100644
index 000000000000..2998aff1d31a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-2020.3.1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Android development environment based on IntelliJ IDEA
+EAPI=7
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 virtual/libcrypt:= !!<dev-util/android-studio-2020.3.1.24
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2020.3.1.24/android-studio-2020.3.1.24-linux.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b9cec241d270ac38d5f2c21528795073
diff --git a/metadata/md5-cache/dev-util/android-studio-4.0.1.0.193.6626763 b/metadata/md5-cache/dev-util/android-studio-4.0.1.0.193.6626763
deleted file mode 100644
index 29e6c026a7d0..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-4.0.1.0.193.6626763
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.0.1.0/android-studio-ide-193.6626763-linux.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069 b/metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
deleted file mode 100644
index d66e20d240c5..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.1.0.19/android-studio-ide-201.6858069-linux.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-studio-4.1.1.0.201.6953283 b/metadata/md5-cache/dev-util/android-studio-4.1.1.0.201.6953283
deleted file mode 100644
index 3b908ac78aaa..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-4.1.1.0.201.6953283
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.1.1.0/android-studio-ide-201.6953283-linux.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01da82287a5d922b93401fdda80f75b9
diff --git a/metadata/md5-cache/dev-util/android-studio-4.1.2.0.201.7042882 b/metadata/md5-cache/dev-util/android-studio-4.1.2.0.201.7042882
deleted file mode 100644
index d51d576f7f61..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-4.1.2.0.201.7042882
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.1.2.0/android-studio-ide-201.7042882-linux.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01da82287a5d922b93401fdda80f75b9
diff --git a/metadata/md5-cache/dev-util/android-studio-4.1.3.0.201.7199119 b/metadata/md5-cache/dev-util/android-studio-4.1.3.0.201.7199119
deleted file mode 100644
index 17db0cecf4d2..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-4.1.3.0.201.7199119
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.1.3.0/android-studio-ide-201.7199119-linux.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01da82287a5d922b93401fdda80f75b9
diff --git a/metadata/md5-cache/dev-util/boost-build-1.77.0 b/metadata/md5-cache/dev-util/boost-build-1.77.0
index 159b3a491ee2..09deda78181c 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.77.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.77.0
@@ -3,10 +3,10 @@ DESCRIPTION=A system for large project software construction, simple to use and
 EAPI=8
 HOMEPAGE=https://www.boost.org/build/
 IUSE=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 ~m68k ~mips ~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=Boost-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83364a76d680cfafc4c99a72a30cb037
+_md5_=3c26ad60fd726288576993cc20b17666
diff --git a/metadata/md5-cache/dev-util/bpftool-5.14.5 b/metadata/md5-cache/dev-util/bpftool-5.14.5
deleted file mode 100644
index adc3be11a2ea..000000000000
--- a/metadata/md5-cache/dev-util/bpftool-5.14.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/docutils
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
-DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
-EAPI=8
-HOMEPAGE=https://kernel.org/
-IUSE=caps kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.5.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d84bf73e5efc0bb3e8a9e752a07b5b1
diff --git a/metadata/md5-cache/dev-util/bpftool-5.14.6 b/metadata/md5-cache/dev-util/bpftool-5.14.6
new file mode 100644
index 000000000000..6a3d128c5ded
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bpftool-5.14.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/docutils
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
+DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
+EAPI=8
+HOMEPAGE=https://kernel.org/
+IUSE=caps kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d84bf73e5efc0bb3e8a9e752a07b5b1
diff --git a/metadata/md5-cache/dev-util/buildbot-2.10.0 b/metadata/md5-cache/dev-util/buildbot-2.10.0
index 5da8ed00efa2..079e5ba2318e 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.10.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bca274cb9571b7012922587d69f4a441
diff --git a/metadata/md5-cache/dev-util/buildbot-2.10.1 b/metadata/md5-cache/dev-util/buildbot-2.10.1
index 39bb5c0ddd44..1fb70f3cac54 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-2.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.10.1.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bca274cb9571b7012922587d69f4a441
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.2-r1 b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
index a6ee27282fa2..7e78d5d4ddb6 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49b6766f3cba6ce66003aa7d6e60b7f0
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.4 b/metadata/md5-cache/dev-util/buildbot-2.8.4
index 94e05f66f24c..78e956a4fff1 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.4.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=685c8c483f80131138384082469f7765
diff --git a/metadata/md5-cache/dev-util/buildbot-3.0.2 b/metadata/md5-cache/dev-util/buildbot-3.0.2
index b18a3c405952..5ccf45d996bb 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-3.0.2
@@ -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/b/buildbot/buildbot-3.0.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2ae5c51d863fc19f5599b4de9d974d7
diff --git a/metadata/md5-cache/dev-util/buildbot-3.1.0 b/metadata/md5-cache/dev-util/buildbot-3.1.0
index 0014ae975701..0ebf2a5a2360 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-3.1.0
@@ -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/b/buildbot/buildbot-3.1.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8eefb5e1a0b9f2436d836e759f9b715e
diff --git a/metadata/md5-cache/dev-util/buildbot-3.1.1 b/metadata/md5-cache/dev-util/buildbot-3.1.1
index 039a0298c974..458b8383a690 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-3.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=mirror://pypi/b/buildbot/buildbot-3.1.1.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8eefb5e1a0b9f2436d836e759f9b715e
diff --git a/metadata/md5-cache/dev-util/buildbot-3.2.0 b/metadata/md5-cache/dev-util/buildbot-3.2.0
index 3431ceac2dd4..3616a014df9f 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-3.2.0
@@ -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/b/buildbot/buildbot-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b83681fcc080928ceda7a7146d8e530b
diff --git a/metadata/md5-cache/dev-util/buildbot-3.3.0 b/metadata/md5-cache/dev-util/buildbot-3.3.0
index 6943a4b4e35f..df896babc62e 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-3.3.0
@@ -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/b/buildbot/buildbot-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9339ff2485c5de4eece46c9e7e91ccc
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index e75019bb841c..a216e5432690 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/buildbot >=dev-python/jinja-2.1[python_targets_python3_8(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b3c962d6ff7e4a92763ddd12491fd7
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.10.0 b/metadata/md5-cache/dev-util/buildbot-badges-2.10.0
index d26095097d29..db219a7a0375 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ee931b50482ba0920d5ba812b86c624
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.10.1 b/metadata/md5-cache/dev-util/buildbot-badges-2.10.1
index 72eff71bf9e5..02ddc4039b49 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ee931b50482ba0920d5ba812b86c624
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.2 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
index ece41e5920cc..76a9d1999e0c 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ee931b50482ba0920d5ba812b86c624
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.4 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
index dcc9bdecdb25..54ed58311d06 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ee931b50482ba0920d5ba812b86c624
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.0.2 b/metadata/md5-cache/dev-util/buildbot-badges-3.0.2
index b312c12584c9..6de73c63025c 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0eeb9bf5d5645388e7bff8f70e87afe
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.1.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.1.0
index 5d7277ad757a..db52d9b866de 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0eeb9bf5d5645388e7bff8f70e87afe
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.1.1 b/metadata/md5-cache/dev-util/buildbot-badges-3.1.1
index a86ad7abb444..c4c2570b2aae 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e35f9a5afd96ea4415cb1aca599dbb85
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.2.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.2.0
index 3bad710378c7..0d8524c794d6 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e35f9a5afd96ea4415cb1aca599dbb85
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.3.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.3.0
index dd17b8cff354..30307b6a70b4 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e35f9a5afd96ea4415cb1aca599dbb85
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.10.0 b/metadata/md5-cache/dev-util/buildbot-console-view-2.10.0
index 48a6c60dbe39..a9e6af75657f 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.10.0[python_targets_python3_8(-)?] ~dev-util/buildb
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a28ebf195e83e55bb9db4761edda1463
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.10.1 b/metadata/md5-cache/dev-util/buildbot-console-view-2.10.1
index 85f3fff182d7..9a1f7cda1e9c 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.10.1[python_targets_python3_8(-)?] ~dev-util/buildb
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a28ebf195e83e55bb9db4761edda1463
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
index a755cc0dba6b..c462cac7c7f6 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.2[python_targets_python3_8(-)?] ~dev-util/buildbo
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a28ebf195e83e55bb9db4761edda1463
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
index 4a0cceaab683..fe6978816acc 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_8(-)?] ~dev-util/buildbo
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a28ebf195e83e55bb9db4761edda1463
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.0.2 b/metadata/md5-cache/dev-util/buildbot-console-view-3.0.2
index 2fff30a40b68..8e0912d39801 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.0.2[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd0165b3aa17b95b987d27d7c5a9c7cb
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.1.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.1.0
index fa40886da702..55b2eaf2d24a 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.1.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd0165b3aa17b95b987d27d7c5a9c7cb
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.1.1 b/metadata/md5-cache/dev-util/buildbot-console-view-3.1.1
index c02c5535cdc6..cbf8e9b9fd64 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.1.1[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=985cb14ef785d44b47bd3e734b818a24
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.2.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.2.0
index 86cd7f07a9e9..4332c2f6cdcb 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.2.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=985cb14ef785d44b47bd3e734b818a24
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.3.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.3.0
index ffdc4644f724..90912ecd1af7 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.3.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=985cb14ef785d44b47bd3e734b818a24
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.0
index d0c3cdc3c77e..44fb4d8d148e 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a89f3903bdca3f71815a40f3a1ff2f47
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.1 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.1
index 4500e7d51e0c..07a61a076146 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a89f3903bdca3f71815a40f3a1ff2f47
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
index f946cbb55fd2..f7d34849cd43 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a89f3903bdca3f71815a40f3a1ff2f47
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
index ece4bf044091..5fd3a15ec065 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a89f3903bdca3f71815a40f3a1ff2f47
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.0.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.0.2
index 77f55f8fd77a..a668ae3860cf 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99f60f0ee75dd4b21185910efd6d2655
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.0
index e7c412a27bc5..4c8096722f67 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99f60f0ee75dd4b21185910efd6d2655
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.1 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.1
index 66ef7285cc4a..63aad3b83b24 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a243b0e390c436918fb09f289f19324f
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.2.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.2.0
index fdfb51413dbd..32e57417ffd8 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a243b0e390c436918fb09f289f19324f
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.3.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.3.0
index b20c9833eba0..464735a6e6f4 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a243b0e390c436918fb09f289f19324f
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.10.0 b/metadata/md5-cache/dev-util/buildbot-pkg-2.10.0
index b427ed8d8c05..4b446590d290 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8ca2b44ff41986a40ce6dddb13de994
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.10.1 b/metadata/md5-cache/dev-util/buildbot-pkg-2.10.1
index 91e78af142d1..228e26597303 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8ca2b44ff41986a40ce6dddb13de994
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
index df5d491b4368..958ebec95cba 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5af59b8f805f75da547bbc0eb01d77b7
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
index f1ccacc8e8c5..4603a84ac7bd 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5af59b8f805f75da547bbc0eb01d77b7
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.0.2 b/metadata/md5-cache/dev-util/buildbot-pkg-3.0.2
index 7111ef5dec4f..2b1e5eead754 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4962d62fe76d14587bdf85e8d7df4ba
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.1.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.1.0
index 389f3724783b..69d123dbc91d 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=769cff3a66b618daf4ef3322554c9b84
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.1.1 b/metadata/md5-cache/dev-util/buildbot-pkg-3.1.1
index c73df2e422b4..f840f9a5084c 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f13d59aae2cc82d5231b739b5196e293
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.2.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.2.0
index 153b602714b6..952e86343d8e 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67e717ffba6b5d7226b4baa22b64706e
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.3.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.3.0
index 018754ed9a40..50a1035e5a6e 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67e717ffba6b5d7226b4baa22b64706e
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.0
index 1347b4a55592..238d5b4bd7f0 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.10.0[python_targets_python3_8(-)?] dev-python/mock[
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0ef732c73064c7a6f6d34367e2feeae
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.1 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.1
index b2f0377492e1..ce9bf3366483 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.10.1[python_targets_python3_8(-)?] dev-python/mock[
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0ef732c73064c7a6f6d34367e2feeae
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
index 9c69e4d0d134..233863fdb603 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.2[python_targets_python3_8(-)?] dev-python/mock[p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0ef732c73064c7a6f6d34367e2feeae
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
index a462115d4ffd..3622495aab93 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_8(-)?] dev-python/mock[p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0ef732c73064c7a6f6d34367e2feeae
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.0.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.0.2
index 75463bb88b2f..f0667cd11682 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.0.2[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a664a22455d2ec33f5303be62715e046
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.0
index 273bab100755..499057163d4d 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.1.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d83591711608e93a324f8fcf9b446ca5
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.1 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.1
index ad1e237a84cf..4d323fa60dfc 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.1.1[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9480a3b42d4f0749b3d667b3c16456db
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.2.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.2.0
index 8f762ee8dd0e..61e7cfbcdafd 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.2.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9480a3b42d4f0749b3d667b3c16456db
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.3.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.3.0
index 4581d5374caf..4e8b70bfc593 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-3.3.0[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9480a3b42d4f0749b3d667b3c16456db
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.10.0 b/metadata/md5-cache/dev-util/buildbot-worker-2.10.0
index 726fecdb53f7..5abccb2d3148 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9e9340d19f7130ffea8ce8613191959
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.10.1 b/metadata/md5-cache/dev-util/buildbot-worker-2.10.1
index c35c584cfc54..31100dc46a39 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9e9340d19f7130ffea8ce8613191959
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.2 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
index 3b57db2b5797..0541414055b9 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=007a217623636408909f2f5702e88e98
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.4 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
index 7c9b5aff46eb..5c0177451355 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=007a217623636408909f2f5702e88e98
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.0.2 b/metadata/md5-cache/dev-util/buildbot-worker-3.0.2
index d67ac6a25bef..f9b98cabba4c 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.0.2
@@ -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/b/buildbot-worker/buildbot-worker-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee84a0931e773fb8ea72a0f57afd59fe
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.1.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.1.0
index 37ccdd138eaa..e9e82cae76ba 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.1.0
@@ -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/b/buildbot-worker/buildbot-worker-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92930502bf3a7cb0ab823f10ce40d845
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.1.1 b/metadata/md5-cache/dev-util/buildbot-worker-3.1.1
index 52aa2519df24..61fc7ec83e76 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.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=mirror://pypi/b/buildbot-worker/buildbot-worker-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3316a38550bcb74ca51eca361188a724
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.2.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.2.0
index 25ec7f01dcff..3a5607b12148 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.2.0
@@ -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/b/buildbot-worker/buildbot-worker-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3316a38550bcb74ca51eca361188a724
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.3.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.3.0
index 0d504ef6076d..5b3411fae053 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.3.0
@@ -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/b/buildbot-worker/buildbot-worker-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3316a38550bcb74ca51eca361188a724
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 45ab7c104a7a..f7037a519286 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f406e70f1f22ed7c63c94f866649511
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.0
index 07e6e51a9318..9413746d582b 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1252adc5ed52ad13fa04ef5a4b811fa6
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.1 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.1
index 8c847d134ae1..eed5b8838049 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1252adc5ed52ad13fa04ef5a4b811fa6
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
index 9bf832e2dd58..c28c622679fe 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1252adc5ed52ad13fa04ef5a4b811fa6
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
index 1cff01317c18..7bf6349cdd99 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1252adc5ed52ad13fa04ef5a4b811fa6
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.0.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.0.2
index 9033f1bb4346..6c657d033cd3 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a23a448d8bd962147c1d76cc7e7da506
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.0
index a016336e3bd1..5bcddc0f2191 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a23a448d8bd962147c1d76cc7e7da506
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.1 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.1
index 6f7a0da1fbbc..58b544ff5d2a 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c6b6b2f7410d9719299c463bc9b0943
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.2.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.2.0
index 2ee3103d6ecc..c3c8255e7f26 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c6b6b2f7410d9719299c463bc9b0943
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.3.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.3.0
index c5540783a7b4..c7a6707372f6 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c6b6b2f7410d9719299c463bc9b0943
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.10.0 b/metadata/md5-cache/dev-util/buildbot-www-2.10.0
index f9b466e8dcff..a49d3400bb92 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.10.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.10.0[python_targets_python3_8(-)?] python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f7ed58af2b2037418e4995bc2478f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.10.1 b/metadata/md5-cache/dev-util/buildbot-www-2.10.1
index e4fcfcb11a60..74ac0fed9825 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.10.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.10.1[python_targets_python3_8(-)?] python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f7ed58af2b2037418e4995bc2478f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.2 b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
index 8eff8527851f..7dd00e0f4d4d 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.8.2[python_targets_python3_8(-)?] python_target
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f7ed58af2b2037418e4995bc2478f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.4 b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
index 98efd9a1864a..8fed5fee7b00 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.8.4[python_targets_python3_8(-)?] python_target
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.8.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f7ed58af2b2037418e4995bc2478f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.0.2 b/metadata/md5-cache/dev-util/buildbot-www-3.0.2
index f805088c30f4..8b6a54795db6 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-3.0.2[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5dd6f1534b3dbd07dd5eed82336eeea3
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.1.0 b/metadata/md5-cache/dev-util/buildbot-www-3.1.0
index a9b74ff8792e..7322e7c6ff0d 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.1.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-3.1.0[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63f7c4f9c409fc537e111a899733d623
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.1.1 b/metadata/md5-cache/dev-util/buildbot-www-3.1.1
index cdcd54aea99f..e286a51ee78f 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.1.1
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-3.1.1[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83a39239814c70e6720fa038f5006e01
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.2.0 b/metadata/md5-cache/dev-util/buildbot-www-3.2.0
index 1f7af901e4b5..78a2b16ea335 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.2.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-3.2.0[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83a39239814c70e6720fa038f5006e01
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.3.0 b/metadata/md5-cache/dev-util/buildbot-www-3.3.0
index 0c8595ba9316..6e6477998f7c 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-3.3.0[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83a39239814c70e6720fa038f5006e01
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.18 b/metadata/md5-cache/dev-util/catalyst-3.0.18
index 4639cf422a5b..d92c020314f9 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.18
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.18
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.18.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e261f02b649967c7d4989b00414d48aa
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.20 b/metadata/md5-cache/dev-util/catalyst-3.0.20
index f6a9a3299742..b465f8fefb16 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.20
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.20
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.20.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=45381ad58e6a89d363cece5fd822db8d
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 0c38ff4475f5..8bc2b37c88e6 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] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1767177dd0aaf4448815fc538d522f53
diff --git a/metadata/md5-cache/dev-util/catfish-4.16.0 b/metadata/md5-cache/dev-util/catfish-4.16.0
deleted file mode 100644
index ccd9f80ef8ff..000000000000
--- a/metadata/md5-cache/dev-util/catfish-4.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/apps/catfish/start
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42 dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gdk-pixbuf[introspection] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/pango[introspection] >=xfce-base/xfconf-4.14[introspection] virtual/freedesktop-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://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=397b2ccc22d4e2a00d32d045c7b520d0
diff --git a/metadata/md5-cache/dev-util/catfish-4.16.2 b/metadata/md5-cache/dev-util/catfish-4.16.2
index dcac0baec07a..43e6ac173caa 100644
--- a/metadata/md5-cache/dev-util/catfish-4.16.2
+++ b/metadata/md5-cache/dev-util/catfish-4.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/catfish/start
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42 dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gdk-pixbuf[introspection] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/pango[introspection] >=xfce-base/xfconf-4.14[introspection] virtual/freedesktop-icon-theme python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.2.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=661de835272d7d113e7e04896eae85dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1c69f66e538905804e5a968601f44ee9
diff --git a/metadata/md5-cache/dev-util/catfish-4.16.3 b/metadata/md5-cache/dev-util/catfish-4.16.3
new file mode 100644
index 000000000000..d653e913bafd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catfish-4.16.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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 postinst postrm prepare test
+DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/catfish/start
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.42 dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gdk-pixbuf[introspection] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/pango[introspection] >=xfce-base/xfconf-4.14[introspection] virtual/freedesktop-icon-theme python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.3.tar.bz2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=661de835272d7d113e7e04896eae85dd
diff --git a/metadata/md5-cache/dev-util/ccache-4.4.2 b/metadata/md5-cache/dev-util/ccache-4.4.2
new file mode 100644
index 000000000000..58abc395255a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-4.4.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-ruby/asciidoctor ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare prerm test
+DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
+DESCRIPTION=Fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.dev/
+IUSE=doc redis +static-c++ test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v4.4.2/ccache-4.4.2.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ab32c4932b166c9889115e254ab16508
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.21.4 b/metadata/md5-cache/dev-util/checkbashisms-2.21.4
index bbdad0e51cc6..a0417cc6ca75 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.21.4
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.21.4
@@ -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 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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.4.tar.xz
-_md5_=0bd2b6e36aa0b094631aeac55e977237
+_md5_=76a727f7b6c782d3fd7fb64dbb76149d
diff --git a/metadata/md5-cache/dev-util/cligh-0.3 b/metadata/md5-cache/dev-util/cligh-0.3
index c92ce3c988d2..88776d9e7b5b 100644
--- a/metadata/md5-cache/dev-util/cligh-0.3
+++ b/metadata/md5-cache/dev-util/cligh-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyGithub[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://the-brannons.com/software/cligh-0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81448f1fe9cd994279a8d6bd4931750c
diff --git a/metadata/md5-cache/dev-util/cligh-9999 b/metadata/md5-cache/dev-util/cligh-9999
index 66881f3db88d..84a7399dd58b 100644
--- a/metadata/md5-cache/dev-util/cligh-9999
+++ b/metadata/md5-cache/dev-util/cligh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/PyGithub[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56448558bf3cc5566497aa9234d64956
diff --git a/metadata/md5-cache/dev-util/codespell-2.1.0 b/metadata/md5-cache/dev-util/codespell-2.1.0
index f7060e860985..af1a873fc4d3 100644
--- a/metadata/md5-cache/dev-util/codespell-2.1.0
+++ b/metadata/md5-cache/dev-util/codespell-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=https://github.com/codespell-project/codespell/archive/v2.1.0.tar.gz -> codespell-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f22164cea5a3d2c7db3fa912c2ffb045
diff --git a/metadata/md5-cache/dev-util/comparator-2.12 b/metadata/md5-cache/dev-util/comparator-2.12
index ceab42b7580f..1113ac62daed 100644
--- a/metadata/md5-cache/dev-util/comparator-2.12
+++ b/metadata/md5-cache/dev-util/comparator-2.12
@@ -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 )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/comparator/comparator-2.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=481d8e5017e265ba7a324ec6f828bd5e
diff --git a/metadata/md5-cache/dev-util/conan-1.36.0 b/metadata/md5-cache/dev-util/conan-1.36.0
index e056feb11ef5..3a7a0264f2ca 100644
--- a/metadata/md5-cache/dev-util/conan-1.36.0
+++ b/metadata/md5-cache/dev-util/conan-1.36.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/conan-io/conan/archive/1.36.0.tar.gz -> conan-1.36.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c17864f929350af519c0d59715394fee
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.2 b/metadata/md5-cache/dev-util/cookiecutter-1.7.2
index 08a0626ea548..c2e753549616 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.2
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.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/audreyr/cookiecutter/archive/1.7.2.tar.gz -> cookiecutter-1.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fc8cf0a838e1486b4b7badf0a087aca
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1 b/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
index a268299fc1e6..14c560b1ea81 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.7.2.tar.gz -> cookiecutter-1.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df76e5abdab3f845563d85ea2c5926e5
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.3 b/metadata/md5-cache/dev-util/cookiecutter-1.7.3
index bbb6f9fdb43e..9607d4f17823 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.3
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.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/cookiecutter/cookiecutter/archive/1.7.3.tar.gz -> cookiecutter-1.7.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0aeaa07ff8bc869fc9003db5a723dea2
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.88 b/metadata/md5-cache/dev-util/cppcheck-1.88
index 412367710cb9..9812c67e0f02 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.88
+++ b/metadata/md5-cache/dev-util/cppcheck-1.88
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.88.tar.gz -> cppcheck-1.88.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fa5d652878fd8311cbae40acd5b00b6
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.2 b/metadata/md5-cache/dev-util/cppcheck-2.2
index 8cf91c7e7933..2da39a3e73e7 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.2
+++ b/metadata/md5-cache/dev-util/cppcheck-2.2
@@ -11,5 +11,5 @@ RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_ta
 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	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=567347afb3aedf30443a6ecc5a243f5e
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.4.1 b/metadata/md5-cache/dev-util/cppcheck-2.4.1
index 68abc8d77e54..7025abba68ca 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.4.1
+++ b/metadata/md5-cache/dev-util/cppcheck-2.4.1
@@ -11,5 +11,5 @@ RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.4.1.tar.gz -> cppcheck-2.4.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ff84e399b39b46a18a1806f50c66d66
diff --git a/metadata/md5-cache/dev-util/cram-0.7-r1 b/metadata/md5-cache/dev-util/cram-0.7-r1
index e87e67a4e277..036be854c077 100644
--- a/metadata/md5-cache/dev-util/cram-0.7-r1
+++ b/metadata/md5-cache/dev-util/cram-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1343bd36cfba759e0283337f2051948
diff --git a/metadata/md5-cache/dev-util/ctags-20190331 b/metadata/md5-cache/dev-util/ctags-20190331
deleted file mode 100644
index 3ef1a36810b9..000000000000
--- a/metadata/md5-cache/dev-util/ctags-20190331
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
-EAPI=6
-HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
-IUSE=json xml yaml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
-SLOT=0
-SRC_URI=https://github.com/universal-ctags/ctags/archive/95975bd157cc1326120977ce530f0477bcbf43b1.tar.gz -> ctags-20190331.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ed570d3baedf8949ff62f0dc495e5956
diff --git a/metadata/md5-cache/dev-util/ctags-20190331-r1 b/metadata/md5-cache/dev-util/ctags-20190331-r1
new file mode 100644
index 000000000000..95b8c0e8b5d9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ctags-20190331-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=6
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IUSE=json xml yaml
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/ctags/archive/95975bd157cc1326120977ce530f0477bcbf43b1.tar.gz -> ctags-20190331.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8497bd5b01f5686975ddebe3286f4f45
diff --git a/metadata/md5-cache/dev-util/ctags-20210321.0 b/metadata/md5-cache/dev-util/ctags-20210321.0
deleted file mode 100644
index 49e99f6dedf5..000000000000
--- a/metadata/md5-cache/dev-util/ctags-20210321.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
-DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
-EAPI=7
-HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
-IUSE=json xml yaml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
-SLOT=0
-SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8928ad3757be059cf11e5c7968ee17a
diff --git a/metadata/md5-cache/dev-util/ctags-20210321.0-r1 b/metadata/md5-cache/dev-util/ctags-20210321.0-r1
new file mode 100644
index 000000000000..c4e16f797623
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ctags-20210321.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=7
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IUSE=json xml yaml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8653ca6b0b383731131bc7f62706f231
diff --git a/metadata/md5-cache/dev-util/ctags-99999999 b/metadata/md5-cache/dev-util/ctags-99999999
index 785c74d81a78..1c8c03fac885 100644
--- a/metadata/md5-cache/dev-util/ctags-99999999
+++ b/metadata/md5-cache/dev-util/ctags-99999999
@@ -1,13 +1,13 @@
 BDEPEND=dev-python/docutils 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 postinst postrm prepare unpack
-DEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=7
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8cddce85716f5cc69aec397427e316d3
+_md5_=b17394d3d4854e9ca3eae555fa2f12f1
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.16 b/metadata/md5-cache/dev-util/d-feet-0.3.16
index c974edfffb27..7413eaed955a 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.16
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.16
@@ -5,7 +5,7 @@ DESCRIPTION=D-Feet is a powerful D-Bus debugger
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
 IUSE=test +X python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv 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] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 python_single_target_python3_8? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_9(-)] ) >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.16.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19f9aa4b03f730f2a91080bd45f9b063
+_md5_=1f2e00bc9907569affd57cba310851e0
diff --git a/metadata/md5-cache/dev-util/diff-cover-5.0.1 b/metadata/md5-cache/dev-util/diff-cover-5.0.1
index fa07be8baf50..c1fae1e77287 100644
--- a/metadata/md5-cache/dev-util/diff-cover-5.0.1
+++ b/metadata/md5-cache/dev-util/diff-cover-5.0.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/Bachmann1234/diff_cover/archive/v5.0.1.tar.gz -> diff-cover-5.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae2d16b08e6a015c842a3dccb3c38765
diff --git a/metadata/md5-cache/dev-util/diffoscope-177-r1 b/metadata/md5-cache/dev-util/diffoscope-177-r1
index f49660cb9234..ade8497be633 100644
--- a/metadata/md5-cache/dev-util/diffoscope-177-r1
+++ b/metadata/md5-cache/dev-util/diffoscope-177-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/d/diffoscope/diffoscope-177.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a3e5e984dc3f2eae4ffdefec10c50ed
diff --git a/metadata/md5-cache/dev-util/diffoscope-180 b/metadata/md5-cache/dev-util/diffoscope-180
index d1379b888fe8..3ad3281de4b7 100644
--- a/metadata/md5-cache/dev-util/diffoscope-180
+++ b/metadata/md5-cache/dev-util/diffoscope-180
@@ -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/d/diffoscope/diffoscope-180.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d3382ebeeaf1cae7a114c37df3283e0
diff --git a/metadata/md5-cache/dev-util/diffoscope-184 b/metadata/md5-cache/dev-util/diffoscope-184
index fd3f08691975..afa28692a210 100644
--- a/metadata/md5-cache/dev-util/diffoscope-184
+++ b/metadata/md5-cache/dev-util/diffoscope-184
@@ -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=mirror://pypi/d/diffoscope/diffoscope-184.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea9d32711afe9cd13a1b569c7d20cd59
diff --git a/metadata/md5-cache/dev-util/diffoscope-185 b/metadata/md5-cache/dev-util/diffoscope-185
index f03fd11701ef..e7674a6bd62d 100644
--- a/metadata/md5-cache/dev-util/diffoscope-185
+++ b/metadata/md5-cache/dev-util/diffoscope-185
@@ -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=mirror://pypi/d/diffoscope/diffoscope-185.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea9d32711afe9cd13a1b569c7d20cd59
diff --git a/metadata/md5-cache/dev-util/distro-info-1.0 b/metadata/md5-cache/dev-util/distro-info-1.0
index 25dc90f61e05..ca468b0a88cb 100644
--- a/metadata/md5-cache/dev-util/distro-info-1.0
+++ b/metadata/md5-cache/dev-util/distro-info-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_1.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=308fdb7be62359cbba8b02ccc3b055be
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.11 b/metadata/md5-cache/dev-util/dogtail-0.9.11
index 2e3ebb0bcf8d..52047b25fb83 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.11
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.11
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b39d17d80cd01e25469ac620da399897
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.32 b/metadata/md5-cache/dev-util/dput-ng-1.32
index c5e4fe64eefd..80a2a1c57276 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.32
+++ b/metadata/md5-cache/dev-util/dput-ng-1.32
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.32.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45356c381a02a31742b5fb4093ef2ffd
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.27 b/metadata/md5-cache/dev-util/ebuildtester-0.1.27
index 3a2cdcb30d2a..eaff8174a0c4 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.27
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.27
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.27.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.29 b/metadata/md5-cache/dev-util/ebuildtester-0.1.29
index 0d28d2166b79..19a6c7008980 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.29
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.29
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.29.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/ebuildtester-0.1.30 b/metadata/md5-cache/dev-util/ebuildtester-0.1.30
index fb33d86192d1..28714343d181 100644
--- a/metadata/md5-cache/dev-util/ebuildtester-0.1.30
+++ b/metadata/md5-cache/dev-util/ebuildtester-0.1.30
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.30.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.15 b/metadata/md5-cache/dev-util/flawfinder-2.0.15
index fe3bbe71e380..67656cbfd021 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.15
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.15
@@ -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_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flawfinder/flawfinder-2.0.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92df2a399f01375a4444e525445960fc
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.18 b/metadata/md5-cache/dev-util/flawfinder-2.0.18
index 1946f658e9b0..5b4863437a46 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.18
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.18
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flawfinder/flawfinder-2.0.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=229fff24bfd60e3cbc4bd0cedc992599
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.19 b/metadata/md5-cache/dev-util/flawfinder-2.0.19
index aae1c32f62c6..7cf606c7d71c 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.19
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.19
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flawfinder/flawfinder-2.0.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2fbef2a127954093f541ff89ae238ac
diff --git a/metadata/md5-cache/dev-util/gcovr-4.2 b/metadata/md5-cache/dev-util/gcovr-4.2
index fd932363d736..2e6663647c9b 100644
--- a/metadata/md5-cache/dev-util/gcovr-4.2
+++ b/metadata/md5-cache/dev-util/gcovr-4.2
@@ -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/gcovr/gcovr/archive/4.2.tar.gz -> gcovr-4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e38f3ac4161547ceeb615550e32c17f7
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.2
index 538313c6d0c7..390f497df40b 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.2.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d5591cae3271dcd12b4dd65cbaf8416
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
index 189fa966283f..1ab46672c012 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d5591cae3271dcd12b4dd65cbaf8416
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.4
index 97e088bd8cca..4028c971b4a2 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.68.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.68.4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.4.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ae52b57e744f23164189b4fb8d3ad29
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.70.0 b/metadata/md5-cache/dev-util/gdbus-codegen-2.70.0
index bb231e1ea424..03936bc7f0e7 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.70.0
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.70.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.70/glib-2.70.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1673430bc02f3be7a439bb6d6eeeb59
diff --git a/metadata/md5-cache/dev-util/gertty-1.6.0-r1 b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
index 61a51fa12293..3f1194367a10 100644
--- a/metadata/md5-cache/dev-util/gertty-1.6.0-r1
+++ b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?] >=dev-python/urwid-1
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ef2391bb50c3c4947c2a7b6efbfc6f1
diff --git a/metadata/md5-cache/dev-util/gertty-9999 b/metadata/md5-cache/dev-util/gertty-9999
index 0733b6b3f6a7..339f80e45586 100644
--- a/metadata/md5-cache/dev-util/gertty-9999
+++ b/metadata/md5-cache/dev-util/gertty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?] >=dev-python/urwid-1.2.1[python_targets_python3_8(-)?] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_8(-)?] >=dev-python/GitPython-0.3.7[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] >=dev-python/requests-2.5.3[python_targets_python3_8(-)?] <dev-python/requests-3.0.0[python_targets_python3_8(-)?] >=dev-python/alembic-0.6.4[python_targets_python3_8(-)?] >=dev-python/pyyaml-3.1.0[python_targets_python3_8(-)?] >=dev-python/voluptuous-0.7[python_targets_python3_8(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77f1156f7e5c2e5307f6b27347faeef8
diff --git a/metadata/md5-cache/dev-util/gi-docgen-2021.6 b/metadata/md5-cache/dev-util/gi-docgen-2021.6
index 48f836720dbe..51466cfb867c 100644
--- a/metadata/md5-cache/dev-util/gi-docgen-2021.6
+++ b/metadata/md5-cache/dev-util/gi-docgen-2021.6
@@ -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_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gi-docgen/gi-docgen-2021.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f5e013565ee3441cd0b528e9db2d53c1
diff --git a/metadata/md5-cache/dev-util/gi-docgen-2021.7 b/metadata/md5-cache/dev-util/gi-docgen-2021.7
index a7faa9813aee..79a86857ba3e 100644
--- a/metadata/md5-cache/dev-util/gi-docgen-2021.7
+++ b/metadata/md5-cache/dev-util/gi-docgen-2021.7
@@ -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 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gi-docgen/gi-docgen-2021.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=363df7e17b4436a3229b990fb723fbfe
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30 b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
index ba471b5be52d..9f330d2188b3 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
+++ b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2019.11.30.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d9cd865861cfd4587ccfb967134d763
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2021.02.21 b/metadata/md5-cache/dev-util/gprof2dot-2021.02.21
index 6b19da0f2454..b811b4962c7d 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2021.02.21
+++ b/metadata/md5-cache/dev-util/gprof2dot-2021.02.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2021.2.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d76562c64d0424bb4dd444ea97bb8b2
diff --git a/metadata/md5-cache/dev-util/gyp-20200512145953 b/metadata/md5-cache/dev-util/gyp-20200512145953
index 6351805012df..50ee1cf23165 100644
--- a/metadata/md5-cache/dev-util/gyp-20200512145953
+++ b/metadata/md5-cache/dev-util/gyp-20200512145953
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20200512145953.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27de9300891cd374184c03b42378f3cf
diff --git a/metadata/md5-cache/dev-util/gyp-99999999999999 b/metadata/md5-cache/dev-util/gyp-99999999999999
index b82a533cb583..fa5ceea9a839 100644
--- a/metadata/md5-cache/dev-util/gyp-99999999999999
+++ b/metadata/md5-cache/dev-util/gyp-99999999999999
@@ -9,5 +9,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] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d78d4aebc779de542fdde81c47588a35
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.15 b/metadata/md5-cache/dev-util/howdoi-2.0.15
index 3e71f1defde4..7f465ecfb1d4 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.15
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.15
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[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.15.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b320625984b812f411a56abc19374e7
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.16 b/metadata/md5-cache/dev-util/howdoi-2.0.16
index ce3f3caad2c1..7516d253dbc9 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.16
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.16
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[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.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b359a1f1c45deca5209516dd7978707
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.17 b/metadata/md5-cache/dev-util/howdoi-2.0.17
index 4ecff0f631ff..b3283321ed72 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.17
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b359a1f1c45deca5209516dd7978707
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8744 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8744
new file mode 100644
index 000000000000..ff58bd0f0dce
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8744
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=sys-devel/lld-11 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/opencl-clang:11= sys-devel/llvm:11= !!sys-devel/llvm:0
+DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
+EAPI=7
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/opencl-clang:11= sys-devel/llvm:11=
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.8744.tar.gz -> intel-graphics-compiler-1.0.8744.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d6164db6379f81650403198e888d809
diff --git a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.4 b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.4
new file mode 100644
index 000000000000..b6db5cb90df3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.2.4
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-doc/doxygen || ( ( 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-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/metee
+DESCRIPTION=Intel graphics system controller firmware update library
+EAPI=8
+HOMEPAGE=https://github.com/intel/igsc
+IUSE=+cli doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/metee
+SLOT=0
+SRC_URI=https://github.com/intel/igsc/archive/refs/tags/V0.2.4.tar.gz -> intel-graphics-system-controller-0.2.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=853f03a4dad42a3ad256dad4c3f05265
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0 b/metadata/md5-cache/dev-util/lldb-13.0.0
new file mode 100644
index 000000000000..afbc56f34fc1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-13.0.0
@@ -0,0 +1,16 @@
+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[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-13.0.0[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-13.0.0[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-3.20.5
+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[xml] ~sys-devel/llvm-13.0.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
+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-13.0.0[xml] ~sys-devel/llvm-13.0.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.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=90c1e34ed0c3acbec75ee17bf0086769
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0_rc2 b/metadata/md5-cache/dev-util/lldb-13.0.0_rc2
deleted file mode 100644
index b0819cb3f63e..000000000000
--- a/metadata/md5-cache/dev-util/lldb-13.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-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_rc2[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-13.0.0_rc2[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-13.0.0_rc2[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-3.20.5
-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_rc2[xml] ~sys-devel/llvm-13.0.0_rc2 !!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_rc2[xml] ~sys-devel/llvm-13.0.0_rc2
-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-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95f3563cfc92bcec47cfb53bbae39c6e
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-13.0.0_rc3
deleted file mode 100644
index aee89d9e565c..000000000000
--- a/metadata/md5-cache/dev-util/lldb-13.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-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_rc3[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-13.0.0_rc3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-13.0.0_rc3[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-3.20.5
-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_rc3[xml] ~sys-devel/llvm-13.0.0_rc3 !!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_rc3[xml] ~sys-devel/llvm-13.0.0_rc3
-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-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95f3563cfc92bcec47cfb53bbae39c6e
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0_rc4 b/metadata/md5-cache/dev-util/lldb-13.0.0_rc4
deleted file mode 100644
index f2c4bac2b601..000000000000
--- a/metadata/md5-cache/dev-util/lldb-13.0.0_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-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_rc4[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-13.0.0_rc4[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-13.0.0_rc4[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-3.20.5
-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_rc4[xml] ~sys-devel/llvm-13.0.0_rc4 !!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_rc4[xml] ~sys-devel/llvm-13.0.0_rc4
-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-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=95f3563cfc92bcec47cfb53bbae39c6e
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.6 b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
new file mode 100644
index 000000000000..8878b4438795
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/2.12
+SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.6.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=72e832555c6b5455db4cd7d50858d8ba
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.13.0 b/metadata/md5-cache/dev-util/lttng-modules-2.13.0
new file mode 100644
index 000000000000..f121d12c0578
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=LTTng Kernel Tracer Modules
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/2.13
+SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.13.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=62f76927932c8a503d2c91306a18b041
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.12.5 b/metadata/md5-cache/dev-util/lttng-tools-2.12.5
new file mode 100644
index 000000000000..f9c0873366f4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.12.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=+ust
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
+SLOT=0/2.12
+SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.12.5.tar.bz2
+_md5_=2e92cda8db8b94e3e8b4c4fa88a644f3
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.13.0 b/metadata/md5-cache/dev-util/lttng-tools-2.13.0
new file mode 100644
index 000000000000..1342684225cb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.13.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
+DESCRIPTION=Linux Trace Toolkit - next generation
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=+ust
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
+SLOT=0/2.13
+SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.13.0.tar.bz2
+_md5_=2e92cda8db8b94e3e8b4c4fa88a644f3
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.12.2 b/metadata/md5-cache/dev-util/lttng-ust-2.12.2
new file mode 100644
index 000000000000..ebf722edf131
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.12.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+DESCRIPTION=Linux Trace Toolkit - UST library
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=examples numa
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+SLOT=0/2.12
+SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.12.2.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=207a00a85a06a503ad34f77a3a76be3d
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.13.0 b/metadata/md5-cache/dev-util/lttng-ust-2.13.0
new file mode 100644
index 000000000000..fff0b01343a2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.13.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+DESCRIPTION=Linux Trace Toolkit - UST library
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=examples numa
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+SLOT=0/2.13
+SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.13.0.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=207a00a85a06a503ad34f77a3a76be3d
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.8.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.8.0
deleted file mode 100644
index 70f4487bef71..000000000000
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
-DESCRIPTION=LXQt Build Tools
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.8.0/lxqt-build-tools-0.8.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4048bbabf239a5ec37d86f92d8073589
diff --git a/metadata/md5-cache/dev-util/meld-3.20.3 b/metadata/md5-cache/dev-util/meld-3.20.3
index 47119e4eed14..fa340c7def4d 100644
--- a/metadata/md5-cache/dev-util/meld-3.20.3
+++ b/metadata/md5-cache/dev-util/meld-3.20.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f40cb9e3ea6dc98bf533dea998f2c6da
diff --git a/metadata/md5-cache/dev-util/meld-3.20.4 b/metadata/md5-cache/dev-util/meld-3.20.4
index 1d2724c5ec93..29e6ddb5ae4a 100644
--- a/metadata/md5-cache/dev-util/meld-3.20.4
+++ b/metadata/md5-cache/dev-util/meld-3.20.4
@@ -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://gnome/sources/meld/3.20/meld-3.20.4.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d1a4a048967d1bcd75bbd0613518907d
diff --git a/metadata/md5-cache/dev-util/meson-0.58.2-r1 b/metadata/md5-cache/dev-util/meson-0.58.2-r1
index 1936905f01c7..24e030a6f407 100644
--- a/metadata/md5-cache/dev-util/meson-0.58.2-r1
+++ b/metadata/md5-cache/dev-util/meson-0.58.2-r1
@@ -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/m/meson/meson-0.58.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2a15318518649d4a9ed628adbaf1d1d
diff --git a/metadata/md5-cache/dev-util/meson-0.59.1-r1 b/metadata/md5-cache/dev-util/meson-0.59.1-r1
index 7c372119fbc8..71486f632aed 100644
--- a/metadata/md5-cache/dev-util/meson-0.59.1-r1
+++ b/metadata/md5-cache/dev-util/meson-0.59.1-r1
@@ -5,12 +5,12 @@ 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.59.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2bbd8ea0e51cf76796d9d763d3772b45
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eb102723275b6ac529fec6a02fc7e954
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 34bb8244f008..f379ad7d6d99 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f63d9c500884927eb6ab089c83df31c2
diff --git a/metadata/md5-cache/dev-util/objconv-2.51 b/metadata/md5-cache/dev-util/objconv-2.51
index b9e9ef794354..9cefe263990e 100644
--- a/metadata/md5-cache/dev-util/objconv-2.51
+++ b/metadata/md5-cache/dev-util/objconv-2.51
@@ -6,6 +6,6 @@ HOMEPAGE=https://agner.org/optimize/#objconv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.51.zip
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/objconv-2.51.zip
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=a2eb577746b28d63ea34ba0e055bb4e2
+_md5_=ea68d7dbe7d3af065dd13ba23d7ae8c9
diff --git a/metadata/md5-cache/dev-util/opencl-headers-2021.06.30 b/metadata/md5-cache/dev-util/opencl-headers-2021.06.30
index 59e604d82b11..15fb5310d8fc 100644
--- a/metadata/md5-cache/dev-util/opencl-headers-2021.06.30
+++ b/metadata/md5-cache/dev-util/opencl-headers-2021.06.30
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Unified C language headers for the OpenCL API
 EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-Headers
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-Headers/archive/v2021.06.30.tar.gz -> opencl-headers-2021.06.30.tar.gz
-_md5_=0911bd35538def1255993641e446afb1
+_md5_=61614a54774550f0d622602669414b8f
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.1-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.1-r1
index 475cb16130f8..e114e2c7d0ca 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.1-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.1-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/p/pkgcheck/pkgcheck-0.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc7fb79407b53e4a8ce7e84986760f80
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.3-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.3-r1
index 04bf97735e2d..f0dd87c6f999 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.3-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.3-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/p/pkgcheck/pkgcheck-0.10.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c579828e81d46dc5055cc7d813c3c37f
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.5-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.5-r1
index a955ab3c4287..80397eaa68f2 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.5-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.5-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/p/pkgcheck/pkgcheck-0.10.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=52dd3d42f25ced1f20bebac5bb08adbc
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.7 b/metadata/md5-cache/dev-util/pkgcheck-0.10.7
deleted file mode 100644
index 45d48bde6bce..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[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-vcs/git ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.7[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=8
-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.7[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.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffb9096e8be9fc6c02d1922c1bc43be1
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.7-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.7-r1
new file mode 100644
index 000000000000..4c107a34f844
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[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-vcs/git ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <sys-apps/pkgcore-0.12.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.7[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=8
+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.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.7[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.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4ced6fae411ff7af2584c75b75808713
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.8 b/metadata/md5-cache/dev-util/pkgcheck-0.10.8
new file mode 100644
index 000000000000..a52f3d0f351f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[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-vcs/git ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.8[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=8
+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.8[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.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b9aed02f779f3d6e02271176bbd3c8c4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 9acdfe60a679..1f305ce68b94 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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f05ea82e6008d288c94c0d45d95388f0
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b9aed02f779f3d6e02271176bbd3c8c4
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.9 b/metadata/md5-cache/dev-util/pkgdev-0.1.9
index 6c519fb1eb0c..cf48f3049b66 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.9
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.9
@@ -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/pkgdev/pkgdev-0.1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac0742df5185a0d15ea7a014deb1e526
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 870fbaa93cf0..6eb5183b293c 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3047760ea306bbd70c834869a44ccc23
diff --git a/metadata/md5-cache/dev-util/rbtools-2.0 b/metadata/md5-cache/dev-util/rbtools-2.0
index e8e0f1ecf0fa..e4a993ea2c63 100644
--- a/metadata/md5-cache/dev-util/rbtools-2.0
+++ b/metadata/md5-cache/dev-util/rbtools-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/2.0/RBTools-2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4d03c4d6ca8c11358df7bfa44923203
diff --git a/metadata/md5-cache/dev-util/rbtools-2.0.1 b/metadata/md5-cache/dev-util/rbtools-2.0.1
index 63fd0c99f076..48da7a733261 100644
--- a/metadata/md5-cache/dev-util/rbtools-2.0.1
+++ b/metadata/md5-cache/dev-util/rbtools-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/2.0/RBTools-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b437e61790c0efb00c6f7491bbf96091
diff --git a/metadata/md5-cache/dev-util/rosdep-0.21.0 b/metadata/md5-cache/dev-util/rosdep-0.21.0
index 917c07512dbc..8de33f4a3c24 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.21.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.21.0
@@ -12,5 +12,5 @@ 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ac53119f9a3c3c8ce612044bbba283c
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index a3337e40c74b..045b8f828c8a 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ac53119f9a3c3c8ce612044bbba283c
diff --git a/metadata/md5-cache/dev-util/rosinstall-0.7.8 b/metadata/md5-cache/dev-util/rosinstall-0.7.8
index dec93c014733..63b280535b5b 100644
--- a/metadata/md5-cache/dev-util/rosinstall-0.7.8
+++ b/metadata/md5-cache/dev-util/rosinstall-0.7.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosinstall/rosinstall-0.7.8.tar.gz https://github.com/vcstools/rosinstall/archive/0.7.8.tar.gz -> rosinstall-0.7.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cde6b1fed582bf4e7b4a79620b7b7525
diff --git a/metadata/md5-cache/dev-util/rosinstall-9999 b/metadata/md5-cache/dev-util/rosinstall-9999
index 6538bfd50bbc..173e5047fcf5 100644
--- a/metadata/md5-cache/dev-util/rosinstall-9999
+++ b/metadata/md5-cache/dev-util/rosinstall-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?] >=dev-python/vcstool
 REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cde6b1fed582bf4e7b4a79620b7b7525
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
index 10fabe4e1ca8..11ab987de727 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.22.tar.gz -> rosinstall_generator-0.1.22.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0882f2d163154de0c99676fabf1c4e23
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index f4cb1baca918..d5d2eb470be6 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_8(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0882f2d163154de0c99676fabf1c4e23
diff --git a/metadata/md5-cache/dev-util/rr-5.4.0 b/metadata/md5-cache/dev-util/rr-5.4.0
deleted file mode 100644
index c6df47e6e3cd..000000000000
--- a/metadata/md5-cache/dev-util/rr-5.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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] ) test? ( python_single_target_python3_8? ( dev-python/pexpect[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pexpect[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pexpect[python_targets_python3_10(-)] ) sys-devel/gdb[xml] )
-DESCRIPTION=Record and Replay Framework
-EAPI=7
-HOMEPAGE=https://rr-project.org/
-IUSE=multilib test kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT BSD-2
-RDEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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/gdb[xml]
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mozilla/rr/archive/5.4.0.tar.gz -> mozilla-rr-5.4.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=38aa820c7f5346c77573f26f87bd4dc0
diff --git a/metadata/md5-cache/dev-util/rr-5.5.0 b/metadata/md5-cache/dev-util/rr-5.5.0
new file mode 100644
index 000000000000..d582a6e4597e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rr-5.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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] ) test? ( python_single_target_python3_8? ( dev-python/pexpect[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pexpect[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pexpect[python_targets_python3_10(-)] ) sys-devel/gdb[xml] )
+DESCRIPTION=Record and Replay Framework
+EAPI=7
+HOMEPAGE=https://rr-project.org/
+IUSE=multilib test kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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/gdb[xml]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.5.0.tar.gz -> mozilla-rr-5.5.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=38aa820c7f5346c77573f26f87bd4dc0
diff --git a/metadata/md5-cache/dev-util/scanmem-0.17 b/metadata/md5-cache/dev-util/scanmem-0.17
index 9ae19d69755e..553495617744 100644
--- a/metadata/md5-cache/dev-util/scanmem-0.17
+++ b/metadata/md5-cache/dev-util/scanmem-0.17
@@ -5,11 +5,11 @@ DESCRIPTION=Locate and modify variables in executing processes
 EAPI=7
 HOMEPAGE=https://github.com/scanmem/scanmem
 IUSE=gui static-libs python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/readline:0= gui? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/pygobject:3 sys-auth/polkit )
 REQUIRED_USE=gui? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/scanmem/scanmem/archive/v0.17.tar.gz -> scanmem-0.17.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eac34c00ae14d467a8d9b1a58b51d31b
+_md5_=84fc34d7c443f8fc7579870306bf5671
diff --git a/metadata/md5-cache/dev-util/scons-4.1.0-r1 b/metadata/md5-cache/dev-util/scons-4.1.0-r1
index 8669579b8160..c0c49f919893 100644
--- a/metadata/md5-cache/dev-util/scons-4.1.0-r1
+++ b/metadata/md5-cache/dev-util/scons-4.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.1.0/scons-4.1.0.tar.gz doc? ( https://www.scons.org/doc/4.1.0/PDF/scons-user.pdf -> scons-4.1.0-user.pdf https://www.scons.org/doc/4.1.0/HTML/scons-user.html -> scons-4.1.0-user.html ) test? ( https://github.com/scons/scons/archive/4.1.0.tar.gz -> scons-4.1.0.gh.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6af1d79d6ca10caed47a08b76b7802a0
diff --git a/metadata/md5-cache/dev-util/scons-4.2.0-r1 b/metadata/md5-cache/dev-util/scons-4.2.0-r1
index f619fc98e3f4..954f650768d3 100644
--- a/metadata/md5-cache/dev-util/scons-4.2.0-r1
+++ b/metadata/md5-cache/dev-util/scons-4.2.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=8
 HOMEPAGE=https://www.scons.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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=MIT
 RDEPEND=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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.2.0/scons-4.2.0.tar.gz doc? ( https://www.scons.org/doc/4.2.0/PDF/scons-user.pdf -> scons-4.2.0-user.pdf https://www.scons.org/doc/4.2.0/HTML/scons-user.html -> scons-4.2.0-user.html ) test? ( https://github.com/scons/scons/archive/4.2.0.tar.gz -> scons-4.2.0.gh.tar.gz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=edb47783edfd80161c56da4c833d2dc0
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=432773cc0628bcda7c830479fe9c4a75
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.72.0 b/metadata/md5-cache/dev-util/uncrustify-0.72.0
index 95843a0f332d..5ff5d1336a70 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.72.0
+++ b/metadata/md5-cache/dev-util/uncrustify-0.72.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.72.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2e532e743c737d2b2999c123ece1603f
+_md5_=eea4723781dcd4513a6de7829827be60
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index 64c70f216c44..4ba3bd69dda8 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c0e181bcbd89e559663a658262490169
+_md5_=ff63952df197386c2b9791e74a47160a
diff --git a/metadata/md5-cache/dev-util/vint-0.3.21 b/metadata/md5-cache/dev-util/vint-0.3.21
index 8fb084281fb4..4fccc9c4ae84 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.21
+++ b/metadata/md5-cache/dev-util/vint-0.3.21
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/ansicolor-0.2.4[python_targets_python3_8(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_8(-)?] >=dev-python/pyyaml-3.11[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( >=dev-python/ansicolor-0.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.11[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=Lint tool for Vim script language
 EAPI=7
 HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python3_8(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_8(-)?] >=dev-python/pyyaml-3.11[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/chardet-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/Kuniwak/vint/archive/v0.3.21.tar.gz -> vint-0.3.21.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=153e7dc18420a6b7bb5763b7598a46ee
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f83b25a31cebbec09d6c5cb4cf0c5bed
diff --git a/metadata/md5-cache/dev-util/watchman-4.9.0 b/metadata/md5-cache/dev-util/watchman-4.9.0
index 0c0f77689046..ac8670e34b26 100644
--- a/metadata/md5-cache/dev-util/watchman-4.9.0
+++ b/metadata/md5-cache/dev-util/watchman-4.9.0
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) python? ( python_targets_python3_8? ( dev-lan
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/facebook/watchman/archive/8e0ba724d85de2c89f48161807e878667b9ed089.tar.gz -> watchman-4.9.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=787d20dfd426de569c396bf88bda3674
diff --git a/metadata/md5-cache/dev-util/woke-0.14.0 b/metadata/md5-cache/dev-util/woke-0.14.0
index 8cc3e1802343..33222402d28b 100644
--- a/metadata/md5-cache/dev-util/woke-0.14.0
+++ b/metadata/md5-cache/dev-util/woke-0.14.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=check source code for non-inclusive language
 EAPI=8
 HOMEPAGE=https://getwoke.tech/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/get-woke/woke/archive/v0.14.0.tar.gz -> woke-0.14.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.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/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.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/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.4.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/caitlinelfring/go-env-default/@v/v1.0.0.zip -> github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/caitlinelfring/go-env-default/@v/v1.0.0.mod -> github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.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/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/get-woke/fastwalk/@v/v1.0.0.zip -> github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/get-woke/fastwalk/@v/v1.0.0.mod -> github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/get-woke/go-gitignore/@v/v1.1.2.zip -> github.com%2Fget-woke%2Fgo-gitignore%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/get-woke/go-gitignore/@v/v1.1.2.mod -> github.com%2Fget-woke%2Fgo-gitignore%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-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/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-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/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/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/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.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.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/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/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/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_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/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.23.0.zip -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.zip mirror://goproxy//github.com/rs/zerolog/@v/v1.23.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.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.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-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.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/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.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.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.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
 _eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
-_md5_=ad7fb04d68d364f4eb6bd2bcf492d125
+_md5_=36dc9ceb877d2b3a06c300967c1df384
diff --git a/metadata/md5-cache/dev-util/woke-0.15.0 b/metadata/md5-cache/dev-util/woke-0.15.0
new file mode 100644
index 000000000000..a9e5c093a3b1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/woke-0.15.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=check source code for non-inclusive language
+EAPI=8
+HOMEPAGE=https://getwoke.tech/
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/get-woke/woke/archive/v0.15.0.tar.gz -> woke-0.15.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.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/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.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/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.4.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/caitlinelfring/go-env-default/@v/v1.0.0.zip -> github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/caitlinelfring/go-env-default/@v/v1.0.0.mod -> github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.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/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/get-woke/fastwalk/@v/v1.0.0.zip -> github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/get-woke/fastwalk/@v/v1.0.0.mod -> github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/get-woke/go-gitignore/@v/v1.1.2.zip -> github.com%2Fget-woke%2Fgo-gitignore%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/get-woke/go-gitignore/@v/v1.1.2.mod -> github.com%2Fget-woke%2Fgo-gitignore%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-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/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-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/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/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/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.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.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/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/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/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_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/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.23.0.zip -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.zip mirror://goproxy//github.com/rs/zerolog/@v/v1.23.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.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.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-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.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/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.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.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.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=ad7fb04d68d364f4eb6bd2bcf492d125
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.18 b/metadata/md5-cache/dev-util/wstool-0.1.18
index e3990736e3e3..3545b3648903 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.18
+++ b/metadata/md5-cache/dev-util/wstool-0.1.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.18.tar.gz https://github.com/vcstools/wstool/archive/0.1.18.tar.gz -> wstool-0.1.18.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f676168058658b8a119ed810ff96167c
diff --git a/metadata/md5-cache/dev-util/wstool-9999 b/metadata/md5-cache/dev-util/wstool-9999
index f169199fa3bc..5e63b7f8aaf8 100644
--- a/metadata/md5-cache/dev-util/wstool-9999
+++ b/metadata/md5-cache/dev-util/wstool-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?] >=dev-python/vcstools-0.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f676168058658b8a119ed810ff96167c
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1 b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
index af1679f8c38d..4a84dd6eb7b6 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=557f3fc9c7bdc2cec87c6f2930ba5331
+_md5_=6b4f501fdd777f628e3990e4e92b1b10
diff --git a/metadata/md5-cache/dev-util/ydiff-1.2 b/metadata/md5-cache/dev-util/ydiff-1.2
index 7321ae23abe3..729aafe6ca05 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.2
+++ b/metadata/md5-cache/dev-util/ydiff-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/y/ydiff/ydiff-1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d48067fc5923d4883c76a6c0b1e005f9
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index eb3da9094a0c..e120109206df 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/breezy-3.2.1-r1 b/metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
index 0acbc007a83d..fd6e92aecb57 100644
--- a/metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
+++ b/metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/brz/3.2/3.2.1/+download/breezy-3.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3888e97d0a5a88ff2c21f783c96d62f6
diff --git a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1 b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
index 7ab59acd5c4f..ccba3f1c3c9b 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c21eca7c44988793eb067ee320c757c0
+_md5_=5aa1119a02864d4f9d6be4b353e0c826
diff --git a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2 b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
index c4bfd12b1b32..716e80ee5201 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
+++ b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib app-text/asciidoc
 DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=3
 SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87b051d70f6065e2795a5b3e10d5b079
+_md5_=a98ab864d497f634e8a240d35b11dbb4
diff --git a/metadata/md5-cache/dev-vcs/git-2.33.0-r1 b/metadata/md5-cache/dev-vcs/git-2.33.0-r1
index d02594cdee83..54b33252d325 100644
--- a/metadata/md5-cache/dev-vcs/git-2.33.0-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.33.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.33.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.33.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.33.0.tar.xz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=babd65ce186e7af9365b95effeb67d80
+_md5_=8350ea67ae7aca52541a96c18b137c8e
diff --git a/metadata/md5-cache/dev-vcs/git-big-picture-1.0.0 b/metadata/md5-cache/dev-vcs/git-big-picture-1.0.0
index 3fb51a8fc6c9..263a19869fe1 100644
--- a/metadata/md5-cache/dev-vcs/git-big-picture-1.0.0
+++ b/metadata/md5-cache/dev-vcs/git-big-picture-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-big-picture/git-big-picture-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20d1e12e5e7dae241c7a69b0aad4204e
diff --git a/metadata/md5-cache/dev-vcs/git-big-picture-1.1.1 b/metadata/md5-cache/dev-vcs/git-big-picture-1.1.1
index 8eaddf0925f8..233b05756c91 100644
--- a/metadata/md5-cache/dev-vcs/git-big-picture-1.1.1
+++ b/metadata/md5-cache/dev-vcs/git-big-picture-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-big-picture/git-big-picture-1.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7af5243e543f86678e8457ad154bb5f6
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.10.1 b/metadata/md5-cache/dev-vcs/git-cola-3.10.1
index c64affff6253..0120ac6f9e43 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.10.1
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.10.1
@@ -11,5 +11,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/git-cola/git-cola/archive/v3.10.1.tar.gz -> git-cola-3.10.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a595248f9f0f580d8ab2e298428b2116
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.8 b/metadata/md5-cache/dev-vcs/git-cola-3.8
index 57c3cdc6b9d7..710ffc953205 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.8
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.8
@@ -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/git-cola/git-cola/archive/v3.8.tar.gz -> git-cola-3.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=985c1fe5247aa0f85c1d83e0c9042dca
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.9 b/metadata/md5-cache/dev-vcs/git-cola-3.9
index e462b00fca56..eae61bd48346 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.9
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.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/git-cola/git-cola/archive/v3.9.tar.gz -> git-cola-3.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4e3331c83f5cf2d3f77c5156f108380b
diff --git a/metadata/md5-cache/dev-vcs/git-pw-2.0.0 b/metadata/md5-cache/dev-vcs/git-pw-2.0.0
deleted file mode 100644
index 372b162baccb..000000000000
--- a/metadata/md5-cache/dev-vcs/git-pw-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/mock-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-cov-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tabulate-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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool for integrating Git with Patchwork
-EAPI=7
-HOMEPAGE=https://github.com/getpatchwork/git-pw
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tabulate-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getpatchwork/git-pw/archive/2.0.0.tar.gz -> git-pw-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=36ebc998bf511afbcec76f9d0b9e4381
diff --git a/metadata/md5-cache/dev-vcs/git-pw-2.1.1 b/metadata/md5-cache/dev-vcs/git-pw-2.1.1
new file mode 100644
index 000000000000..fded6554f353
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-pw-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/mock-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-cov-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tabulate-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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool for integrating Git with Patchwork
+EAPI=7
+HOMEPAGE=https://github.com/getpatchwork/git-pw
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tabulate-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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getpatchwork/git-pw/archive/2.1.1.tar.gz -> git-pw-2.1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ea1a9b290f98cba9027b915e0a6791
diff --git a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3 b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
index 2c090e3b43e9..4fc7382957c6 100644
--- a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
+++ b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
@@ -1,15 +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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pygit2-0.20.0
 DESCRIPTION=A script that commits files from a directory to Github Pages
 EAPI=7
 HOMEPAGE=https://pypi.org/project/github-pages-publish/ https://github.com/rafaelmartins/github-pages-publish
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pygit2-0.20.0 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=>=dev-python/pygit2-0.20.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/g/github-pages-publish/github-pages-publish-0.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b87969cecc2b662260dd535005da01e
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1a073f799c33e53f95a3ae8d452e7223
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.3.3 b/metadata/md5-cache/dev-vcs/hg-evolve-10.3.3
index 6a56f18d12a6..562d20cc1a0a 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.3.3
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60f18f288003c0868556c60b1a536e41
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.10.2 b/metadata/md5-cache/dev-vcs/hg-git-0.10.2
index 6a02ac0fc05b..4df5a5aa1355 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.10.2
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.10.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.10.2/hg-git-0.10.2.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=375444cda96ef48de1cb1c25c68ed119
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.9.0 b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
index a10d01a12c06..7f72bcaa7026 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.9.0
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.9.0/hg-git-0.9.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b3a2d2e3587db74de4fed31df21a1ed
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
index 67566e74087c..ff56cc76a5e8 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?] >=dev-python/dulwi
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.9.0a1/hg-git-0.9.0a1.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79ecde01b75c4865e12bf8e5b4a23054
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8 b/metadata/md5-cache/dev-vcs/mercurial-5.8
index 6d44db1099b3..c39a5c6df3e9 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.8.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes-cast/0.1.0/download -> bytes-cast-0.1.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.5.2/download -> cpython-0.5.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.5.2/download -> python27-sys-0.5.2.crate https://crates.io/api/v1/crates/python3-sys/0.5.2/download -> python3-sys-0.5.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be40bb3a5f82dda07d40176775bb9303
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.8.1 b/metadata/md5-cache/dev-vcs/mercurial-5.8.1
index a59caca0c3a7..7e19c3a78d0d 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.8.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.8.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://www.mercurial-scm.org/release/mercurial-5.8.1.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes-cast/0.1.0/download -> bytes-cast-0.1.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.5.2/download -> cpython-0.5.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.5.2/download -> python27-sys-0.5.2.crate https://crates.io/api/v1/crates/python3-sys/0.5.2/download -> python3-sys-0.5.2.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=105a9d3f499857687e4e0f094d739b15
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.9.1 b/metadata/md5-cache/dev-vcs/mercurial-5.9.1
index d9b0d06b6e7d..9b559cc30d31 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.9.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.9.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://www.mercurial-scm.org/release/mercurial-5.9.1.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes-cast/0.2.0/download -> bytes-cast-0.2.0.crate https://crates.io/api/v1/crates/bytes-cast-derive/0.1.0/download -> bytes-cast-derive-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpufeatures/0.1.4/download -> cpufeatures-0.1.4.crate https://crates.io/api/v1/crates/cpython/0.6.0/download -> cpython-0.6.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-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/derive_more/0.99.11/download -> derive_more-0.99.11.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.2.2/download -> format-bytes-0.2.2.crate https://crates.io/api/v1/crates/format-bytes-macros/0.3.0/download -> format-bytes-macros-0.3.0.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.6.0/download -> python27-sys-0.6.0.crate https://crates.io/api/v1/crates/python3-sys/0.6.0/download -> python3-sys-0.6.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.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_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/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/sha-1/0.9.6/download -> sha-1-0.9.6.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	39fb83ed394c172aad380c33a8de287e	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	252d4f554e611b0af601160a9c7be049	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63a615c2ffe24a870a5a6087ae68cd9d
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 31d5b6395536..9f7b604f7eca 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	caa671a93f3b46fa4eff65babfbac141	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	caa671a93f3b46fa4eff65babfbac141	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cecc1c0a2bdceb1899f51cfc7b3fba09
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-2.13.0 b/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
index 628edd452803..0a40beb267f2 100644
--- a/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
+++ b/metadata/md5-cache/dev-vcs/pre-commit-2.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v2.13.0.tar.gz -> pre-commit-2.13.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83f79f392c54680a3dea414259c221a7
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-2.15.0 b/metadata/md5-cache/dev-vcs/pre-commit-2.15.0
index 26da21689e06..cd2a2d2e04c3 100644
--- a/metadata/md5-cache/dev-vcs/pre-commit-2.15.0
+++ b/metadata/md5-cache/dev-vcs/pre-commit-2.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v2.15.0.tar.gz -> pre-commit-2.15.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7412034c182545a82882b4daf22748be
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0 b/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
index fae85aca2b09..dd74b713c8b8 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5b5e6ccbb4ba7ef67b9f3d0399d504a
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0 b/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
index 3827dc5bda28..c1571282cb4d 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.6.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/python-gitlab/python-gitlab-2.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=baab4762c30bba5005379826a6548e18
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.1 b/metadata/md5-cache/dev-vcs/stgit-1.1
index 97db66f3d649..159d294ee4bc 100644
--- a/metadata/md5-cache/dev-vcs/stgit-1.1
+++ b/metadata/md5-cache/dev-vcs/stgit-1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( dev-lang/python:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v1.1.tar.gz -> stgit-1.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9e819d66356bbe52ec28f7deeb28355
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.5.0 b/metadata/md5-cache/dev-vcs/svneverever-1.5.0
index 0327b0deeefd..6e297126e14d 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.5.0
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[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/svneverever/svneverever-1.5.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea4f892fe241b060f86ac5bce39ec24e
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.6.0 b/metadata/md5-cache/dev-vcs/svneverever-1.6.0
index c74f42d1f9af..6a8bda17954e 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.6.0
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[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/svneverever/svneverever-1.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a05e3683bb28b0f1b8ee85478a12f491
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.7.1 b/metadata/md5-cache/dev-vcs/svneverever-1.7.1
index 752a61ba0e46..0fcf282003c0 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.7.1
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[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/svneverever/svneverever-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a05e3683bb28b0f1b8ee85478a12f491
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.8 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8
index 176d7a9f891c..dd67d485c20a 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a78260661ad34f856db35efefd91b481
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
index 2129269e5be7..67ea89f5b615 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad093dac5b54e42c359f2956ecb81e84
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.9 b/metadata/md5-cache/dev-vcs/tortoisehg-5.9
index 012eecd98523..b81aae60614f 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.9
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.9
@@ -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.9/thg-5.9.tar.gz -> tortoisehg-5.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=83a44d510b2b4a83f816cfa62a692e7d
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.9.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.9.1
index d8a30682316d..fa50b7ec2e65 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.9.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.9.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.9.1/thg-5.9.1.tar.gz -> tortoisehg-5.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1133937f98c824358e258e6f815d37c7
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 38230fbceb0c..eb359fab5521 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.8[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	caa671a93f3b46fa4eff65babfbac141	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	caa671a93f3b46fa4eff65babfbac141	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=83a44d510b2b4a83f816cfa62a692e7d
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index c9caa545a256..008e9a8abae5 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/gnome-robots-40.0 b/metadata/md5-cache/games-arcade/gnome-robots-40.0
index b4fea9f56f71..3e94eb347dbf 100644
--- a/metadata/md5-cache/games-arcade/gnome-robots-40.0
+++ b/metadata/md5-cache/games-arcade/gnome-robots-40.0
@@ -1,4 +1,4 @@
-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 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+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 ) gnome-base/librsvg:2[vala] dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/libgee-0.8:= >=dev-libs/glib-2.32:2 >=dev-libs/libgnome-games-support-1.7.1:1= >=media-libs/gsound-1.0.2 >=x11-libs/gtk+-3.24:3 >=gnome-base/librsvg-2.36.2:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Avoid the robots and make them crash into each other
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libgee-0.8:= >=dev-libs/glib-2.32:2 >=dev-libs/libgnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-robots/40/gnome-robots-40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=abc53cd72e46a361a7fcf747c5116e59
+_md5_=488a14b83084682836d26bed1cfa8cc3
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index e0746d191840..47dd2b55d269 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/pychess-1.0.2 b/metadata/md5-cache/games-board/pychess-1.0.2
index a3d029fc7d23..3d01d47b6607 100644
--- a/metadata/md5-cache/games-board/pychess-1.0.2
+++ b/metadata/md5-cache/games-board/pychess-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pexpect[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pychess/pychess/releases/download/1.0.2/pychess-1.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0114c12450172526dc4c495a55f563fa
diff --git a/metadata/md5-cache/games-board/pychess-1.0.3 b/metadata/md5-cache/games-board/pychess-1.0.3
index 67cc4ccf28d3..34671dae1061 100644
--- a/metadata/md5-cache/games-board/pychess-1.0.3
+++ b/metadata/md5-cache/games-board/pychess-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pexpect[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pychess/pychess/releases/download/1.0.3/pychess-1.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=798b62e834a3c8a468eebd86d5d2a098
diff --git a/metadata/md5-cache/games-board/pysolfc-2.14.0-r1 b/metadata/md5-cache/games-board/pysolfc-2.14.0-r1
index a9da3873b2e5..d308cc4320b6 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.14.0-r1
+++ b/metadata/md5-cache/games-board/pysolfc-2.14.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pysolfc/PySolFC-2.14.0.tar.xz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.1PRE.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets--Minimal-2.0.2.tar.xz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=77fb4c5d383ad0d21d0c7870f2bc061c
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index e0fd098ba99c..3fc8cc1a02b9 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r1 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r1
index d9d48ce64242..dfeb59475ac7 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r1
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Gamecube and Wii game emulator
 EAPI=7
 HOMEPAGE=https://dolphin-emu.org/
 IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg +gui log profile pulseaudio systemd upnp vulkan
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-2+ MIT ZLIB ZLIB MIT ISC BSD-2 BSD GPL-2+ BSD LGPL-2.1+ LGPL-2.1+ BSD-2 MIT Apache-2.0
 RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68.tar.gz -> dolphin-5.0_p20210506.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a93a3372e35eca1fb98e9e10a3b3d7cf
+_md5_=6111b95fbdc8b6b6f63ba80ed6b05a5f
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.5 b/metadata/md5-cache/games-emulation/m64py-0.2.5
index f98edcf037bd..54ae2c5af810 100644
--- a/metadata/md5-cache/games-emulation/m64py-0.2.5
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_8(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/m64py/m64py-0.2.5/m64py-0.2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2587d552a08416f0303f666d1c225731
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index f8c1805dcbfd..9ea0adebe633 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/frotz-2.53-r1 b/metadata/md5-cache/games-engines/frotz-2.53-r1
index 9a2329a6e2c7..97a2e751209d 100644
--- a/metadata/md5-cache/games-engines/frotz-2.53-r1
+++ b/metadata/md5-cache/games-engines/frotz-2.53-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Interpreter for Z-code based text games
 EAPI=7
 HOMEPAGE=https://661.org/proj/if/frotz/
 IUSE=ncurses sdl sound unicode
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:=[unicode(+)?] sound? ( media-libs/libao media-libs/libmodplug media-libs/libsamplerate media-libs/libsndfile[-minimal] media-libs/libvorbis ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= )
 REQUIRED_USE=sound? ( || ( ncurses sdl ) )
 SLOT=0
 SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.53/frotz-2.53.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c97df898b8584dd1093dddd6e5f71ef3
+_md5_=5dee1c0e8bea3a284dd4932d1fea9e38
diff --git a/metadata/md5-cache/games-engines/qtads-3.1.0 b/metadata/md5-cache/games-engines/qtads-3.1.0
deleted file mode 100644
index f6c4130e0161..000000000000
--- a/metadata/md5-cache/games-engines/qtads-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
-DESCRIPTION=Multimedia interpreter for TADS text adventures
-EAPI=8
-HOMEPAGE=https://realnc.github.io/qtads
-IUSE=+sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
-SLOT=0
-SRC_URI=https://github.com/realnc/qtads/releases/download/v3.1.0/qtads-3.1.0-source.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=827697d487ae5937bd368c4345c6c341
diff --git a/metadata/md5-cache/games-engines/qtads-3.2.0-r1 b/metadata/md5-cache/games-engines/qtads-3.2.0-r1
new file mode 100644
index 000000000000..99d7413f8ee1
--- /dev/null
+++ b/metadata/md5-cache/games-engines/qtads-3.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png] dev-qt/qtimageformats[mng] dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
+DESCRIPTION=Multimedia interpreter for TADS text adventures
+EAPI=8
+HOMEPAGE=https://realnc.github.io/qtads
+IUSE=+sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png] dev-qt/qtimageformats[mng] dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
+SLOT=0
+SRC_URI=https://github.com/realnc/qtads/releases/download/v3.2.0/qtads-3.2.0-source.tar.xz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89f8732df80c0e7f2c8a4fe67ebdc2de
diff --git a/metadata/md5-cache/games-engines/scummvm-2.2.0-r2 b/metadata/md5-cache/games-engines/scummvm-2.2.0-r2
index 26336818adfd..851bb520c07e 100644
--- a/metadata/md5-cache/games-engines/scummvm-2.2.0-r2
+++ b/metadata/md5-cache/games-engines/scummvm-2.2.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventur
 EAPI=8
 HOMEPAGE=https://www.scummvm.org/
 IUSE=a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
 RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://scummvm.org/frs/scummvm/2.2.0/scummvm-2.2.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df414e66d7747eb5789c08e84e1d6bcf
+_md5_=55e26be966598fa751e77d7561e721fb
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 6cf5a86e3a30..d19f23dec343 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/doge-3.6.0 b/metadata/md5-cache/games-misc/doge-3.6.0
index da9de06a07c8..22ff9890852a 100644
--- a/metadata/md5-cache/games-misc/doge-3.6.0
+++ b/metadata/md5-cache/games-misc/doge-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-process/procps python_targets_python3_8? ( dev-lang/python:3.8 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/thiderman/doge/archive/3.6.0.tar.gz -> doge-3.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a20383583bc1ccc9acc8b017c700c147
diff --git a/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3 b/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
index 7f7ad233364e..320623d0b809 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
+++ b/metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=The notorious fortune program
 EAPI=7
 HOMEPAGE=http://www.redellipse.net/code/fortune
 IUSE=offensive elibc_glibc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=app-text/recode:0=
 SLOT=0
 SRC_URI=http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c21ae1472d4930a8c1754b6058776809
+_md5_=2f96ea6f981fd1ce0a667ee94a3fe1f3
diff --git a/metadata/md5-cache/games-misc/fortune-mod-all-4 b/metadata/md5-cache/games-misc/fortune-mod-all-4
index 79f5b6cf6d34..94469efa1a3f 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-all-4
+++ b/metadata/md5-cache/games-misc/fortune-mod-all-4
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package for all fortune-mod packages
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=l10n_cs l10n_de l10n_it
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=metapackage
 RDEPEND=games-misc/fortune-mod l10n_cs? ( games-misc/fortune-mod-cs ) l10n_de? ( games-misc/fortune-mod-at-linux games-misc/fortune-mod-norbert-tretkowski games-misc/fortune-mod-thomas-ogrisegg games-misc/fortune-mod-fvl games-misc/fortune-mod-rss ) l10n_it? ( games-misc/fortune-mod-it ) games-misc/fortune-mod-bofh-excuses games-misc/fortune-mod-chucknorris games-misc/fortune-mod-kernelcookies games-misc/fortune-mod-osfortune games-misc/fortune-mod-tao games-misc/fortune-mod-zx-error
 SLOT=0
-_md5_=3d3c021818b956e0f6319fe48ce8c241
+_md5_=d05d2eb9f23c2c7b50d31db5024b92cd
diff --git a/metadata/md5-cache/games-misc/fortune-mod-at-linux-20030120 b/metadata/md5-cache/games-misc/fortune-mod-at-linux-20030120
index 430ce42fb61b..af7feaca5253 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-at-linux-20030120
+++ b/metadata/md5-cache/games-misc/fortune-mod-at-linux-20030120
@@ -5,9 +5,9 @@ DESCRIPTION=Quotes from at.linux
 EAPI=7
 HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
 IUSE=unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-at.linux-20030120.tar.gz
-_md5_=e987607a0935292b9a15dfcab7f9f6fd
+_md5_=ac791b7ef3910173d6439daefb161364
diff --git a/metadata/md5-cache/games-misc/fortune-mod-bofh-excuses-1.2-r1 b/metadata/md5-cache/games-misc/fortune-mod-bofh-excuses-1.2-r1
index 9a7777623d73..6cca885a33ff 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-bofh-excuses-1.2-r1
+++ b/metadata/md5-cache/games-misc/fortune-mod-bofh-excuses-1.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Excuses from Bastard Operator from Hell
 EAPI=7
 HOMEPAGE=http://pages.cs.wisc.edu/~ballard/bofh/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://gentoo/fortune-bofh-excuses-1.2.tar.gz
-_md5_=65a67b6a13139fdba1f086a1a33cc689
+_md5_=a0e4f3c511986306fff797724661e862
diff --git a/metadata/md5-cache/games-misc/fortune-mod-chucknorris-0.1 b/metadata/md5-cache/games-misc/fortune-mod-chucknorris-0.1
index 3f8d2d63d220..f3515166f12d 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-chucknorris-0.1
+++ b/metadata/md5-cache/games-misc/fortune-mod-chucknorris-0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Chuck Norris Facts
 EAPI=7
 HOMEPAGE=https://www.k-lug.org/~kessler/projects.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=https://www.k-lug.org/~kessler/chucknorris.tar.gz
-_md5_=cf728bbd99ab4ab9fddf964c44028f2a
+_md5_=f68850bbe7573f1605373508d8c1cea0
diff --git a/metadata/md5-cache/games-misc/fortune-mod-cs-1.6.9 b/metadata/md5-cache/games-misc/fortune-mod-cs-1.6.9
index 8daa7d357160..b0c6f6ddc960 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-cs-1.6.9
+++ b/metadata/md5-cache/games-misc/fortune-mod-cs-1.6.9
@@ -5,9 +5,9 @@ DESCRIPTION=Database of the Czech and Slovak cookies for the fortune(6) program
 EAPI=7
 HOMEPAGE=http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/
 IUSE=unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/fortune-cs-1.6.9.tar.bz2
-_md5_=ecb48cb2f6734be96d1c775a72bcc7e1
+_md5_=59072c98c2b6bdd70efeb4e0a126745f
diff --git a/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10-r1 b/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10-r1
index b23c44bd05a9..6e58dcff9edd 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10-r1
+++ b/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Quotes from Prolinux articles and comments
 EAPI=7
 HOMEPAGE=https://github.com/Nanolx/fortunes-flashrider
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=https://github.com/Nanolx/fortunes-flashrider/archive/1.10.tar.gz -> fortunes-flashrider-1.10.tar.gz
-_md5_=f7d91335975b53398589856903036f72
+_md5_=e222cb0fb265bb2d1fd3ade03babc666
diff --git a/metadata/md5-cache/games-misc/fortune-mod-fvl-20030120 b/metadata/md5-cache/games-misc/fortune-mod-fvl-20030120
index e4abd9d47117..951f04d7b7fc 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-fvl-20030120
+++ b/metadata/md5-cache/games-misc/fortune-mod-fvl-20030120
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Quotes from Felix von Leitner (fefe)
 EAPI=7
 HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-fvl-20030120.tar.gz
-_md5_=415b7e2c48c7eaba46c800b4d5b8ac3f
+_md5_=c7041a9005e98ad277e0fd10876fb620
diff --git a/metadata/md5-cache/games-misc/fortune-mod-it-1.99 b/metadata/md5-cache/games-misc/fortune-mod-it-1.99
index a02528a7e61e..7b6111439022 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-it-1.99
+++ b/metadata/md5-cache/games-misc/fortune-mod-it-1.99
@@ -4,8 +4,8 @@ DESCRIPTION=Database of the Italian cookies for the fortune program
 EAPI=7
 HOMEPAGE=http://www.fortune-it.net/
 IUSE=offensive
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.fortune-it.net/download/fortune-it-1.99.tar.gz
-_md5_=48f2da11cc0f9cdfad4061951dfd3b6f
+_md5_=a2e5e8af9e23d8cdcd7ad06e373d87b4
diff --git a/metadata/md5-cache/games-misc/fortune-mod-kernelcookies-9 b/metadata/md5-cache/games-misc/fortune-mod-kernelcookies-9
index 06094cf30c90..8333f7426ad4 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-kernelcookies-9
+++ b/metadata/md5-cache/games-misc/fortune-mod-kernelcookies-9
@@ -4,9 +4,9 @@ DESCRIPTION=A collection of funny lines from the Linux kernel
 EAPI=7
 HOMEPAGE=http://www.schwarzvogel.de/software-misc.shtml
 IUSE=offensive
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://www.schwarzvogel.de/pkgs/kernelcookies-9.tar.gz
-_md5_=353c5d7d178eb03020b5b3eb11c8caf6
+_md5_=1d9bc723c3bedce6aa6ef27f8ba1e427
diff --git a/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0 b/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
index da372596687c..57e280dcf786 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-mormon-1.1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Fortune modules from the LDS scriptures (KJV Bible, Book of Mormon, D&C, PGP)
 EAPI=7
 HOMEPAGE=https://scriptures.nephi.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod games-misc/fortune-mod-scriptures
 SLOT=0
 SRC_URI=mirror://sourceforge/mormon/fortune-mod-mormon-1.1.0.tar.bz2
-_md5_=23025f46dc565242265954310b012c43
+_md5_=3cfe1ee7f7ebc0e0f29aa6890a0b036b
diff --git a/metadata/md5-cache/games-misc/fortune-mod-norbert-tretkowski-20030120 b/metadata/md5-cache/games-misc/fortune-mod-norbert-tretkowski-20030120
index 72bc60d5d182..7c1875c06eeb 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-norbert-tretkowski-20030120
+++ b/metadata/md5-cache/games-misc/fortune-mod-norbert-tretkowski-20030120
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Quotes from Norbert Tretkowski
 EAPI=7
 HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-norbert.tretkowski-20030120.tar.gz
-_md5_=cb4b6f0c3c4d042b5b4ef8600120f8af
+_md5_=b621e95ef48a1f8b445b9e7f1ba60cc3
diff --git a/metadata/md5-cache/games-misc/fortune-mod-osfortune-1 b/metadata/md5-cache/games-misc/fortune-mod-osfortune-1
index c3cb1feedc05..5507e7ec35f4 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-osfortune-1
+++ b/metadata/md5-cache/games-misc/fortune-mod-osfortune-1
@@ -3,9 +3,9 @@ DEPEND=games-misc/fortune-mod
 DESCRIPTION=Open sources fortune file
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20030803031143/http://www.dibona.com/opensources/index.shtml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-1
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=https://web.archive.org/web/20030919200547/http://www.dibona.com/opensources/osfortune.tar.gz
-_md5_=bb4b79c6ca654fdadbeff1e7678f6caf
+_md5_=b747fd74371a614c2ca002dad618240a
diff --git a/metadata/md5-cache/games-misc/fortune-mod-rss-20030120 b/metadata/md5-cache/games-misc/fortune-mod-rss-20030120
index 4f74a99d98c4..fced16123fa3 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-rss-20030120
+++ b/metadata/md5-cache/games-misc/fortune-mod-rss-20030120
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Fortune database of Robin S. Socha quotes
 EAPI=7
 HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-rss-20030120.tar.gz
-_md5_=7a2fd41cac08481b25e28eff7f237296
+_md5_=e1856c186b22ba042e91ec711eac2bbf
diff --git a/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0 b/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
index 40a62814c8c8..52c0744fc15d 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Fortune modules from the King James Bible scriptures
 EAPI=7
 HOMEPAGE=https://scriptures.nephi.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/mormon/fortune-mod-scriptures-1.1.0.tar.bz2
-_md5_=25ac7655f07978adbc8a517099e15ab1
+_md5_=e848dc97380b867a4e21440203e73f42
diff --git a/metadata/md5-cache/games-misc/fortune-mod-tao-1 b/metadata/md5-cache/games-misc/fortune-mod-tao-1
index df3e2b351192..34d8f44aad21 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-tao-1
+++ b/metadata/md5-cache/games-misc/fortune-mod-tao-1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=set of fortunes based on the Tao-Teh-Ching
 EAPI=7
 HOMEPAGE=http://fortunes.quotationsbook.com/fortunes/collection/67/TAO
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-1
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://gentoo/fortune-tao.tar.gz
-_md5_=6bedace975790f4640a5b64a4bcaeee4
+_md5_=1da509ebabb331d2cf7bc21a69910c22
diff --git a/metadata/md5-cache/games-misc/fortune-mod-taow-1.0 b/metadata/md5-cache/games-misc/fortune-mod-taow-1.0
index 4865418ab5b5..09edffa78f43 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-taow-1.0
+++ b/metadata/md5-cache/games-misc/fortune-mod-taow-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=The Art of War Fortune Mod
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20110823115300/http://www.de-brauwer.be/wiki/wikka.php?wakka=TheArtOfWar
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://gentoo/fortunes-taow-1.0.tar.gz
-_md5_=3f923a7757ea75a81c52bfbc0b57f735
+_md5_=ed287d334facd2372555297729696aac
diff --git a/metadata/md5-cache/games-misc/fortune-mod-thomas-ogrisegg-20030120 b/metadata/md5-cache/games-misc/fortune-mod-thomas-ogrisegg-20030120
index e2b74b777522..60026f7912c7 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-thomas-ogrisegg-20030120
+++ b/metadata/md5-cache/games-misc/fortune-mod-thomas-ogrisegg-20030120
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Quotes from Thomas Ogrisegg
 EAPI=7
 HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-thomas.ogrisegg-20030120.tar.gz
-_md5_=ff3d21b384f72bfd4802c416df20fc32
+_md5_=70d35f89b610840b00123c87e05136ee
diff --git a/metadata/md5-cache/games-misc/fortune-mod-zx-error-1.0-r1 b/metadata/md5-cache/games-misc/fortune-mod-zx-error-1.0-r1
index b3e0afe5abae..4d1b7ee43ba4 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-zx-error-1.0-r1
+++ b/metadata/md5-cache/games-misc/fortune-mod-zx-error-1.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Sinclair ZX Spectrum BASIC error Fortunes
 EAPI=7
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/fortunes-zx-error.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/fortunes-zx-error/fortunes-zx-error-1.0.tar.gz
-_md5_=d160caa9ce6aa7ce4f97f5a375ef165f
+_md5_=4897fa228fed73453eb36f4359270c37
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1
index 5dfef4642b5d..bc312c8ae611 100644
--- a/metadata/md5-cache/games-misc/usolitaire-0.2.1
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.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/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d350735524b416db371b56ce9e7d640c
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 03886d711b0e..2e5ba18bb3a4 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/fbg-0.9-r2 b/metadata/md5-cache/games-puzzle/fbg-0.9-r2
deleted file mode 100644
index 2b557140fdb9..000000000000
--- a/metadata/md5-cache/games-puzzle/fbg-0.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
-DESCRIPTION=A Tetris clone written in OpenGL
-EAPI=6
-HOMEPAGE=http://fbg.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=6496846e678673ab39646f9b6685c86c
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r3 b/metadata/md5-cache/games-puzzle/fbg-0.9-r3
new file mode 100644
index 000000000000..a450e88890b6
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/fbg-0.9-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-games/physfs media-libs/libmikmod media-libs/libsdl[opengl,video] virtual/glu virtual/opengl
+DESCRIPTION=Tetris clone written in OpenGL
+EAPI=8
+HOMEPAGE=http://fbg.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libmikmod media-libs/libsdl[opengl,video] virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=3a6e2e19a6016a91dc247d16381ba3ef
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.32.2 b/metadata/md5-cache/games-puzzle/five-or-more-3.32.2
index 310692fe08ba..9ceab0d9cbe6 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.32.2
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.32.2
@@ -1,4 +1,4 @@
-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 ) dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+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 ) gnome-base/librsvg:2[vala] dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:= >=gnome-base/librsvg-2.32:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Remove colored balls from the board by forming lines
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-l
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.32/five-or-more-3.32.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0ba0126c26e14d4de554d8507c7d6214
+_md5_=ff1451bc89b680a32f35b6afdce63eea
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
deleted file mode 100644
index c7dcee3e75ff..000000000000
--- a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
-DESCRIPTION=Clone of the famous PuyoPuyo game
-EAPI=6
-HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26fe71f928008f30b69e16742940d9ef
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
new file mode 100644
index 000000000000..c560a11dad4b
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( media-libs/libglvnd )
+DESCRIPTION=Clone of the famous PuyoPuyo game
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( media-libs/libglvnd )
+SLOT=0
+SRC_URI=mirror://gentoo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ba2c2c1f7c44e40f9df982ffdbebb8d
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index caee713c25ce..69d1d94b3141 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.27.0-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.0-r1
deleted file mode 100644
index 8310cb481990..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.27.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) 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-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-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	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=489cf515c87cc5618475fab45fe84277
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1
index 987e1e09519c..6b18cdfaa469 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1
@@ -4,10 +4,10 @@ DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in d
 EAPI=8
 HOMEPAGE=https://crawl.develz.org
 IUSE=debug ncurses sound +tiles lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
+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-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.1/stone_soup-0.27.1.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	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a3160c0e16cafa8691d1f0ad231f6c71
+_md5_=6130c1baebc4e7293db77a3a73151956
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210831 b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210831
deleted file mode 100644
index 8f5ce8b11a71..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210831
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) 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.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( 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-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-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.28
-SRC_URI=https://github.com/crawl/crawl/archive/46f4d3c3461b2012140bb15563a19ef027b1fc69.tar.gz -> stone-soup-0.28.0_pre20210831.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.28.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.28.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b9468c2c3dce77a88b28618bf1e5a50
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210930 b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210930
new file mode 100644
index 000000000000..cd9bf3ef73b0
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20210930
@@ -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-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.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( 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-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-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.28
+SRC_URI=https://github.com/crawl/crawl/archive/f77a47075d75ed93d74dc37d5dd92497f3a30001.tar.gz -> stone-soup-0.28.0_pre20210930.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.28.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.28.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eda09136a1de706af5a63a6abe290d62
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 44012139d2c8..67670456be95 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/sumwars-0.5.8-r100 b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
deleted file mode 100644
index be6f63e5740d..000000000000
--- a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )
-DESCRIPTION=a multi-player, 3D action role-playing game
-EAPI=7
-HOMEPAGE=http://sumwars.org
-IUSE=+tools debug l10n_de l10n_en l10n_it l10n_pl l10n_pt l10n_ru l10n_uk +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-SA-3.0
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=247f0976c6e275fbb0d7abebb6c578fb
diff --git a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r101 b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r101
new file mode 100644
index 000000000000..4d10625ebf8c
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r101
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/cegui[ogre,truetype] dev-games/ogre:=[freeimage,opengl] dev-games/ois dev-games/physfs dev-libs/tinyxml media-libs/freealut media-libs/libvorbis media-libs/openal net-libs/enet:1.3= x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost:= )
+DESCRIPTION=Multi-player, 3D action role-playing game
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/sumwars/
+IUSE=debug tools l10n_de l10n_en l10n_it l10n_pl l10n_pt l10n_ru l10n_uk +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-SA-3.0
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/cegui[ogre,truetype] dev-games/ogre:=[freeimage,opengl] dev-games/ois dev-games/physfs dev-libs/tinyxml media-libs/freealut media-libs/libvorbis media-libs/openal net-libs/enet:1.3= x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost:= ) media-libs/freeimage[jpeg,png]
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=69d8761f293455d1d3052fb002b4435f
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index bf0bfa9cf82e..f20945c07b91 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/flightgear-2020.3.11 b/metadata/md5-cache/games-simulation/flightgear-2020.3.11
index 6063bbc9a6d3..15f19f582ce7 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2020.3.11
+++ b/metadata/md5-cache/games-simulation/flightgear-2020.3.11
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.11[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu )
+DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.11[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu )
 DESCRIPTION=Open Source Flight Simulator
 EAPI=7
 HOMEPAGE=https://www.flightgear.org/
 IUSE=cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.11[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2020.3.11
+RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-2020.3.11[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2020.3.11
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2020.3.11.tar.bz2
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f364be2a4c9e3d8432f844ba308a73b
+_md5_=50abb739947e4f42e713defc181c2e15
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 49968f219f71..f2ae8cda4c9e 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu )
+DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu )
 DESCRIPTION=Open Source Flight Simulator
 EAPI=7
 HOMEPAGE=https://www.flightgear.org/
 IUSE=cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
+RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/plib-1.8.5 >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=86919e200a0fbfe9f6dabe36ceb723ba
+_md5_=b388666440e999432db1d7cd0ff05d1f
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.4.1 b/metadata/md5-cache/games-simulation/openrct2-0.3.4.1
deleted file mode 100644
index cd30c18134a7..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=7
-HOMEPAGE=https://openrct2.org/
-IUSE=dedicated +lightfx +opengl scripting test +truetype
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.4.1.tar.gz -> openrct2-0.3.4.1.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.43/replays.zip -> openrct2-replays-0.0.43.zip )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8fed9bcbed27fb67b5ecf55de95c3700
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.4.1-r1 b/metadata/md5-cache/games-simulation/openrct2-0.3.4.1-r1
new file mode 100644
index 000000000000..c92518bde0cd
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.4.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
+EAPI=7
+HOMEPAGE=https://openrct2.org/
+IUSE=dedicated +lightfx +opengl scripting test +truetype
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.4.1.tar.gz -> openrct2-0.3.4.1.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.43/replays.zip -> openrct2-replays-0.0.43.zip )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2ceb59d3ef55035f00010eb3bb05c7f
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index f7ced9cc70b4..153a393c5b3e 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
+DEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
 DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
 EAPI=7
 HOMEPAGE=https://openrct2.org/
 IUSE=dedicated +lightfx +opengl scripting test +truetype
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
+RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.2.1/objects.zip -> openrct2-objects-1.2.1.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.47/replays.zip -> openrct2-replays-0.0.47.zip )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b0b5052b5d8ea32079c224604ce348ac
+_md5_=d6a1b1f6e9c81cbc675b7ad40c3cb87c
diff --git a/metadata/md5-cache/games-simulation/singularity-1.00 b/metadata/md5-cache/games-simulation/singularity-1.00
index 8e0de77fd6d4..d9c713a52496 100644
--- a/metadata/md5-cache/games-simulation/singularity-1.00
+++ b/metadata/md5-cache/games-simulation/singularity-1.00
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/singularity/singularity/releases/download/v1.00/singularity-1.00.tar.gz https://emhsoft.com/singularity/endgame-singularity-music-007.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5570eb83cb08008bd3e6de8fd3d72ae5
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 0c7be00be64c..6af9c7bec769 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/dunelegacy-0.96.4 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
index b7e63419e279..480d26aed545 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
@@ -4,10 +4,10 @@ DEPEND=media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[midi] dev-u
 DESCRIPTION=Updated clone of Westood Studios' Dune II
 EAPI=7
 HOMEPAGE=http://dunelegacy.sourceforge.net
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[midi]
 SLOT=0
 SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.4-src.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=07aa5025ddd3f63ace2f3dede3db8b1e
+_md5_=1e3427e7177b799dab330807b507c98e
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index cb187d6d6870..a7d073972f87 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/atlas-0.6.1_beta_pre20181202 b/metadata/md5-cache/games-util/atlas-0.6.1_beta_pre20181202
index 212ae9205aff..dad847cf4481 100644
--- a/metadata/md5-cache/games-util/atlas-0.6.1_beta_pre20181202
+++ b/metadata/md5-cache/games-util/atlas-0.6.1_beta_pre20181202
@@ -1,13 +1,13 @@
 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=configure postinst prepare
-DEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=dev-games/simgear-3.0.0 media-libs/plib
+DEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= media-libs/plib net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=dev-games/simgear-3.0.0
 DESCRIPTION=Chart Program to use with Flightgear Flight Simulator
 EAPI=7
 HOMEPAGE=http://atlas.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=games-simulation/flightgear-3.0.0
+RDEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= media-libs/plib net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=games-simulation/flightgear-3.0.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~reavertm/atlas-hgcode-d4e5360f8273823205d9dc066547f5077ffc13e2.zip
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f761dd23d4e0dcc8162372aaaea101c
+_md5_=05b11d0fe83b2597045f2c94fff67452
diff --git a/metadata/md5-cache/games-util/lutris-0.5.8.3 b/metadata/md5-cache/games-util/lutris-0.5.8.3
index aab09238e0c7..0e316d798776 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.8.3
+++ b/metadata/md5-cache/games-util/lutris-0.5.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.8.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=653413a805644baf8ca63bb59e88e789
diff --git a/metadata/md5-cache/games-util/lutris-0.5.8.4 b/metadata/md5-cache/games-util/lutris-0.5.8.4
index aba7b5cae8de..600c6222ac56 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.8.4
+++ b/metadata/md5-cache/games-util/lutris-0.5.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.8.4.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a29de8181d5380fe25f025ee6b212b60
diff --git a/metadata/md5-cache/games-util/lutris-0.5.9_beta1 b/metadata/md5-cache/games-util/lutris-0.5.9_beta1
index 9cec81c41f84..5fd677543a6e 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.9_beta1
+++ b/metadata/md5-cache/games-util/lutris-0.5.9_beta1
@@ -11,5 +11,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/lutris/lutris/archive/refs/tags/v0.5.9-beta1.tar.gz -> lutris-0.5.9_beta1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4d9b446a54284311d352b4f346956a0d
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index 62438ec1fac8..fafea05bcb4f 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4d9b446a54284311d352b4f346956a0d
diff --git a/metadata/md5-cache/games-util/nml-0.5.3 b/metadata/md5-cache/games-util/nml-0.5.3
index 0803be300b4f..852c7c57999e 100644
--- a/metadata/md5-cache/games-util/nml-0.5.3
+++ b/metadata/md5-cache/games-util/nml-0.5.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[zlib,python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/OpenTTD/nml/releases/download/0.5.3/nml-0.5.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff313a1414bdc3e179b0a9066fddb654
diff --git a/metadata/md5-cache/games-util/sc-controller-0.4.8.1 b/metadata/md5-cache/games-util/sc-controller-0.4.8.1
index 36e07f873abc..08c46dc7d44c 100644
--- a/metadata/md5-cache/games-util/sc-controller-0.4.8.1
+++ b/metadata/md5-cache/games-util/sc-controller-0.4.8.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pygobject[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Ryochan7/sc-controller/archive/v0.4.8.1.tar.gz -> sc-controller-0.4.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=870c0cdcf74490c0d0fdf5b4daa118d7
diff --git a/metadata/md5-cache/games-util/sc-controller-0.4.8.2 b/metadata/md5-cache/games-util/sc-controller-0.4.8.2
index d048402ba0a5..9763023ce6e5 100644
--- a/metadata/md5-cache/games-util/sc-controller-0.4.8.2
+++ b/metadata/md5-cache/games-util/sc-controller-0.4.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pygobject[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Ryochan7/sc-controller/archive/v0.4.8.2.tar.gz -> sc-controller-0.4.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=19a00d66169d6928d5130941bdcbedf2
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 16c82b034dc0..cf090590c061 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/gnome-keyring-40.0-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-40.0-r1
new file mode 100644
index 000000000000..7dd75c377b7c
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=app-crypt/gnupg-2.0.28:= >=app-eselect/eselect-pinentry-0.5 app-misc/ca-certificates >=dev-libs/glib-2.44:2 >=dev-libs/libgcrypt-1.2.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) ssh-agent? ( net-misc/openssh ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Password and keyring managing daemon
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
+IUSE=pam selinux +ssh-agent test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=app-crypt/gnupg-2.0.28:= >=app-eselect/eselect-pinentry-0.5 app-misc/ca-certificates >=dev-libs/glib-2.44:2 >=dev-libs/libgcrypt-1.2.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) ssh-agent? ( net-misc/openssh )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-keyring/40/gnome-keyring-40.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8923c2484bc360c8eb130adb68c29684
diff --git a/metadata/md5-cache/gnome-base/nautilus-40.2 b/metadata/md5-cache/gnome-base/nautilus-40.2
index 5e63bb4a26e4..1befedcf6eea 100644
--- a/metadata/md5-cache/gnome-base/nautilus-40.2
+++ b/metadata/md5-cache/gnome-base/nautilus-40.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/40/nautilus-40.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e54de5d6bce63be9d452810337f51aec
+_md5_=a19db78c19361f82d61c45c08b94d7d8
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 2c40b06680b9..50176214476c 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-35 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-35
new file mode 100644
index 000000000000..610b224c8662
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-35
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Changes your wallpaper daily to the bing.com background image
+EAPI=7
+HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.28
+SLOT=0
+SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v35.tar.gz -> gnome-shell-extension-bing-wallpaper-35.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8cc83d42f4bc1ca49bb818f6e0949b5a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-23 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-23
new file mode 100644
index 000000000000..43ce0bc98135
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-23
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
+EAPI=7
+HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
+SLOT=0
+SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v23.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-23.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=586902477c4e4a334e8d2ed57eee7cad
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-13.0.8 b/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
index 76437638afb1..b0a9e2c458dc 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
+++ b/metadata/md5-cache/gnome-extra/gucharmap-13.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection gtk-doc vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-13.0* >=dev-libs/glib-2.32:2 media-libs/freetype:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/pango-1.42.4-r2[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/13.0.8/gucharmap-13.0.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7f2edf75dbe907e9a5c03bc4387008f7
+_md5_=c044d723f0905a472d13e4822afbde8d
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.22.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.22.0
deleted file mode 100644
index a1755fdd1e23..000000000000
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager connection editor and applet
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=appindicator modemmanager selinux teamd
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/network-manager-applet/1.22/network-manager-applet-1.22.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2c8ce01f9f73b04cfaa038fe8d051e38
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.22.0-r1 b/metadata/md5-cache/gnome-extra/nm-applet-1.22.0-r1
new file mode 100644
index 000000000000..f7605f60d77c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.22.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager connection editor and applet
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=appindicator modemmanager selinux teamd
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.22/network-manager-applet-1.22.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8a45a2275c1df6720968702b27b6ce38
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index f35d1ba10279..6dfd53a746f2 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.08.1 b/metadata/md5-cache/kde-apps/akonadi-21.08.1
index a876d7ccabe0..9724a1161e8a 100644
--- a/metadata/md5-cache/kde-apps/akonadi-21.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-21.08.1
@@ -5,7 +5,7 @@ DESCRIPTION=Storage service for PIM data and libraries for PIM apps
 EAPI=8
 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 ~riscv ~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.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kitemmodels-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/akonadi-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb2fe5f61a38d6b134baa94d410033fb
+_md5_=7b6a8f6e11ea6e47edc8c369fb98a8fa
diff --git a/metadata/md5-cache/kde-apps/cervisia-21.08.1 b/metadata/md5-cache/kde-apps/cervisia-21.08.1
index 56147119adff..d39dda4fff66 100644
--- a/metadata/md5-cache/kde-apps/cervisia-21.08.1
+++ b/metadata/md5-cache/kde-apps/cervisia-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=CVS frontend by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/cervisia/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~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.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdesu-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kinit-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/cervisia-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=49cce902d95e0f995044ce48f81c84a4
+_md5_=0c3dc01fadb104aa33e42f1b8246c09b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.08.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-21.08.1
index 18175d685a64..6f2ee11898eb 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.08.1
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=FFmpeg based thumbnail generator for video files
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.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.08.1/src/ffmpegthumbs-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b26c5ad7ae707c3d07e8d38555d76af6
+_md5_=e67564fdba89d0b94a2ef704263f6537
diff --git a/metadata/md5-cache/kde-apps/filelight-21.08.1 b/metadata/md5-cache/kde-apps/filelight-21.08.1
index 182eac7961a3..085d3c8f7002 100644
--- a/metadata/md5-cache/kde-apps/filelight-21.08.1
+++ b/metadata/md5-cache/kde-apps/filelight-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented r
 EAPI=8
 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 ~riscv ~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.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/filelight-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a7978b3f6da80e3b59f5ae16b90e1ecf
+_md5_=6205b0e89e39df10674b4fb73f28b554
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-21.08.1 b/metadata/md5-cache/kde-apps/grantleetheme-21.08.1
index 073d5d71b5ce..211c6eedc28d 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-21.08.1
+++ b/metadata/md5-cache/kde-apps/grantleetheme-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for Grantlee plugins
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~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.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/grantleetheme-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e4c06e45349e8304970dad1d5588c06b
+_md5_=0e1baf5d26e828f352e4642991f88a4c
diff --git a/metadata/md5-cache/kde-apps/k3b-21.08.1 b/metadata/md5-cache/kde-apps/k3b-21.08.1
index 2a6d40670385..73e6a0befc78 100644
--- a/metadata/md5-cache/kde-apps/k3b-21.08.1
+++ b/metadata/md5-cache/kde-apps/k3b-21.08.1
@@ -5,7 +5,7 @@ DESCRIPTION=Full-featured burning and ripping application based on KDE Framework
 EAPI=8
 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 ~riscv ~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.08.1:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kfilemetadata-5.84.0:5[taglib?] >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=kde-frameworks/solid-5.84.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.08.1/src/k3b-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12d4ff1d873e5aa761b7b95d439c980b
+_md5_=32bd71c87279def048320cf39486c156
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-21.08.1 b/metadata/md5-cache/kde-apps/kalarmcal-21.08.1
index cfd97c33a755..634d445fd178 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-21.08.1
+++ b/metadata/md5-cache/kde-apps/kalarmcal-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Client library to access and handling of KAlarm calendar data
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.08.1:5 >=kde-apps/kcalutils-21.08.1:5 >=kde-apps/kidentitymanagement-21.08.1:5 >=kde-frameworks/kcalendarcore-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kholidays-5.84.0:5 >=kde-frameworks/ki18n-5.84.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.08.1/src/kalarmcal-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=540728c838d946ee668ed1f4cab07ffb
+_md5_=42b5f237c3d68795c89414940ef1e64d
diff --git a/metadata/md5-cache/kde-apps/kamoso-21.08.1 b/metadata/md5-cache/kde-apps/kamoso-21.08.1
index 8d8ad68a3d7b..7f1d95f8f4d4 100644
--- a/metadata/md5-cache/kde-apps/kamoso-21.08.1
+++ b/metadata/md5-cache/kde-apps/kamoso-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Application to take pictures and videos from your webcam by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso
 IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~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.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/purpose-5.84.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.84.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.08.1/src/kamoso-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8518d844f5d1c88b2c38175977697061
+_md5_=fe9436d776686eebb8d8f0ffc5cc7306
diff --git a/metadata/md5-cache/kde-apps/kanagram-21.08.1 b/metadata/md5-cache/kde-apps/kanagram-21.08.1
index d382a62dc624..b3407027fc1f 100644
--- a/metadata/md5-cache/kde-apps/kanagram-21.08.1
+++ b/metadata/md5-cache/kde-apps/kanagram-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=Game based on anagrams of words
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/
 IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~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.08.1:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=kde-frameworks/sonnet-5.84.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.08.1: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.08.1/src/kanagram-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ef761a92545b213babf960c2ef469009
+_md5_=49ce672c529e0cf5488ed73a93287583
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-21.08.1 b/metadata/md5-cache/kde-apps/kapptemplate-21.08.1
index 6b66021c2e3e..dc33bee7d454 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-21.08.1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Shell script to create the necessary framework to develop KDE applic
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kapptemplate/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.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.08.1/src/kapptemplate-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0efdac5847341d17edaa4dc5d93e9e93
+_md5_=b86230b2fdf99df357ddafa4070df6a3
diff --git a/metadata/md5-cache/kde-apps/kbackup-21.08.1 b/metadata/md5-cache/kde-apps/kbackup-21.08.1
index 2f93f0da41be..7caaa2a66168 100644
--- a/metadata/md5-cache/kde-apps/kbackup-21.08.1
+++ b/metadata/md5-cache/kde-apps/kbackup-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=Program that lets you back up any directories or files
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kbackup/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kbackup-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e05da09720eb260bebe6387668810489
+_md5_=7e74e746d19b4621921a0e449a6b481a
diff --git a/metadata/md5-cache/kde-apps/kbruch-21.08.1 b/metadata/md5-cache/kde-apps/kbruch-21.08.1
index 1441dfcf8196..41e5db26bb6b 100644
--- a/metadata/md5-cache/kde-apps/kbruch-21.08.1
+++ b/metadata/md5-cache/kde-apps/kbruch-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=Educational application to learn calculating with fractions
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kbruch-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ade72e3594f909084802c3aeb73ff74d
+_md5_=a3269e8f402bd44e683cdec9148529ac
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-21.08.1 b/metadata/md5-cache/kde-apps/kcachegrind-21.08.1
index 489acb8ecc1c..7ceb6242f4dc 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-21.08.1
+++ b/metadata/md5-cache/kde-apps/kcachegrind-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=Frontend for Cachegrind by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kcachegrind/ https://kcachegrind.github.io/html/Home.html
 IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~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.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kcachegrind-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6ee0a2254cbf4c4ab44ef34ca3e5b8a4
+_md5_=a565c2ffdaafff51f66486b22a529f61
diff --git a/metadata/md5-cache/kde-apps/kcalc-21.08.1 b/metadata/md5-cache/kde-apps/kcalc-21.08.1
index 3192f7c844c3..036fcd292ad9 100644
--- a/metadata/md5-cache/kde-apps/kcalc-21.08.1
+++ b/metadata/md5-cache/kde-apps/kcalc-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=KDE calculator
 EAPI=8
 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 ~riscv ~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.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kcalc-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1893835833c05f0304e20524c68f5da
+_md5_=6d0e88351487bdfec7d2d0f106ab32eb
diff --git a/metadata/md5-cache/kde-apps/kcalutils-21.08.1 b/metadata/md5-cache/kde-apps/kcalutils-21.08.1
index 234f95db141d..b207b388a7e4 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-21.08.1
+++ b/metadata/md5-cache/kde-apps/kcalutils-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library providing utility functions for the handling of calendar dat
 EAPI=8
 HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~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.08.1:5 >=kde-frameworks/kcalendarcore-5.84.0:5 >=kde-frameworks/kcodecs-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.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.08.1/src/kcalutils-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=38b2094af42f6f45ec77bfd03521ddac
+_md5_=8713d9d6495be9fdd47aa86b8788e2eb
diff --git a/metadata/md5-cache/kde-apps/kcharselect-21.08.1 b/metadata/md5-cache/kde-apps/kcharselect-21.08.1
index 11c50986c7e5..e853777ba058 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-21.08.1
+++ b/metadata/md5-cache/kde-apps/kcharselect-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=KDE character selection utility
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kcharselect/ https://utils.kde.org/projects/kcharselect/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kcharselect-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=561c98f9105da3e431ce3342a5f0e5db
+_md5_=e6a16458709f15be4ec41f89f5f9cf54
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-21.08.1 b/metadata/md5-cache/kde-apps/kcolorchooser-21.08.1
index ce0089aeb5ad..e86f44201320 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-21.08.1
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=KDE color selector/editor
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kcolorchooser/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kcolorchooser-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e52486a2e2ce7d6307f4547279eed531
+_md5_=bbeeb11544deef0498f2ec9226a51de6
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.08.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-21.08.1
index 68563ac9f390..c4b70da18730 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Development Scripts
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~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.08.1/src/kde-dev-scripts-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2e62ff8cba2b7b126a106d3fb8bdd165
+_md5_=075912bbfce335ba40ad69316ff55125
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-21.08.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-21.08.1
index 50a2159eb156..6603c3648841 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-21.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-21.08.1
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Development Utilities
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~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.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.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.08.1/src/kde-dev-utils-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=522b8dcaa3222704a36b767e397593cf
+_md5_=c126031868da4a5f6d02365d0bacaa2e
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-21.08.1 b/metadata/md5-cache/kde-apps/kdeedu-data-21.08.1
index ba8148b9f9c6..7e33ea305404 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-21.08.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-21.08.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install nofetch prepare test unpack
 DESCRIPTION=Shared icons, artwork and data files for educational applications
 EAPI=8
 HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7267f3573a3afb6f31bbba9d936316f9
+_md5_=b76b83d08aee8c3268f6388cbcc4e88c
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.3-r3 b/metadata/md5-cache/kde-apps/konsole-21.04.3-r3
deleted file mode 100644
index e947514fba16..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-21.04.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konsole-21.04.3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1130022da3206ef8bbaa2801cd6b944
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.3-r4 b/metadata/md5-cache/kde-apps/konsole-21.04.3-r4
index a77852fbdb7f..f08539d3e5f2 100644
--- a/metadata/md5-cache/kde-apps/konsole-21.04.3-r4
+++ b/metadata/md5-cache/kde-apps/konsole-21.04.3-r4
@@ -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	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ace6b4202186c73971f17dd9c5a3eae5
+_md5_=9d9d04ea5376a021eb16f169856f614a
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.08.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-21.08.1
index 6093972e241d..485c9761b88c 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.08.1
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-21.08.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for reading/writing KVTML
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.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.08.1/src/libkeduvocdocument-21.08.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c9aae7b2cd91fc2bf860aa9e9bfc3f9
+_md5_=d16a04f1beb8984588e6f83c3d8ee5dc
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 2d253475bf99..410807da53fa 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.85.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.85.0
index afbd67504768..b756a1426ffa 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.85.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.85.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=5/5.85
 SRC_URI=mirror://kde/stable/frameworks/5.85/kapidox-5.85.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2e0881f0551bda558a94302c8244233
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.86.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.86.0
index 9729823130dc..945f2fa4d336 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.86.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.86.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=5/5.86
 SRC_URI=mirror://kde/stable/frameworks/5.86/kapidox-5.86.0.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=baeb8a08e37dafc4ee57a08690a749f2
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.85.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.85.0
index 61ea73f1b08b..fe8a6ec0546d 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.85.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.85.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interfacing with calendars
 EAPI=8
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ test? ( LGPL-3+ )
 RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.85
 SRC_URI=mirror://kde/stable/frameworks/5.85/kcalendarcore-5.85.0.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=55f5a7add188c34245592f02a0a769eb
+_md5_=363626f04cd9c874dd78ce1c1e4e8be3
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0
index 871918f67b69..65f431d383db 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interfacing with calendars
 EAPI=8
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ test? ( LGPL-3+ )
 RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.86
 SRC_URI=mirror://kde/stable/frameworks/5.86/kcalendarcore-5.86.0.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb330daba951cbbc036b66544e3a354d
+_md5_=ba9acf0fbc1bafb37c29adeebe598c8a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0
deleted file mode 100644
index b39f92503844..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=opds debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) >=kde-frameworks/kirigami-5.86:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/knewstuff-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3d6925975b3e0530ab70de105ad2d541
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r1
new file mode 100644
index 000000000000..1109ad78d75c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=opds debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) >=kde-frameworks/kirigami-5.86:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.86
+SRC_URI=mirror://kde/stable/frameworks/5.86/knewstuff-5.86.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=688e0b0860655fb8f7a230801b06ed22
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.86.0 b/metadata/md5-cache/kde-frameworks/plasma-5.86.0
deleted file mode 100644
index ffd1c3d9fdf2..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2-only man wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/plasma-framework-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9468df342fbe07a6d4ddfabef53e7252
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1
new file mode 100644
index 000000000000..c8111ece203b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only man wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.86
+SRC_URI=mirror://kde/stable/frameworks/5.86/plasma-framework-5.86.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c2baf9849dd825b4ed5b6037e6f7d18f
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index b3f70143dbe4..82d4fb212cf1 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.22.90 b/metadata/md5-cache/kde-plasma/bluedevil-5.22.90
new file mode 100644
index 000000000000..ba7afbf83112
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/bluedevil-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a1d91672b8e285d76e3ee5fca8ec4c41
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-5.22.90
new file mode 100644
index 000000000000..5e02afe30604
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4f33e07eb88b329fecca3717713da1aa
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90
new file mode 100644
index 000000000000..b5ceae703a09
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-grub-5.22.90.tar.xz
+_eclasses_=kde.org	f95aaca4085d2d633c2b76abfd72208f
+_md5_=8888677d5f9ff2cb319575318c6e0dc9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90
new file mode 100644
index 000000000000..621cc5014b4d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.22.90:5 dev-util/ninja >=dev-util/cmake-3.20.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-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-gtk-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e0003a4cb0616a2b2466f956246d95a1
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90
new file mode 100644
index 000000000000..715048ecfe82
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90
@@ -0,0 +1,14 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.86.0:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-plymouth-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b7c40ad78c6c268f8c2e28e79e8b352b
diff --git a/metadata/md5-cache/kde-plasma/discover-5.22.90 b/metadata/md5-cache/kde-plasma/discover-5.22.90
new file mode 100644
index 000000000000..dfe1757ab572
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware flatpak telemetry test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/discover-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1972f010ed91559addc14a517dbe2e6f
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.22.90 b/metadata/md5-cache/kde-plasma/drkonqi-5.22.90
new file mode 100644
index 000000000000..a02aba2721b6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/drkonqi-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=58dd8150fc630f24874adc0556852c00
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90
new file mode 100644
index 000000000000..b6a93c8b3ea9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kactivitymanagerd-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=460617b5842156e7986d53d998337c78
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90
new file mode 100644
index 000000000000..bda155168727
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=test !test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kde-cli-tools-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a68708dd0ecd88e42d2c032bbf3fe21a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90
new file mode 100644
index 000000000000..2969a59dbbba
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/gtk+:3 dev-qt/qtcore:5
+DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.22.90:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kde-gtk-config-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4783dbd2ebb1533e79b20978fb4ded32
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.22.90 b/metadata/md5-cache/kde-plasma/kdecoration-5.22.90
new file mode 100644
index 000000000000..a1508cce979e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kdecoration-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a199f7c472ac2e7b4bb1a5f16bba3a3b
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90
new file mode 100644
index 000000000000..5d4276416cd9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kdeplasma-addons-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67d98292b40f449cf549ff05b6aedf7a
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.22.90 b/metadata/md5-cache/kde-plasma/kgamma-5.22.90
new file mode 100644
index 000000000000..edfc321baf08
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kgamma5-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6e9320c3f1ee6ceff47bc5e48c67ec3e
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.22.90 b/metadata/md5-cache/kde-plasma/khotkeys-5.22.90
new file mode 100644
index 000000000000..83bfec505e4f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/khotkeys-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2f544151b0adfcdf4bbf8c6b8736ac81
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90 b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90
new file mode 100644
index 000000000000..cc526097c1a9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IUSE=gles2-only ieee1394 +opengl +pci usb wayland +X debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/systemsettings-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=opengl? ( X ) wayland? ( || ( opengl gles2-only ) )
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kinfocenter-5.22.90.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3ec5dff78f30e7f3365f18e35fcde003
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90 b/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90
new file mode 100644
index 000000000000..145efc37b36c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kmenuedit-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=21bd36c4407a82b9de7a24157cdbde28
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.22.90 b/metadata/md5-cache/kde-plasma/kscreen-5.22.90
new file mode 100644
index 000000000000..5ac468622691
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kscreen-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=70b6ea386107397aad573f7798c26c43
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90
new file mode 100644
index 000000000000..c6a8e3cf714b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.22.90:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=+pam test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.22.90:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror test
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kscreenlocker-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=18c33b1371b44fb7799491cb4025604b
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90
new file mode 100644
index 000000000000..f1a46df4aa23
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/ksshaskpass-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7042fc4702487f9f3b2f7fb0a06ce2c3
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90 b/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90
new file mode 100644
index 000000000000..b5f92d1a9d01
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin-based system monitoring daemon
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=networkmanager test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/ksystemstats-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e7099f4aec180e22f7925678c99cf9e8
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90
new file mode 100644
index 000000000000..9f3a75e56499
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwallet-pam-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=543bf089d5e5110c2c8c064d1bf3c74d
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90
new file mode 100644
index 000000000000..35298858f5a2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwayland-integration-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b2852a2dd1272d84a0253f9279f6c24
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90 b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90
new file mode 100644
index 000000000000..8e92fb6af976
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.21 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wayland Server Components built on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwayland-server-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=20b0aae6450cc0dc1d4a1e622b372b67
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.90 b/metadata/md5-cache/kde-plasma/kwin-5.22.90
new file mode 100644
index 000000000000..3f3bd86289cc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.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.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[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.86.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 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90: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.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[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.86.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.86.0:5 >=kde-frameworks/kitemmodels-5.86.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 ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwin-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=999f45134fbf1ecc4a9afd2badf300a2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.22.90 b/metadata/md5-cache/kde-plasma/kwrited-5.22.90
new file mode 100644
index 000000000000..239958c87a68
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwrited-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f7aa01fe0888b48ceec9944bb453e0b3
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90
new file mode 100644
index 000000000000..c9bf486b925d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.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[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
+DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=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
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/layer-shell-qt-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=698fd8a9cac677860ebd349d708bfe13
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.22.90 b/metadata/md5-cache/kde-plasma/libkscreen-5.22.90
new file mode 100644
index 000000000000..fcdebe90b159
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test ) mirror
+SLOT=5/7
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/libkscreen-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b77e1dd0a296a1878d0e5a8fc2a58246
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.22.90 b/metadata/md5-cache/kde-plasma/libksysguard-5.22.90
new file mode 100644
index 000000000000..1279cd44697f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.86.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5/9
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/libksysguard-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b80d8d47d8d6570de716d3c6fb1cdf7c
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90 b/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90
new file mode 100644
index 000000000000..0a417ac8f552
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.22.90:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.22.90:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e903c2bcbc2bc6f1b3adcafed81e80d4
diff --git a/metadata/md5-cache/kde-plasma/milou-5.22.90 b/metadata/md5-cache/kde-plasma/milou-5.22.90
new file mode 100644
index 000000000000..093e8105dafa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/milou-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=786c6b7d5a076a5a760277a0cf503bd0
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.22.90 b/metadata/md5-cache/kde-plasma/oxygen-5.22.90
new file mode 100644
index 000000000000..c28b58165ffb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) >=kde-frameworks/kservice-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/oxygen-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ea8939355bb79c85fd2255b372d9268b
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90
new file mode 100644
index 000000000000..1fb1ea37735e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.22.90:5 dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-browser-integration-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=466e031f4e6d58eb0e5598bb52d82318
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90
new file mode 100644
index 000000000000..92d642619b6e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/oxygen-5.22.90:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-desktop-5.22.90.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=968b842dc2efc32e9328afe1ebc3a13e
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90
new file mode 100644
index 000000000000..3c2c303bb97c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-disks-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f84ade472bc5d40c7ae04c21c861beeb
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90
new file mode 100644
index 000000000000..ca1f5ed7176c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma frontend for Firewalld or UFW
+EAPI=8
+HOMEPAGE=https://invent.kde.org/network/plasma-firewall
+IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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] ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-firewall-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c736633a08db8e257fbfea960719a841
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90
new file mode 100644
index 000000000000..76794667cf67
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-integration-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dcffcf6b8d5ed3e8e061a7aff1a646ea
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90
new file mode 100644
index 000000000000..7780288cdc2d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop/
+IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kactivitymanagerd-5.22.90:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kdeplasma-addons-5.22.90:5 >=kde-plasma/kgamma-5.22.90:5 >=kde-plasma/khotkeys-5.22.90:5 >=kde-plasma/kinfocenter-5.22.90:5 >=kde-plasma/kmenuedit-5.22.90:5 >=kde-plasma/kscreen-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/ksshaskpass-5.22.90:5 >=kde-plasma/ksystemstats-5.22.90:5 >=kde-plasma/kwayland-integration-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/kwrited-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/milou-5.22.90:5 >=kde-plasma/oxygen-5.22.90:5 >=kde-plasma/plasma-desktop-5.22.90:5 >=kde-plasma/plasma-integration-5.22.90:5 >=kde-plasma/plasma-systemmonitor-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=kde-plasma/polkit-kde-agent-5.22.90:5 >=kde-plasma/powerdevil-5.22.90:5 >=kde-plasma/systemsettings-5.22.90:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.22.90:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.22.90:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.22.90:5 ) crypt? ( >=kde-plasma/plasma-vault-5.22.90:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.22.90:5 ) discover? ( >=kde-plasma/discover-5.22.90:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.22.90:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.22.90:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.22.90:5 >=kde-plasma/kde-gtk-config-5.22.90:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.22.90:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.22.90:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.22.90:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.22.90:5 >=kde-plasma/plymouth-kcm-5.22.90:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.22.90:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.22.90:5 ) smart? ( >=kde-plasma/plasma-disks-5.22.90:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.22.90:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.22.90:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.22.90:5 ) accessibility? ( app-accessibility/orca )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=45061bba52b373bfd5ef75f8e198af91
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90
new file mode 100644
index 000000000000..d5d0473b2eaa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-nm-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ba7e64c19c901a974bc44f1bd77d7ff1
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90
new file mode 100644
index 000000000000..92adc9020b81
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-pa-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=478d24f9c7cf4612c2d0656e2725950d
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90
new file mode 100644
index 000000000000..3c0ccb67c93d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-sdk-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=da6700bb8755307e56e734865e407ef9
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90
new file mode 100644
index 000000000000..df22be17e742
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 dev-qt/qtcore:5
+DESCRIPTION=Monitor system sensors, process information and other system resources
+EAPI=8
+HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/ksystemstats-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-systemmonitor-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=de38d01bfc1a98b4cabb6a4300729b83
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90
new file mode 100644
index 000000000000..67f033770114
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IUSE=debug test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-thunderbolt-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b09b8f86bc79489ae0e48ecd38611ce5
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90
new file mode 100644
index 000000000000..293c9aa3db0e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-vault-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3282524bf8fdf656528d9d7c549b58fa
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
index a71fb0d672ea..337311e8ed18 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1d3443f75090fa7c93cb452a78d300af
+_md5_=e0bceb87b7b83a2b5006b91a613042cc
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90
new file mode 100644
index 000000000000..1440cfb2c09a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/milou-5.22.90:5 >=kde-plasma/plasma-integration-5.22.90:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test !test? ( test ) !test? ( test ) mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=781cf2ea6a0b6fdb5cfd1ff3ae86d85f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90
new file mode 100644
index 000000000000..630817e14a1a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90
@@ -0,0 +1,12 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-wallpapers-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f707c667fe08eac06576d3a5fed929ee
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90
new file mode 100644
index 000000000000..092bc31f7efd
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plymouth-kcm-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6425d934e036af764e97225efb4c50b5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90
new file mode 100644
index 000000000000..e511b24d017e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/polkit-kde-agent-1-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=187c8ef7b3346402d5c1f00f9c798ad1
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.22.90 b/metadata/md5-cache/kde-plasma/powerdevil-5.22.90
new file mode 100644
index 000000000000..6a08d309c8eb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control caps +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.22.90:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/powerdevil-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=336b8b513f7e024165d1faada7e62538
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90
new file mode 100644
index 000000000000..bb96cdfa4c7c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-plasma/kde-cli-tools-5.22.90:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/sddm-kcm-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c2af6a8224ab4c9f044f0c64ea2b322b
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.22.90 b/metadata/md5-cache/kde-plasma/systemsettings-5.22.90
new file mode 100644
index 000000000000..85f24058f07f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90: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=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/systemsettings-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a0809fd1f0d01e95aa0415b876fc4fe
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90
new file mode 100644
index 000000000000..0c52355255ca
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/xdg-desktop-portal-kde-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89933c1d0124314e68b2bc54f8e68f88
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90
new file mode 100644
index 000000000000..f5009d1f092f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
+RESTRICT=mirror
+SLOT=5
+SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8db3aa4f21e8858bac743389ae3ef689
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index ce6b3b1435d9..59bad4902f8e 100644
--- a/metadata/md5-cache/lxqt-base/Manifest.gz
+++ b/metadata/md5-cache/lxqt-base/Manifest.gz
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.4 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.4
deleted file mode 100644
index f27db7ffbed1..000000000000
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Qt GUI for System Statistics
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://github.com/lxqt/libsysstat/releases/download/0.4.4/libsysstat-0.4.4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61be599c25945f808ffb80973d715d4b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.16.0
deleted file mode 100644
index b02643a58ae2..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16*
-DESCRIPTION=LXQt about dialog
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-about/releases/download/0.16.0/lxqt-about-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fea59c2766993056e7c5e54f03ddc333
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.16.0
deleted file mode 100644
index 452435014838..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* kde-frameworks/kwindowsystem:5
-DESCRIPTION=LXQt system administration tool
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* kde-frameworks/kwindowsystem:5 !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-admin/releases/download/0.16.0/lxqt-admin-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1a108c78ba3455c91556756832996ae
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.16.1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.16.1
deleted file mode 100644
index da40627e04dd..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext x11-libs/libXi )
-DESCRIPTION=LXQt system configuration control center
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-IUSE=+monitor +touchpad
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext x11-libs/libXi ) !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/0.16.1/lxqt-config-0.16.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ca3cc75fd2529da38da3d49ed6381e2f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.16.0
deleted file mode 100644
index 29a9d7560fc7..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* x11-libs/libX11
-DESCRIPTION=Daemon and library for global keyboard shortcuts registration
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* x11-libs/libX11 !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-globalkeys/releases/download/0.16.0/lxqt-globalkeys-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ca69faa3e61a74a107f43893e37a5d4
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.16.0
deleted file mode 100644
index e1f68eaf094b..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.16.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-IUSE=+about admin archiver +display-manager +filemanager lximage minimal nls +policykit powermanagement processviewer screenshot +sddm ssh-askpass sudo terminal +trash
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=metapackage
-RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.16* =lxqt-base/lxqt-globalkeys-0.16* =lxqt-base/lxqt-notificationd-0.16* =lxqt-base/lxqt-panel-0.16* =lxqt-base/lxqt-qtplugin-0.16* =lxqt-base/lxqt-runner-0.16* =lxqt-base/lxqt-session-0.16* virtual/ttf-fonts =x11-themes/lxqt-themes-0.16* about? ( =lxqt-base/lxqt-about-0.16* ) admin? ( =lxqt-base/lxqt-admin-0.16* ) archiver? ( app-arch/lxqt-archiver ) display-manager? ( sddm? ( >=x11-misc/sddm-0.11.0 ) !sddm? ( x11-misc/lightdm ) ) filemanager? ( =x11-misc/pcmanfm-qt-0.16* ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-0.16* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.16* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.16* ) sudo? ( =lxqt-base/lxqt-sudo-0.16* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
-REQUIRED_USE=trash? ( filemanager )
-SLOT=0
-_md5_=3bfad90ac436698850174ebc53645bb1
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.16.0
deleted file mode 100644
index 1bd4438d0ed0..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16*
-DESCRIPTION=LXQt notification daemon and library
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-notificationd/releases/download/0.16.0/lxqt-notificationd-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a651a4041a79ad31269fce02ddd652ff
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.16.0
deleted file mode 100644
index 249bba74b736..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16*
-DESCRIPTION=LXQt OpenSSH user password prompt tool
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-openssh-askpass/releases/download/0.16.0/lxqt-openssh-askpass-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e82b04def46cd15404d4446df8611e59
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.16.1-r1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.16.1-r1
deleted file mode 100644
index 6ccd4ff0a9d8..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.16.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) lm-sensors? ( sys-apps/lm-sensors ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] dev-qt/qtconcurrent:5 ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) )
-DESCRIPTION=LXQt desktop panel and plugins
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) lm-sensors? ( sys-apps/lm-sensors ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] dev-qt/qtconcurrent:5 ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
-REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-panel/releases/download/0.16.1/lxqt-panel-0.16.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=93016ba4c62f87de568c95507107ced3
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.16.0
deleted file mode 100644
index 6ab79ddc4d70..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* sys-auth/polkit-qt[qt5(+)]
-DESCRIPTION=LXQt PolKit authentication agent
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-policykit/releases/download/0.16.0/lxqt-policykit-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=50310a22635d8f22512fcf765f484886
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.16.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.16.0-r1
deleted file mode 100644
index aa938137e6e0..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16* sys-power/upower
-DESCRIPTION=LXQt daemon for power management and auto-suspend
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16* sys-power/upower !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-powermanagement/releases/download/0.16.0/lxqt-powermanagement-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97127f4546fd0798e0f4a728c2d910f9
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.17.1 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.17.1
index 26cccb8885c7..dc0eb9924180 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.17.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.17.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.17* =lxqt-base/lxqt-globalkeys-0.17* sys-power/upower
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-powermanagement/releases/download/0.17.1/lxqt-powermanagement-0.17.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd06dd9d6099721327009a9a3e36f4d0
+_md5_=bfc7d062c8e4615f012065efe9f51ced
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.16.0
deleted file mode 100644
index 26e06c96b8fc..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.6.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16*
-DESCRIPTION=LXQt system integration plugin for Qt
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.6.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16*
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-qtplugin/releases/download/0.16.0/lxqt-qtplugin-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fed734ffcad980f83ffdd6ad44190f5d
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.16.0
deleted file mode 100644
index da12b5b0605f..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16*
-DESCRIPTION=LXQt quick launcher
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.16* =lxqt-base/lxqt-globalkeys-0.16* !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-runner/releases/download/0.16.0/lxqt-runner-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b37a0ecb3815c7b6983969e61ec1ee5a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.16.0
deleted file mode 100644
index eef399cbea1d..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.16* x11-libs/libX11 x11-misc/xdg-user-dirs udev? ( virtual/libudev )
-DESCRIPTION=LXQt Session Manager
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-IUSE=+udev
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.16* x11-libs/libX11 x11-misc/xdg-user-dirs udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-session/releases/download/0.16.0/lxqt-session-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7cf496c1969871e661e0da3baa49ad61
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.16.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.16.0
deleted file mode 100644
index 29ec479f5ffa..000000000000
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16*
-DESCRIPTION=LXQt GUI frontend for sudo
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1 LGPL-2.1+
-RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.16* !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-sudo/releases/download/0.16.0/lxqt-sudo-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25093d2bda80ef8be37523a0f7622659
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 2098e4d4c8c8..5cd7be107361 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/alot-0.9.1 b/metadata/md5-cache/mail-client/alot-0.9.1
index ddcf6010c489..7a39a5ff6512 100644
--- a/metadata/md5-cache/mail-client/alot-0.9.1
+++ b/metadata/md5-cache/mail-client/alot-0.9.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/pazz/alot/archive/0.9.1.tar.gz -> alot-0.9.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be42e2155f90da6eec79401aa3af4196
diff --git a/metadata/md5-cache/mail-client/alot-9999 b/metadata/md5-cache/mail-client/alot-9999
index 1e96b23c73f8..2ad75f94c5ed 100644
--- a/metadata/md5-cache/mail-client/alot-9999
+++ b/metadata/md5-cache/mail-client/alot-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme[python,python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bb1c30c63ff365974be81ab44cc975d
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.18.0 b/metadata/md5-cache/mail-client/claws-mail-3.18.0
index 566353eaae8d..f82a1f4bd1d1 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.18.0
+++ b/metadata/md5-cache/mail-client/claws-mail-3.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
 IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.18.0.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2abe72fc9f5361ebef86857d903a060
+_md5_=2eba252b3242e9a8e8af8a647400019f
diff --git a/metadata/md5-cache/mail-client/claws-mail-4.0.0 b/metadata/md5-cache/mail-client/claws-mail-4.0.0
index 15a2ea1199be..722bc21e7a59 100644
--- a/metadata/md5-cache/mail-client/claws-mail-4.0.0
+++ b/metadata/md5-cache/mail-client/claws-mail-4.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
 IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk3] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-4.0.0.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=18706fa4cf23abddfc5cb3b4b21154c8
+_md5_=45fe23afe03762e19f6212453000b3fa
diff --git a/metadata/md5-cache/mail-client/neomutt-20210205-r1 b/metadata/md5-cache/mail-client/neomutt-20210205-r1
index b08f06da4f88..1dfacf7da742 100644
--- a/metadata/md5-cache/mail-client/neomutt-20210205-r1
+++ b/metadata/md5-cache/mail-client/neomutt-20210205-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst test
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
-IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
+IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test zlib zstd
 KEYWORDS=amd64 ~ppc64 ~s390 x86
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-mutt )
 REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20210205.tar.gz -> neomutt-20210205.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7880f582e84d43f110b4929afd092d5
+_md5_=b91f043266f0eee3773babc7fa74101f
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index 11576d5b3fed..cc99f4de6400 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst test unpack
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
-IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
+IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test zlib zstd
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-mutt )
 REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a494447e2689d41722e72bc885a4ef16
+_md5_=5667c0555888385b4f6e3bf799391da3
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 57a77bb1a83d..a6ae11ee8563 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/afew-3.0.1 b/metadata/md5-cache/mail-filter/afew-3.0.1
index 5015d8578e7e..e36e0f84318e 100644
--- a/metadata/md5-cache/mail-filter/afew-3.0.1
+++ b/metadata/md5-cache/mail-filter/afew-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-3.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0d68b5168f47131f2484d7459b7f5f1
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1 b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
index 233d6a6fcd7e..365ebf010ba4 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for sp
 EAPI=7
 HOMEPAGE=http://bogofilter.sourceforge.net/
 IUSE=berkdb +sqlite tokyocabinet
-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/pax sci-libs/gsl:= virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.5.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be293cb5436eb210d063694876047f69
+_md5_=c08b49da12331ca1a676faa6ffe1b21b
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
index 463fd25afee4..51eb642ad7ed 100644
--- a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=725b0b8aa5d976ba04ce97452ee0e38b
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
index f46694e0db63..35837193516a 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
@@ -12,5 +12,5 @@ REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/f46159bd6519cebcebf59e9334a7920371111d75.tar.gz -> pyzor-1.0.0_p20200523.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e07331de2613a34c07fac7a1ff9a8d83
diff --git a/metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3 b/metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
index 6bdcc61d8ff7..82c24120690a 100644
--- a/metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
+++ b/metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyspf[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/spf-engine/spf-engine-2.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa32570e882eb463304ece19c4b75116
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index f01b85f50f6b..7c1d9db0bfdd 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/exim-4.94.2-r5 b/metadata/md5-cache/mail-mta/exim-4.94.2-r5
deleted file mode 100644
index cdfa436eecc2..000000000000
--- a/metadata/md5-cache/mail-mta/exim-4.94.2-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7 ) elibc_glibc? ( net-libs/libnsl nis? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv
-DESCRIPTION=A highly configurable, drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=https://www.exim.org/
-IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7 ) elibc_glibc? ( net-libs/libnsl nis? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
-REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) ) || ( berkdb gdbm tdb )
-SLOT=0
-SRC_URI=https://downloads.exim.org/exim4/exim-4.94.2.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.94.2.tar.xz )
-_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=526642a4b0d820defeb39014b56b7d77
diff --git a/metadata/md5-cache/mail-mta/exim-4.95 b/metadata/md5-cache/mail-mta/exim-4.95
new file mode 100644
index 000000000000..e61d214f36b3
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.95
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7 ) elibc_glibc? ( net-libs/libnsl nis? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=https://www.exim.org/
+IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7 ) elibc_glibc? ( net-libs/libnsl nis? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) ) || ( berkdb gdbm tdb )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.95.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.95.tar.xz )
+_eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=64beef8119dcceef738beffd4d5042f5
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.16 b/metadata/md5-cache/mail-mta/msmtp-1.8.16
index d51032686b74..bae6cfd90695 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.16
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.16
@@ -5,11 +5,11 @@ DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=8
 HOMEPAGE=https://marlam.de/msmtp/
 IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
 REQUIRED_USE=daemon? ( filecaps )
 SLOT=0
 SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.16.tar.xz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f6600ff2c6a5d8c8833c1d98deb00da5
+_md5_=48ae603d80a9ad2550ae5e8d90de0e75
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210815-r1 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210815-r1
deleted file mode 100644
index 7015d0152ccd..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210815-r1
+++ /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/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210815.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6ea99262e32d217f6bd380ef107f9ed
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210926 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210926
new file mode 100644
index 000000000000..09dd10ff4c66
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210926
@@ -0,0 +1,15 @@
+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/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210926.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b6ea99262e32d217f6bd380ef107f9ed
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 44a6be74ad30..e9ff8fecefcb 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/droid-113-r5 b/metadata/md5-cache/media-fonts/droid-113-r5
index affb3a3829fa..5963a213d4b0 100644
--- a/metadata/md5-cache/media-fonts/droid-113-r5
+++ b/metadata/md5-cache/media-fonts/droid-113-r5
@@ -4,9 +4,9 @@ DESCRIPTION=Font family from Google's Android project
 EAPI=7
 HOMEPAGE=https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29
 IUSE=X
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~m68k ppc ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://gentoo/droid-113-r1.tar.bz2 mirror://gentoo/DroidSansMonoSlashed-112_p1.ttf.bz2 mirror://gentoo/DroidSansMonoDotted-112_p1.ttf.bz2
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=deb81c8035df8150c1e48694ebaf9a62
+_md5_=ebe0c937c0e150bfa1665389c6c1f4bf
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
index 202fcfcb6ade..2743b6cc5d2c 100644
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of
 EAPI=7
 HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
 IUSE=fontforge X X
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/liberation-fonts-2.1.3.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/liberation-fonts-ttf-2.1.3.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	0667878c2b594871023dd1833d05996f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=486d65457da03ffb887782331fda39a1
+_md5_=7cba99244a122ca13b90b2019f036b4c
diff --git a/metadata/md5-cache/media-fonts/vollkorn-2.1 b/metadata/md5-cache/media-fonts/vollkorn-2.1
index fe57106f83f7..f83c2ac2fa52 100644
--- a/metadata/md5-cache/media-fonts/vollkorn-2.1
+++ b/metadata/md5-cache/media-fonts/vollkorn-2.1
@@ -2,7 +2,7 @@ BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
 DESCRIPTION=Vollkorn, the free and healthy typeface for bread and butter use
 EAPI=7
-HOMEPAGE=http://friedrichalthausen.de/?page_id=411
+HOMEPAGE=http://vollkorn-typeface.com/
 IUSE=X
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,4 +10,4 @@ RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://friedrichalthausen.de/Vollkorn-2.1.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=86f08f5d2c7e65949a476a22d4e13d4f
+_md5_=6c27015aed80d6aeca448922f6b3c878
diff --git a/metadata/md5-cache/media-fonts/vollkorn-4.105 b/metadata/md5-cache/media-fonts/vollkorn-4.105
new file mode 100644
index 000000000000..c27a69f3842f
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/vollkorn-4.105
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+DESCRIPTION=Vollkorn, the free and healthy typeface for bread and butter use
+EAPI=7
+HOMEPAGE=http://vollkorn-typeface.com/
+IUSE=+otf +ttf X
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=OFL-1.1
+REQUIRED_USE=|| ( otf ttf )
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=http://vollkorn-typeface.com/download/vollkorn-4-105.zip
+_eclasses_=font	0667878c2b594871023dd1833d05996f
+_md5_=e69c798da2ffab28e7594012fd4633ab
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7122d7fa2734..119adb19594b 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.1 b/metadata/md5-cache/media-gfx/argyllcms-2.2.1
new file mode 100644
index 000000000000..b9ea5bfd517b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.2.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip dev-util/ftjam virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=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=
+DESCRIPTION=Open source, ICC compatible color management system
+EAPI=7
+HOMEPAGE=http://www.argyllcms.com/
+IUSE=doc
+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.1_src.zip
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b446db715a30648e31571f83ca5d77fb
diff --git a/metadata/md5-cache/media-gfx/cairosvg-2.5.2 b/metadata/md5-cache/media-gfx/cairosvg-2.5.2
index e9f5956c5b79..906794d8de89 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-2.5.2
+++ b/metadata/md5-cache/media-gfx/cairosvg-2.5.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/C/CairoSVG/CairoSVG-2.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e41682192b1ca066fbd0753044482916
diff --git a/metadata/md5-cache/media-gfx/feh-3.7.2 b/metadata/md5-cache/media-gfx/feh-3.7.2
new file mode 100644
index 000000000000..42fff1da42d1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-3.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=7
+HOMEPAGE=https://feh.finalrewind.org/
+IUSE=debug curl exif test xinerama inotify
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=feh
+RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://feh.finalrewind.org/feh-3.7.2.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=22f11047223baff2fe7e6a8509756f02
diff --git a/metadata/md5-cache/media-gfx/fontforge-20201107 b/metadata/md5-cache/media-gfx/fontforge-20201107
index 2222a506e627..5048293664a0 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20201107
+++ b/metadata/md5-cache/media-gfx/fontforge-20201107
@@ -5,7 +5,7 @@ DESCRIPTION=postscript font editor and converter
 EAPI=7
 HOMEPAGE=https://fontforge.org/
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20201107/fontforge-20201107.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6cfceca6eb81d90a299c08a47048ecea
+_md5_=0891e77d340b0ddc82839f41ccde5114
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029 b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
index 85cb10ebfc8e..f547464a3cc8 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=46cb8b11ba30ed7619219d8dc1373fc9
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.4.1 b/metadata/md5-cache/media-gfx/img2pdf-0.4.1
index c4ab2848b93b..e88b4c635c31 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.4.1
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a621282fb2f63e6d81c490f51a4ed25d
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1 b/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1
index 072eefbc52cc..712d22123bff 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.4.1-r1
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.4.1-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/img2pdf/img2pdf-0.4.1.tar.gz https://dev.gentoo.org/~sbraz/img2pdf-0.4.1-imagemagick-7-tests.patch.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c674a169e3e947dd93dff1b927c513e7
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.8.1 b/metadata/md5-cache/media-gfx/kphotoalbum-5.8.1
index 94bf8393ce40..62b1400274dc 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.8.1
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.8.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/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/karchive-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/kjobwidgets-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= >=media-libs/phonon-4.11.0 virtual/jpeg:0 map? ( kde-apps/marble:5 ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Tool for indexing, searching, and viewing images
 EAPI=7
 HOMEPAGE=https://kphotoalbum.org/
-IUSE=map +raw share debug +handbook test
+IUSE=map +raw share test debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-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/kjobwidgets-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 media-gfx/exiv2:= >=media-libs/phonon-4.11.0 virtual/jpeg:0 map? ( kde-apps/marble:5 ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-5.74.0:5 ) media-video/ffmpeg || ( 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/kphotoalbum/5.8.1/kphotoalbum-5.8.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cc677a1b80aed84f36da23ab8eff3aad
+_md5_=67f90c49d8022c52cde5fb354da5cde1
diff --git a/metadata/md5-cache/media-gfx/krita-4.4.8 b/metadata/md5-cache/media-gfx/krita-4.4.8
deleted file mode 100644
index 2b63e63d62db..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-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/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-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 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=8
-HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
-IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-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/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-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 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.4.8/krita-4.4.8.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a0b3665256fd1729d6294a3861b422de
diff --git a/metadata/md5-cache/media-gfx/krita-4.4.8-r1 b/metadata/md5-cache/media-gfx/krita-4.4.8-r1
new file mode 100644
index 000000000000..89fddfad5a1c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.4.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-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/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-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 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=8
+HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-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/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-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 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( =media-libs/opencolorio-1* ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.4.8/krita-4.4.8.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7e48103356b9b2886ab2802e9df7152b
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.16.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.16.0
deleted file mode 100644
index 88c2771f9dd7..000000000000
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.16.0:= x11-libs/libX11 x11-libs/libXfixes
-DESCRIPTION=Qt Image Viewer
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.16.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/lximage-qt/releases/download/0.16.0/lximage-qt-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7dd92a637962e6f43d96b710e0544c60
diff --git a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2 b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
index 2c15c63d00ca..6056d53062e5 100644
--- a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
@@ -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/mypaint/mypaint/releases/download/v2.0.1/mypaint-2.0.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2c4c8d063a468690c18f84a54293b652
diff --git a/metadata/md5-cache/media-gfx/netpaint-1.1.2 b/metadata/md5-cache/media-gfx/netpaint-1.1.2
index 92cd1d322d8a..84b0298502d3 100644
--- a/metadata/md5-cache/media-gfx/netpaint-1.1.2
+++ b/metadata/md5-cache/media-gfx/netpaint-1.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/urwid[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/SyntheticDreams/netpaint/archive/v1.1.2.tar.gz -> netpaint-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7bae2ec74cdf99393ab8df834fb0bf3b
diff --git a/metadata/md5-cache/media-gfx/scour-0.38.2 b/metadata/md5-cache/media-gfx/scour-0.38.2
index 9df2a3deef32..ccb6271ad9c7 100644
--- a/metadata/md5-cache/media-gfx/scour-0.38.2
+++ b/metadata/md5-cache/media-gfx/scour-0.38.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.38.2.tar.gz -> scour-0.38.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed853603cbac3222b824b813ed965dbb
diff --git a/metadata/md5-cache/media-gfx/simple-scan-40.5 b/metadata/md5-cache/media-gfx/simple-scan-40.5
new file mode 100644
index 000000000000..4b6c3e95cbc4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/simple-scan-40.5
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gui-libs/libhandy:1[vala] dev-libs/libgusb[vala] colord? ( x11-misc/colord[vala] ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.1.90:1= >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple document scanning utility
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
+IUSE=colord webp
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.1.90:1= >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://gnome/sources/simple-scan/40/simple-scan-40.5.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f2783aa9e43b513ef8d6f03451cd1524
diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.4.0 b/metadata/md5-cache/media-gfx/svg2rlg-0.4.0
index 2b5c988db58d..1acc649826a5 100644
--- a/metadata/md5-cache/media-gfx/svg2rlg-0.4.0
+++ b/metadata/md5-cache/media-gfx/svg2rlg-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sarnold/svg2rlg/archive/0.4.0.tar.gz -> svg2rlg-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fdc2aa4d64f638907df2db90dd603f8f
diff --git a/metadata/md5-cache/media-gfx/sxiv-26 b/metadata/md5-cache/media-gfx/sxiv-26
index 24329e211b20..df0f8ae23214 100644
--- a/metadata/md5-cache/media-gfx/sxiv-26
+++ b/metadata/md5-cache/media-gfx/sxiv-26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?,webp?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v26.tar.gz -> sxiv-26.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c56c3468a07222a6ed2b22ea3e5b0d8
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index dd430fdc7e7c..b425cf434cb4 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?,webp?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c40816a169c777c0cf47328c349c6e27
diff --git a/metadata/md5-cache/media-gfx/termtosvg-1.1.0 b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
index cf93d1e34b11..3fe0c1838e38 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-1.1.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/1.1.0.tar.gz -> termtosvg-1.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c0d7f15266a21a8ca557990e606e065
diff --git a/metadata/md5-cache/media-gfx/word_cloud-1.8.1 b/metadata/md5-cache/media-gfx/word_cloud-1.8.1
index f8c5fc8bd9ae..0c7aadaa5686 100644
--- a/metadata/md5-cache/media-gfx/word_cloud-1.8.1
+++ b/metadata/md5-cache/media-gfx/word_cloud-1.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/amueller/word_cloud/archive/1.8.1.tar.gz -> word_cloud-1.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9096530203d792e993ac5e223528b1a3
diff --git a/metadata/md5-cache/media-gfx/xdot-1.2 b/metadata/md5-cache/media-gfx/xdot-1.2
index cefb555682dc..b3fe8ec5be07 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.2
+++ b/metadata/md5-cache/media-gfx/xdot-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.2.tar.gz -> xdot-1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e06b4a98e828bf251b74cf4c413ab80
diff --git a/metadata/md5-cache/media-gfx/xdot-9999 b/metadata/md5-cache/media-gfx/xdot-9999
index 69c8d4bc34ec..8cd9a554d7e4 100644
--- a/metadata/md5-cache/media-gfx/xdot-9999
+++ b/metadata/md5-cache/media-gfx/xdot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[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(-)?] media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7132c2e6064cbe55e74459249defe3ed
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7d9524eda3ff..f3302a15247b 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/aubio-0.4.9-r1 b/metadata/md5-cache/media-libs/aubio-0.4.9-r1
index 56387f55f283..c7a1974c92b0 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.9-r1
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( doubl
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=494c4db6876d1d73e6f11e2d627066b0
diff --git a/metadata/md5-cache/media-libs/codec2-1.0.0 b/metadata/md5-cache/media-libs/codec2-1.0.0
index 7852cf8cc7fa..d3e09daa7b98 100644
--- a/metadata/md5-cache/media-libs/codec2-1.0.0
+++ b/metadata/md5-cache/media-libs/codec2-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Low bit rate speech codec
 EAPI=7
 HOMEPAGE=https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2
 IUSE=examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0/1.0
 SRC_URI=https://github.com/drowe67/codec2/archive/v1.0.0.tar.gz -> codec2-1.0.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb058d38de77ec859ac007671e046226
+_md5_=3865c8bc01b70af82309ac3c954afa95
diff --git a/metadata/md5-cache/media-libs/codec2-1.0.1 b/metadata/md5-cache/media-libs/codec2-1.0.1
new file mode 100644
index 000000000000..9dbfcddd112c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/codec2-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low bit rate speech codec
+EAPI=7
+HOMEPAGE=https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2
+IUSE=examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RESTRICT=test
+SLOT=0/1.0
+SRC_URI=https://github.com/drowe67/codec2/archive/v1.0.1.tar.gz -> codec2-1.0.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e2106d03e1e045385edeb59f9e8b84a9
diff --git a/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1 b/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
index 4a116ca7f566..072dde30b915 100644
--- a/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
+++ b/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[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/abcminiuser/python-elgato-streamdeck/archive/0.8.1.tar.gz -> elgato-streamdeck-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98dfec0b8ff4b0c43e29c1b2d4ef13c2
diff --git a/metadata/md5-cache/media-libs/elgato-streamdeck-9999 b/metadata/md5-cache/media-libs/elgato-streamdeck-9999
index e41857fee939..94133130b541 100644
--- a/metadata/md5-cache/media-libs/elgato-streamdeck-9999
+++ b/metadata/md5-cache/media-libs/elgato-streamdeck-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98dfec0b8ff4b0c43e29c1b2d4ef13c2
diff --git a/metadata/md5-cache/media-libs/exiftool-12.30 b/metadata/md5-cache/media-libs/exiftool-12.30
new file mode 100644
index 000000000000..40715a61617b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-12.30
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=7
+HOMEPAGE=https://exiftool.org/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://exiftool.org/Image-ExifTool-12.30.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
+_md5_=b96fe5a5c1fed6a4c20e18de050bcc1c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.9.1 b/metadata/md5-cache/media-libs/harfbuzz-2.9.1
index d522a8e6bd76..9ac213b375a4 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.9.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.9.1.tar.gz -> harfbuzz-2.9.1.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f651cce0cafdb1a66c9f0624d0a10820
+_md5_=ef17d455d9234703e393b5fc55961f49
diff --git a/metadata/md5-cache/media-libs/kimageannotator-0.5.2 b/metadata/md5-cache/media-libs/kimageannotator-0.5.2
new file mode 100644
index 000000000000..2d502854bffa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/kimageannotator-0.5.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] >=media-libs/kcolorpicker-0.1.6 x11-libs/libX11 test? ( dev-qt/qttest:5 )
+DESCRIPTION=Tool for annotating images
+EAPI=8
+HOMEPAGE=https://github.com/ksnip/kImageAnnotator
+IUSE=test test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] >=media-libs/kcolorpicker-0.1.6 x11-libs/libX11
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ksnip/kImageAnnotator/archive/v0.5.2.tar.gz -> kImageAnnotator-0.5.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=466c176082975f9407727517274d02be
diff --git a/metadata/md5-cache/media-libs/leptonica-1.81.0 b/metadata/md5-cache/media-libs/leptonica-1.81.0
deleted file mode 100644
index 65f20bb0c64b..000000000000
--- a/metadata/md5-cache/media-libs/leptonica-1.81.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gif? ( >=media-libs/giflib-5.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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] 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(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/tiff:0[zlib] )
-DESCRIPTION=C library for image processing and analysis
-EAPI=7
-HOMEPAGE=http://www.leptonica.org/
-IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
-LICENSE=Apache-2.0
-RDEPEND=gif? ( >=media-libs/giflib-5.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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] 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(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( jpeg png tiff zlib )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.81.0/leptonica-1.81.0.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1357afb0a41317c4f4beab2c2e151682
diff --git a/metadata/md5-cache/media-libs/leptonica-1.82.0 b/metadata/md5-cache/media-libs/leptonica-1.82.0
new file mode 100644
index 000000000000..c9191410d9c4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/leptonica-1.82.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gif? ( >=media-libs/giflib-5.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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] 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(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/tiff:0[jpeg,zlib] )
+DESCRIPTION=C library for image processing and analysis
+EAPI=7
+HOMEPAGE=http://www.leptonica.org/
+IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+LICENSE=Apache-2.0
+RDEPEND=gif? ( >=media-libs/giflib-5.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(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] 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(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg png tiff zlib )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.82.0/leptonica-1.82.0.tar.gz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=744b8ee4724626c24ac88cc504e6d15f
diff --git a/metadata/md5-cache/media-libs/libfreeaptx-0.1.1 b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
index 2375402e3944..f75fa83058d1 100644
--- a/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
+++ b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
@@ -3,9 +3,9 @@ DESCRIPTION=Reverse-engineered aptX and aptX HD library (fork of libopenaptx)
 EAPI=7
 HOMEPAGE=https://github.com/iamthehorker/libfreeaptx
 IUSE=cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/iamthehorker/libfreeaptx/archive/0.1.1.tar.gz -> libfreeaptx-0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92aae5553041c12c168ca6076ba7fc1a
+_md5_=337902f5a3eebc0952013738b6cc8e37
diff --git a/metadata/md5-cache/media-libs/libid3tag-0.16.1-r1 b/metadata/md5-cache/media-libs/libid3tag-0.16.1-r1
index aefe8719e8ee..f26828b2c863 100644
--- a/metadata/md5-cache/media-libs/libid3tag-0.16.1-r1
+++ b/metadata/md5-cache/media-libs/libid3tag-0.16.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The MAD id3tag library, Tenacity fork
 EAPI=7
 HOMEPAGE=https://github.com/tenacityteam/libid3tag
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 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(-)?]
 SLOT=0/0.16.1
 SRC_URI=https://github.com/tenacityteam/libid3tag/archive/refs/tags/0.16.1.tar.gz -> libid3tag-0.16.1.tar.gz
 _eclasses_=cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51a647874226c72d2b0cfe5bb0e01a7e
+_md5_=96a2e3c644156c3fb605cd74ccdffba6
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2
index 1d03a4fb0e34..a7eedba1f945 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2
@@ -5,10 +5,10 @@ DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=7
 HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
 IUSE=cpu_flags_arm_neon java 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 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df49f8a32d4865bc55e9297f4dadfbca
+_md5_=c963bb9223333989567d4f0fedceff3a
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.19 b/metadata/md5-cache/media-libs/libmtp-1.1.19
new file mode 100644
index 000000000000..078f30f58725
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.19
@@ -0,0 +1,14 @@
+BDEPEND=>sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
+EAPI=7
+HOMEPAGE=http://libmtp.sourceforge.net/
+IUSE=+crypt doc examples static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+SLOT=0/9
+SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.19.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=b0a5c4f6e5bbaeb98c426dfdc9b984f5
diff --git a/metadata/md5-cache/media-libs/libopusenc-0.2.1 b/metadata/md5-cache/media-libs/libopusenc-0.2.1
index 83b7f4e8b59c..71ce9c825830 100644
--- a/metadata/md5-cache/media-libs/libopusenc-0.2.1
+++ b/metadata/md5-cache/media-libs/libopusenc-0.2.1
@@ -5,9 +5,9 @@ DESCRIPTION=High-level API for encoding .opus files
 EAPI=7
 HOMEPAGE=https://www.opus-codec.org/
 IUSE=doc
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=media-libs/opus-1.1:=
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/libopusenc-0.2.1.tar.gz
-_md5_=3664689bef01cb0daf19bc4867692f82
+_md5_=f67b29aa1c1f27859fb3ff21a04f8e75
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.20-r1 b/metadata/md5-cache/media-libs/libpano13-2.9.20-r1
index 16e5c4fb7b72..ef68f211373d 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.20-r1
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.20-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Helmut Dersch's panorama toolbox library
 EAPI=7
 HOMEPAGE=http://panotools.sourceforge.net/
 IUSE=java static-libs elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.20.tar.gz
 _eclasses_=java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=0f365595fea18203e9354481bbf86ebf
+_md5_=70318665bd98b34a52ab8b9b9753a2c0
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.16 b/metadata/md5-cache/media-libs/libsdl2-2.0.16
index 56d4f9983175..d633f0aa0c92 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.16
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.16
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=8
 HOMEPAGE=https://www.libsdl.org/
 IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) 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(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[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/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire:=[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:=[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-208:=[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.0.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(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) ibus? ( dbus ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) sndio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.0.16.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5236b414ab09df13857d6a5777e6f7c
+_md5_=a775f1cc917cac03b5647aabc97b5f58
diff --git a/metadata/md5-cache/media-libs/libsixel-1.10.3 b/metadata/md5-cache/media-libs/libsixel-1.10.3
new file mode 100644
index 000000000000..ef173202be7d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsixel-1.10.3
@@ -0,0 +1,16 @@
+BDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng: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=A lightweight, fast implementation of DEC SIXEL graphics codec
+EAPI=8
+HOMEPAGE=https://github.com/libsixel/libsixel
+IUSE=curl gd gtk jpeg png python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=MIT public-domain
+RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) 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 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libsixel/libsixel/archive/v1.10.3.tar.gz -> libsixel-1.10.3.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7392e9c65c6a3ac7ddf9816818cb90a6
diff --git a/metadata/md5-cache/media-libs/libsixel-1.8.6 b/metadata/md5-cache/media-libs/libsixel-1.8.6
index bed2223140e8..a9b86344c376 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.8.6
+++ b/metadata/md5-cache/media-libs/libsixel-1.8.6
@@ -1,13 +1,15 @@
-DEFINED_PHASES=configure install test
-DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng: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=A lightweight, fast implementation of DEC SIXEL graphics codec
 EAPI=7
 HOMEPAGE=https://github.com/saitoha/libsixel
-IUSE=curl gd gtk jpeg png static-libs
+IUSE=curl gd gtk jpeg png python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=MIT public-domain
-RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 )
+RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng: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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/saitoha/libsixel/archive/v1.8.6.tar.gz -> libsixel-1.8.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=489bd39f50204a00b72835fb390ea0e6
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00e5e51ea26099414f859d71b8f34052
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20200413-r2 b/metadata/md5-cache/media-libs/libuninameslist-20200413-r2
index 469a24eafa3a..d282aeef6ed1 100644
--- a/metadata/md5-cache/media-libs/libuninameslist-20200413-r2
+++ b/metadata/md5-cache/media-libs/libuninameslist-20200413-r2
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Library of unicode annotation data
 EAPI=7
 HOMEPAGE=https://github.com/fontforge/libuninameslist
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20200413/libuninameslist-dist-20200413.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fcec67dd7907f56d6a5b6c5ae3cc107a
+_md5_=3764f907ab26ba028d651926bc22f1a8
diff --git a/metadata/md5-cache/media-libs/mutagen-1.45.1 b/metadata/md5-cache/media-libs/mutagen-1.45.1
index 37ebe17213d4..9a8fee54ed42 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.45.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.45.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.45.1/mutagen-1.45.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cba8d913b3dd71fcdea6b3270dfd732b
diff --git a/metadata/md5-cache/media-libs/portmidi-234 b/metadata/md5-cache/media-libs/portmidi-234
index 2ef4c24d3ac9..06a5d0a57e25 100644
--- a/metadata/md5-cache/media-libs/portmidi-234
+++ b/metadata/md5-cache/media-libs/portmidi-234
@@ -11,5 +11,5 @@ RDEPEND=media-libs/alsa-lib python? ( python_targets_python3_8? ( dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/portmedia/portmedia-code-r234.zip
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f4eb32ae3856cca9204406c7eccbd4b9
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2 b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
index 819b8d9bfbf2..784386f55bae 100644
--- a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Direct Media Layer Network Support Library
 EAPI=8
 HOMEPAGE=https://www.libsdl.org/projects/SDL_net/
 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 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=media-libs/libsdl[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.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8d987d91fda145d05b8b4bc43bed729
+_md5_=3f343303239de2c60b79b2d161c63f32
diff --git a/metadata/md5-cache/media-libs/sdl2-net-2.0.1 b/metadata/md5-cache/media-libs/sdl2-net-2.0.1
index f8df8f1fc435..69fa361e146a 100644
--- a/metadata/md5-cache/media-libs/sdl2-net-2.0.1
+++ b/metadata/md5-cache/media-libs/sdl2-net-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Direct Media Layer Network Support Library
 EAPI=7
 HOMEPAGE=https://www.libsdl.org/projects/SDL_net/index.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.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://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98447693d70c0ece0b7ad92a2e6fd195
+_md5_=aae749a9e1aff0597797f9e171783904
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r11 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r11
index 77a8263c8897..d9fe069e5b62 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r11
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r11
@@ -5,10 +5,10 @@ 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
+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	c7052b276346587968d52ea8eaf5aca1	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9d9df08e0cb341249a18a0f1eb7d2f0
+_md5_=4c4dee5061f5dc06086785cbeb0f5a26
diff --git a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4 b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4
index a52c83731353..268bce62eca0 100644
--- a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4
+++ b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4
@@ -5,10 +5,10 @@ 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
+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	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ed87c566be60a6e2a6ffeb0a2e28a4f
+_md5_=3d0253cde47b1c6dbe2cdeff5247cff2
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r4 b/metadata/md5-cache/media-libs/woff2-1.0.2-r4
index 3cc2e17d6a89..abe3c29a64a8 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r4
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r4
@@ -4,10 +4,10 @@ DEPEND=app-arch/brotli:=
 DESCRIPTION=Encode/decode WOFF2 font format
 EAPI=7
 HOMEPAGE=https://github.com/google/woff2
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:=
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6e9c9cefb5386f61ec58262e5cc75bfd
+_md5_=ade74acf00402ad0f2b74a4e991f41c5
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 3738d7b78322..a537b69fadf3 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/gst-plugins-libpng-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
index 6bffed3aa520..1723823a0baa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
@@ -5,11 +5,11 @@ DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.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(-)?] >=media-libs/gst-plugins-good-1.18.4: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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	72134fb0115276ac5848aad3121ed96e	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2dc574c40f7727c33f4c49e64455722
+_md5_=a37c2223c895360d5ab1b79ea726d9bd
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index b2f1e0231033..210541687ac2 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.54 b/metadata/md5-cache/media-radio/flrig-1.3.54
deleted file mode 100644
index ae5ccafcbb0d..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.3.54
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.54.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12808c80dff91a11573bd5c3d4de528d
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.0 b/metadata/md5-cache/media-radio/flrig-1.4.0
deleted file mode 100644
index 218857505e38..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70cbe0afbc51ec841d9a68bca18ced95
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.1 b/metadata/md5-cache/media-radio/flrig-1.4.1
deleted file mode 100644
index bf3b4183b29f..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70cbe0afbc51ec841d9a68bca18ced95
diff --git a/metadata/md5-cache/media-radio/tucnak-4.28 b/metadata/md5-cache/media-radio/tucnak-4.28
deleted file mode 100644
index 6a06560ada18..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.28
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.28.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28bf2a89e16e1cf9879d827c40966e5f
diff --git a/metadata/md5-cache/media-radio/tucnak-4.29 b/metadata/md5-cache/media-radio/tucnak-4.29
deleted file mode 100644
index 65514ba9b7fc..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.29
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.29.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e2c03770dc2fb71365db1050fb89f5d
diff --git a/metadata/md5-cache/media-radio/tucnak-4.30 b/metadata/md5-cache/media-radio/tucnak-4.30
index 24b9d637eb38..870937327265 100644
--- a/metadata/md5-cache/media-radio/tucnak-4.30
+++ b/metadata/md5-cache/media-radio/tucnak-4.30
@@ -5,10 +5,10 @@ DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak-4.30.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5520faaddda885f21cb233016ecc92d2
+_md5_=28bf2a89e16e1cf9879d827c40966e5f
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.23 b/metadata/md5-cache/media-radio/xlog-2.0.23
new file mode 100644
index 000000000000..2e568a9333fd
--- /dev/null
+++ b/metadata/md5-cache/media-radio/xlog-2.0.23
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=media-libs/hamlib:= dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libpng:0 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=An amateur radio logging program
+EAPI=8
+HOMEPAGE=https://www.nongnu.org/xlog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/hamlib:= dev-libs/glib:2 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://download.savannah.gnu.org/releases/xlog/xlog-2.0.23.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2039da11b2af9920225b5122b406cb23
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c60297bb9a41..7f85adfe2a4b 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/abcde-2.9.3-r2 b/metadata/md5-cache/media-sound/abcde-2.9.3-r2
index 044d9c50c44a..8b5df737e76e 100644
--- a/metadata/md5-cache/media-sound/abcde-2.9.3-r2
+++ b/metadata/md5-cache/media-sound/abcde-2.9.3-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Command line CD encoder
 EAPI=7
 HOMEPAGE=https://abcde.einval.com/
 IUSE=aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=media-sound/cd-discid net-misc/wget sys-apps/util-linux || ( dev-libs/libcdio-paranoia media-sound/cdparanoia media-sound/dagrab ) aac? ( media-libs/faac || ( media-video/atomicparsley media-video/atomicparsley-wez ) ) aiff? ( media-video/ffmpeg ) cdr? ( app-cdr/cdrtools ) flac? ( media-libs/flac ) id3tag? ( dev-python/eyeD3:0.7 >=media-sound/id3-0.12 media-sound/id3v2 ) lame? ( media-sound/lame ) mac? ( media-sound/apetag media-sound/mac ) musepack? ( media-sound/musepack-tools ) musicbrainz? ( dev-perl/MusicBrainz-DiscID >=dev-perl/WebService-MusicBrainz-1.0.4 virtual/perl-Digest-SHA virtual/perl-Getopt-Long ) normalize? ( >=media-sound/normalize-0.7.4 ) opus? ( media-sound/opus-tools ) replaygain? ( lame? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) speex? ( media-libs/speex ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://abcde.einval.com/download/abcde-2.9.3.tar.gz
-_md5_=2633da0b431ed21e1e6ed49e763c375f
+_md5_=82a76d91de6b4e2abdcf4a1dc373b3f1
diff --git a/metadata/md5-cache/media-sound/apetag-1.12-r3 b/metadata/md5-cache/media-sound/apetag-1.12-r3
index afc4bf6e49a4..6d8708084b96 100644
--- a/metadata/md5-cache/media-sound/apetag-1.12-r3
+++ b/metadata/md5-cache/media-sound/apetag-1.12-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Command-line ape 2.0 tagger
 EAPI=7
 HOMEPAGE=http://muth.org/Robert/Apetag/
 IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv 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] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://muth.org/Robert/Apetag/apetag.1.12.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f2440c37ec914954abae99beaf406bf2
+_md5_=8f49129f90c6286b2776ae4eebf3dcb6
diff --git a/metadata/md5-cache/media-sound/audiotools-3.1.1 b/metadata/md5-cache/media-sound/audiotools-3.1.1
index 3308d8f68330..adaab193964b 100644
--- a/metadata/md5-cache/media-sound/audiotools-3.1.1
+++ b/metadata/md5-cache/media-sound/audiotools-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/audiotools/audiotools-3.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42ee69f0bbfc3866f603d14ab3d73247
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 f522ca195e47..a7ed75c31320 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83a36c4b4bb7f7538683b72123b57d46
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index 2b7844919567..4b967b3f1c07 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0f587e6486989a6e86b4bd769c45cbc
diff --git a/metadata/md5-cache/media-sound/cd-discid-1.4 b/metadata/md5-cache/media-sound/cd-discid-1.4
index f2f81af7ce39..c3df6a38caba 100644
--- a/metadata/md5-cache/media-sound/cd-discid-1.4
+++ b/metadata/md5-cache/media-sound/cd-discid-1.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=returns the disc id for the cd in the cd-rom drive
 EAPI=5
 HOMEPAGE=https://github.com/taem/cd-discid
-KEYWORDS=~alpha amd64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/taem/cd-discid/archive/upstream/1.4.tar.gz -> cd-discid-1.4.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44a830c55058696de0ffbccefc1fbc26
+_md5_=447416c9fbb4d58754598903a0b1bfac
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.4 b/metadata/md5-cache/media-sound/deadbeef-1.8.4
deleted file mode 100644
index 5d7d92b1bdd5..000000000000
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
-EAPI=7
-HOMEPAGE=https://deadbeef.sourceforge.io/
-IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
-SLOT=0
-SRC_URI=https://github.com/DeaDBeeF-Player/deadbeef/archive/1.8.4.tar.gz -> deadbeef-1.8.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c3676955075713c4f1685d758c9fbc5
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.4-r1 b/metadata/md5-cache/media-sound/deadbeef-1.8.4-r1
new file mode 100644
index 000000000000..5557f543e5eb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
+EAPI=7
+HOMEPAGE=https://deadbeef.sourceforge.io/
+IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
+SLOT=0
+SRC_URI=https://github.com/DeaDBeeF-Player/deadbeef/archive/1.8.4.tar.gz -> deadbeef-1.8.4.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2eac875e5dd19286c3dd80180b09039d
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1 b/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1
deleted file mode 100644
index ec7c02dea636..000000000000
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
-EAPI=7
-HOMEPAGE=https://deadbeef.sourceforge.io/
-IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch )
-REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
-SLOT=0
-SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.7.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53ea1157fc771b75851f3341b785016f
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.7-r2 b/metadata/md5-cache/media-sound/deadbeef-1.8.7-r2
new file mode 100644
index 000000000000..b9774e23a17c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.7-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
+EAPI=7
+HOMEPAGE=https://deadbeef.sourceforge.io/
+IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch )
+REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
+SLOT=0
+SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.7.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f21f248badc22b0a40220eea04f4c742
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.8 b/metadata/md5-cache/media-sound/deadbeef-1.8.8
deleted file mode 100644
index fdbe76eb7f99..000000000000
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
-EAPI=7
-HOMEPAGE=https://deadbeef.sourceforge.io/
-IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch )
-REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
-SLOT=0
-SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.8.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53ea1157fc771b75851f3341b785016f
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.8-r1 b/metadata/md5-cache/media-sound/deadbeef-1.8.8-r1
new file mode 100644
index 000000000000..676024279577
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
+EAPI=7
+HOMEPAGE=https://deadbeef.sourceforge.io/
+IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch )
+REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
+SLOT=0
+SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.8.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f21f248badc22b0a40220eea04f4c742
diff --git a/metadata/md5-cache/media-sound/din-51.1.1 b/metadata/md5-cache/media-sound/din-51.1.1
new file mode 100644
index 000000000000..76db7ccc7aa8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/din-51.1.1
@@ -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 postinst postrm preinst prepare
+DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=a software musical instrument and audio synthesizer
+EAPI=7
+HOMEPAGE=https://dinisnoise.org/
+IUSE=+alsa jack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+REQUIRED_USE=|| ( alsa jack )
+SLOT=0
+SRC_URI=https://archive.org/download/dinisnoise_source_code/din-51.1.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ee2930acde8dff52b522b1b30333a2a3
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3-r2 b/metadata/md5-cache/media-sound/easytag-2.4.3-r2
index 12539bfe99e8..8791fe1ca5c7 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3-r2
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/EasyTAG
 IUSE=flac mp3 mp4 nautilus opus speex test vorbis wavpack
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4:= ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) nautilus? ( gnome-base/nautilus ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
 REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.3.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9438990b8640cc1811125a01b9445b49
+_md5_=cce6128009e0cc8256f217af2ada173d
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.1.3 b/metadata/md5-cache/media-sound/frescobaldi-3.1.3
index 23b63eb18673..73cbf321fddf 100644
--- a/metadata/md5-cache/media-sound/frescobaldi-3.1.3
+++ b/metadata/md5-cache/media-sound/frescobaldi-3.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_pyt
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a8ab118b986163e074564c968a9acddf
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1 b/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
index 43693b84508f..ef86acd51535 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.16-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://github.com/gpodder/gpodder/archive/3.10.16.tar.gz -> gpodder-3.10.16.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=622fa9151e81b616620111e9f84616b3
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.20 b/metadata/md5-cache/media-sound/gpodder-3.10.20
index c0d65e4a3290..ea0bdeb52bb4 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	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 fc9ed4461aa1..28ba76473965 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/id3-0.15-r1 b/metadata/md5-cache/media-sound/id3-0.15-r1
index 51a52f645b86..f7f265b2bc25 100644
--- a/metadata/md5-cache/media-sound/id3-0.15-r1
+++ b/metadata/md5-cache/media-sound/id3-0.15-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile prepare
 DESCRIPTION=changes the id3 tag in an mp3 file
 EAPI=6
 HOMEPAGE=http://lly.org/~rcw/abcde/page
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lly.org/~rcw/id3/id3_0.15.orig.tar.gz -> id3-0.15.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46a992ae75cc5d0bb7da3d87352f787c
+_md5_=f0a37860af3d15de363fedd64910a397
diff --git a/metadata/md5-cache/media-sound/id3v2-0.1.12-r1 b/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
index cf6d35403c49..8a3d0e339ff6 100644
--- a/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
+++ b/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/id3lib
 DESCRIPTION=A command line editor for id3v2 tags
 EAPI=7
 HOMEPAGE=http://id3v2.sourceforge.net/
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/id3lib
 SLOT=0
 SRC_URI=mirror://sourceforge/id3v2/id3v2-0.1.12.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08a71cf41a0e9dfaebc65ef8876f3835
+_md5_=42bfbd16888c07dbf9284729848c5e6a
diff --git a/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220-r1 b/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220-r1
index 471691b6966e..05fb2edc179d 100644
--- a/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220-r1
+++ b/metadata/md5-cache/media-sound/jack-4.0.0_pre20201220-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/python-discid[python_target
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jack-cli-cd-ripper/jack/archive/5f3e5f43f476b0d506144c103eb8d4edf76fc5de.tar.gz -> jack-4.0.0_pre20201220.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1dca772769b0227ab2d9814dd53b57b8
diff --git a/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1 b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
index b27ed732bc24..ad1bcd4026cc 100644
--- a/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
+++ b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Monkey's Audio Codecs
 EAPI=7
 HOMEPAGE=http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php
 IUSE=cpu_flags_x86_mmx static-libs
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=mac
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b702f649fc4a33505e07684a2b4b2354
+_md5_=37c201af0c9738bfb6c1ff0199efb0e4
diff --git a/metadata/md5-cache/media-sound/marrie-0.4 b/metadata/md5-cache/media-sound/marrie-0.4
index 7317a7262b38..6b94a88c6241 100644
--- a/metadata/md5-cache/media-sound/marrie-0.4
+++ b/metadata/md5-cache/media-sound/marrie-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marrie/marrie-0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a65a5d88bb2bd377316a18c361b04307
diff --git a/metadata/md5-cache/media-sound/marrie-9999 b/metadata/md5-cache/media-sound/marrie-9999
index 9e9b4d7c6b01..06eb4dccc5bc 100644
--- a/metadata/md5-cache/media-sound/marrie-9999
+++ b/metadata/md5-cache/media-sound/marrie-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a65a5d88bb2bd377316a18c361b04307
diff --git a/metadata/md5-cache/media-sound/mp3gain-1.6.2 b/metadata/md5-cache/media-sound/mp3gain-1.6.2
index c1116c595c2e..52da5f7c6a0f 100644
--- a/metadata/md5-cache/media-sound/mp3gain-1.6.2
+++ b/metadata/md5-cache/media-sound/mp3gain-1.6.2
@@ -4,10 +4,10 @@ DEPEND=media-sound/mpg123
 DESCRIPTION=A program to analyze and adjust MP3 files to same volume
 EAPI=7
 HOMEPAGE=http://mp3gain.sourceforge.net/
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=media-sound/mpg123
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b46eb3570fccac333655f29c730c06ca
+_md5_=0c5434a7d7a6635d036b148f87329682
diff --git a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2 b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
index 0c730fcfba4d..ff114f2825c5 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
+++ b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pafy[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mps-youtube/mps-youtube-0.2.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd4d48b630b5349f269c70195acbf5d9
diff --git a/metadata/md5-cache/media-sound/mps-youtube-9999 b/metadata/md5-cache/media-sound/mps-youtube-9999
index 735ee78e8efa..c1a07af0a7cb 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-9999
+++ b/metadata/md5-cache/media-sound/mps-youtube-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pafy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-video/ffmpeg || ( media-video/mpv media-video/mplayer ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd4d48b630b5349f269c70195acbf5d9
diff --git a/metadata/md5-cache/media-sound/normalize-0.7.7-r1 b/metadata/md5-cache/media-sound/normalize-0.7.7-r1
index c57180dfb91a..a084f73215e7 100644
--- a/metadata/md5-cache/media-sound/normalize-0.7.7-r1
+++ b/metadata/md5-cache/media-sound/normalize-0.7.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Audio file volume normalizer
 EAPI=7
 HOMEPAGE=http://normalize.nongnu.org/
 IUSE=audiofile mad nls
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=audiofile? ( media-libs/audiofile:= ) mad? ( media-libs/libmad:= )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2 https://dev.gentoo.org/~radhermit/distfiles/normalize-0.7.7-m4.patch.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e4f3b78c770ae20eba61813f3a7af00
+_md5_=dd03adf38e88d410fbc0270bd098d4d5
diff --git a/metadata/md5-cache/media-sound/opus-tools-0.2 b/metadata/md5-cache/media-sound/opus-tools-0.2
index a951cb3ffa41..f5ec73a12485 100644
--- a/metadata/md5-cache/media-sound/opus-tools-0.2
+++ b/metadata/md5-cache/media-sound/opus-tools-0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Royalty-free, highly versatile audio codec
 EAPI=7
 HOMEPAGE=https://opus-codec.org/
 IUSE=flac
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=>=media-libs/libogg-1.3.0 >=media-libs/libopusenc-0.2 >=media-libs/opus-1.1 >=media-libs/opusfile-0.5 flac? ( >=media-libs/flac-1.1.3 )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opus-tools-0.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e917c97689e15a2ef7bab53365dd5f77
+_md5_=2d00b7634d4e0c8d89acfacca02dcdc5
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.16.0 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.16.0
deleted file mode 100644
index 6bf540282c92..000000000000
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib]
-DESCRIPTION=Qt GUI Pulseaudio Mixer
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib] !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/pavucontrol-qt/releases/download/0.16.0/pavucontrol-qt-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3bb335b71f3c76cf06b124a6d8d8f9f
diff --git a/metadata/md5-cache/media-sound/picard-2.6.2 b/metadata/md5-cache/media-sound/picard-2.6.2
deleted file mode 100644
index 5f495832229d..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( dev-qt/linguist-tools:5 ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cross-platform music tagger
-EAPI=7
-HOMEPAGE=https://picard.musicbrainz.org
-IUSE=discid fingerprints nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] ) dev-qt/qtgui:5 media-libs/mutagen discid? ( dev-python/python-discid ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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
-SLOT=0
-SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.6.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4dd79522e0e7d0ddeaeb2fac5a967b55
diff --git a/metadata/md5-cache/media-sound/picard-2.6.3 b/metadata/md5-cache/media-sound/picard-2.6.3
index 7391e905f670..af380bbc9c0c 100644
--- a/metadata/md5-cache/media-sound/picard-2.6.3
+++ b/metadata/md5-cache/media-sound/picard-2.6.3
@@ -4,12 +4,12 @@ DESCRIPTION=Cross-platform music tagger
 EAPI=8
 HOMEPAGE=https://picard.musicbrainz.org
 IUSE=discid fingerprints nls test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] discid? ( dev-python/python-discid[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] discid? ( dev-python/python-discid[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.6.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a31d2a0f6e49e3355e533e071f0b0e16
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5ed4b28a328c51d2cabc29c5c1b32a87
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index ed5ea9ce91b1..a576af02dd1d 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=09048aafffdb588529cd89d6341f6c64
diff --git a/metadata/md5-cache/media-sound/puddletag-2.0.1-r1 b/metadata/md5-cache/media-sound/puddletag-2.0.1-r1
index 8c8b4e007ff2..728a88342eae 100644
--- a/metadata/md5-cache/media-sound/puddletag-2.0.1-r1
+++ b/metadata/md5-cache/media-sound/puddletag-2.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/configobj-5.0[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/puddletag/puddletag/releases/download/2.0.1/puddletag-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=98652bc8adcd05c8452528a08c5efbed
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-15.0 b/metadata/md5-cache/media-sound/pulseaudio-daemon-15.0
index 3b1413271e84..38d4a722d4bf 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-15.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-15.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-15.0[glib?,systemd?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=>=media-libs/libpulse-15.0[glib?,systemd?,tcpd?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -8,10 +8,10 @@ IUSE=+alsa +alsa-plugin +asyncns bluetooth dbus elogind equalizer +gdbm gstreame
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-15.0[glib?,systemd?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) virtual/tmpfiles
+RDEPEND=>=media-libs/libpulse-15.0[glib?,systemd?,tcpd?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) virtual/tmpfiles
 REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) ?? ( elogind systemd ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 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	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ecb4667edf23a8ad8ae674022368722
+_md5_=5c42aa1186cf88ba4aa6803c0b71b233
diff --git a/metadata/md5-cache/media-sound/pulsemixer-1.5.1 b/metadata/md5-cache/media-sound/pulsemixer-1.5.1
index fc806afd13c7..28442f669daf 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-1.5.1
+++ b/metadata/md5-cache/media-sound/pulsemixer-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=media-sound/pulseaudio python_targets_python3_8? ( dev-lang/python:3.8[n
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/GeorgeFilipkin/pulsemixer/archive/1.5.1.tar.gz -> pulsemixer-1.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2e5568eb36e5fa5490d89d2f2ca4102
diff --git a/metadata/md5-cache/media-sound/pulsemixer-9999 b/metadata/md5-cache/media-sound/pulsemixer-9999
index 2b0e4743e758..345d8c9f3770 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-9999
+++ b/metadata/md5-cache/media-sound/pulsemixer-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=media-sound/pulseaudio python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=35d6ba16ee6739afeae5e7afe7a66b9a
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.4.0 b/metadata/md5-cache/media-sound/quodlibet-4.4.0
index 3627915689f0..d6b0785a9045 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.4.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.4.0.tar.gz -> quodlibet-4.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=81d6052298791d75d85a80deba0867e7
diff --git a/metadata/md5-cache/media-sound/sonata-1.7.0 b/metadata/md5-cache/media-sound/sonata-1.7.0
index 874426c11b40..7f748885c1a4 100644
--- a/metadata/md5-cache/media-sound/sonata-1.7.0
+++ b/metadata/md5-cache/media-sound/sonata-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/multani/sonata/archive/refs/tags/v1.7.0.tar.gz -> sonata-1.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=298c4121e56473e56b5f98e25a71dce5
diff --git a/metadata/md5-cache/media-sound/vorbis-tools-1.4.2 b/metadata/md5-cache/media-sound/vorbis-tools-1.4.2
index 7d707ff40c62..bb6546ed6e79 100644
--- a/metadata/md5-cache/media-sound/vorbis-tools-1.4.2
+++ b/metadata/md5-cache/media-sound/vorbis-tools-1.4.2
@@ -5,9 +5,9 @@ DESCRIPTION=Tools for using the Ogg Vorbis sound file format
 EAPI=7
 HOMEPAGE=https://xiph.org/vorbis/
 IUSE=flac kate nls +ogg123 speex
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/libvorbis media-libs/opusfile flac? ( media-libs/flac ) kate? ( media-libs/libkate ) ogg123? ( media-libs/libao net-misc/curl ) speex? ( media-libs/speex )
 SLOT=0
 SRC_URI=https://ftp.osuosl.org/pub/xiph/releases/vorbis/vorbis-tools-1.4.2.tar.gz
-_md5_=fc08e915c5f011ac07b419356ccabd7c
+_md5_=ea363ff44a634c5f0df99f9549a3fd86
diff --git a/metadata/md5-cache/media-sound/vorbisgain-0.37-r2 b/metadata/md5-cache/media-sound/vorbisgain-0.37-r2
index bcf905fe77c3..504d78345b50 100644
--- a/metadata/md5-cache/media-sound/vorbisgain-0.37-r2
+++ b/metadata/md5-cache/media-sound/vorbisgain-0.37-r2
@@ -3,9 +3,9 @@ DEPEND=media-libs/libogg media-libs/libvorbis
 DESCRIPTION=Calculator of perceived sound level for Ogg Vorbis files
 EAPI=6
 HOMEPAGE=https://sjeng.org/vorbisgain.html
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/libogg media-libs/libvorbis
 SLOT=0
 SRC_URI=https://sjeng.org/ftp/vorbis/vorbisgain-0.37.tar.gz
-_md5_=70df6e550f0815d7dcefeabd063703e6
+_md5_=765b7df86c92155e684c3283eb806ddc
diff --git a/metadata/md5-cache/media-sound/whipper-0.10.0 b/metadata/md5-cache/media-sound/whipper-0.10.0
index c77092df8c49..37b54c07fdba 100644
--- a/metadata/md5-cache/media-sound/whipper-0.10.0
+++ b/metadata/md5-cache/media-sound/whipper-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whipper-team/whipper/archive/v0.10.0.tar.gz -> whipper-0.10.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee663e35b33a93e10ba9d794cd0ee2d9
diff --git a/metadata/md5-cache/media-sound/whipper-0.9.0 b/metadata/md5-cache/media-sound/whipper-0.9.0
index 245dbef284f6..bb5ee60d6025 100644
--- a/metadata/md5-cache/media-sound/whipper-0.9.0
+++ b/metadata/md5-cache/media-sound/whipper-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whipper-team/whipper/archive/v0.9.0.tar.gz -> whipper-0.9.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=545db0cd7f9b1eb763ddf69c28235172
diff --git a/metadata/md5-cache/media-sound/xwax-1.8 b/metadata/md5-cache/media-sound/xwax-1.8
index 39075a8140dd..841b3a9e1523 100644
--- a/metadata/md5-cache/media-sound/xwax-1.8
+++ b/metadata/md5-cache/media-sound/xwax-1.8
@@ -4,11 +4,11 @@ DESCRIPTION=Digital vinyl emulation software
 EAPI=7
 HOMEPAGE=https://xwax.org/
 IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 ) acct-group/xwax
 REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
 SLOT=0
 SRC_URI=https://xwax.org/releases/xwax-1.8.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=33a25434ae59886221ad2d5b9700753e
+_md5_=ac4a7f56f2658a5e1f2bd22879022c1f
diff --git a/metadata/md5-cache/media-sound/yoshimi-2.0.2 b/metadata/md5-cache/media-sound/yoshimi-2.0.2
deleted file mode 100644
index e587beadeed0..000000000000
--- a/metadata/md5-cache/media-sound/yoshimi-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Software synthesizer based on ZynAddSubFX
-EAPI=7
-HOMEPAGE=https://yoshimi.github.io/
-IUSE=+lv2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.0.2.tar.gz -> yoshimi-2.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b2b2374644857694490ce47b7251054
diff --git a/metadata/md5-cache/media-sound/yoshimi-2.1.0-r1 b/metadata/md5-cache/media-sound/yoshimi-2.1.0-r1
index 5db8e15fe481..6b22472d84aa 100644
--- a/metadata/md5-cache/media-sound/yoshimi-2.1.0-r1
+++ b/metadata/md5-cache/media-sound/yoshimi-2.1.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Software synthesizer based on ZynAddSubFX
 EAPI=7
 HOMEPAGE=https://yoshimi.github.io/
 IUSE=+lv2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.1.0.tar.gz -> yoshimi-2.1.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=86aeeaa860c19a81e1f741dbf0027e61
+_md5_=747364b6bbd6f9e3622cc9fae8c7afbc
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 901b1f508dfc..8bd2314c9c6e 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/tvnamer-2.5 b/metadata/md5-cache/media-tv/tvnamer-2.5
index 93a3d5aa0e8e..40d0c9962a41 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.5
+++ b/metadata/md5-cache/media-tv/tvnamer-2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python3_8(-)?] python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-2.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=921f18be3f968e7dc636989bf21226bb
diff --git a/metadata/md5-cache/media-tv/tvnamer-3.0.2 b/metadata/md5-cache/media-tv/tvnamer-3.0.2
index 372c1378d0ff..2996306f845f 100644
--- a/metadata/md5-cache/media-tv/tvnamer-3.0.2
+++ b/metadata/md5-cache/media-tv/tvnamer-3.0.2
@@ -10,5 +10,5 @@ RDEPEND==dev-python/tvdb_api-3*[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8d6983ca3bda366e3231b1ac3b1c4c7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index aeab3a888af6..436a87d85b49 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/atomicparsley-0.9.0 b/metadata/md5-cache/media-video/atomicparsley-0.9.0
index b36ddc1cc7c7..dc7a5c3f2c91 100644
--- a/metadata/md5-cache/media-video/atomicparsley-0.9.0
+++ b/metadata/md5-cache/media-video/atomicparsley-0.9.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Command line program for manipulating iTunes-style metadata in MPEG4 files
 EAPI=7
 HOMEPAGE=http://atomicparsley.sourceforge.net
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/atomicparsley/AtomicParsley-source-0.9.0.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=810b829670ee661dccd292ff8938c3b4
+_md5_=44398edf6e29a2e61b1687ce97450a45
diff --git a/metadata/md5-cache/media-video/atomicparsley-wez-0.9.6 b/metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
index ab07463958a7..91a18b764a58 100644
--- a/metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
+++ b/metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib !media-video/atomicparsley sys-devel/gnuconfig >=app-portag
 DESCRIPTION=command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files
 EAPI=5
 HOMEPAGE=https://github.com/wez/atomicparsley
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !media-video/atomicparsley
 SLOT=0
 SRC_URI=https://bitbucket.org/wez/atomicparsley/get/0.9.6.tar.bz2 -> atomicparsley-wez-0.9.6.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46494eb71c3f88f8394d8572a449a043
+_md5_=d994bb1d2fb76bd5df5bc6ed184ea28e
diff --git a/metadata/md5-cache/media-video/devedeng-4.16.0-r1 b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
index 2c15291ae3e8..13c009e6b6ff 100644
--- a/metadata/md5-cache/media-video/devedeng-4.16.0-r1
+++ b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_8(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=533b74ad30abd34329d5e618a25b844f
diff --git a/metadata/md5-cache/media-video/gaupol-1.8-r2 b/metadata/md5-cache/media-video/gaupol-1.8-r2
index 725c76c46373..f855c9e3aa87 100644
--- a/metadata/md5-cache/media-video/gaupol-1.8-r2
+++ b/metadata/md5-cache/media-video/gaupol-1.8-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1edace8e91ba8836af601d208f4ee095
diff --git a/metadata/md5-cache/media-video/gaupol-1.9 b/metadata/md5-cache/media-video/gaupol-1.9
index a7eccafbf4c4..6ff6e40216c0 100644
--- a/metadata/md5-cache/media-video/gaupol-1.9
+++ b/metadata/md5-cache/media-video/gaupol-1.9
@@ -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/otsaloma/gaupol/archive/1.9.tar.gz -> gaupol-1.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6bbb9a80d82ce220bd802f9359d8b4a9
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.3-r1 b/metadata/md5-cache/media-video/handbrake-1.3.3-r1
deleted file mode 100644
index 8a37cabcbb2a..000000000000
--- a/metadata/md5-cache/media-video/handbrake-1.3.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/nasm dev-util/intltool
-DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
-EAPI=7
-HOMEPAGE=http://handbrake.fr/
-IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-REQUIRED_USE=^^ ( fdk libav-aac )
-SLOT=0
-SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.3/HandBrake-1.3.3-source.tar.bz2 -> handbrake-1.3.3.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6f597c3c27cb6e8144680289a76bb373
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.3-r2 b/metadata/md5-cache/media-video/handbrake-1.3.3-r2
new file mode 100644
index 000000000000..51a25c1b5ccc
--- /dev/null
+++ b/metadata/md5-cache/media-video/handbrake-1.3.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/nasm dev-util/intltool
+DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
+EAPI=7
+HOMEPAGE=http://handbrake.fr/
+IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+REQUIRED_USE=^^ ( fdk libav-aac )
+SLOT=0
+SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.3/HandBrake-1.3.3-source.tar.bz2 -> handbrake-1.3.3.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8aeb4ede5ca7ffee40ea18b77b71307
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index cbac05ddc4e7..190fd5310be8 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-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]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/nasm dev-util/intltool
+DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/nasm dev-util/intltool
 DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
 EAPI=7
 HOMEPAGE=http://handbrake.fr/
 IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa74e18a0825d8490e586c824f3fcf4d
+_md5_=59ffe80ae0ab338fc2f1e8e4a51b5883
diff --git a/metadata/md5-cache/media-video/lsdvd-0.17 b/metadata/md5-cache/media-video/lsdvd-0.17
index 4e19d7c6fefc..1b260270a8f6 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.17
+++ b/metadata/md5-cache/media-video/lsdvd-0.17
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
-DEPEND=media-libs/libdvdread: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
+DEPEND=media-libs/libdvdread:0=
 DESCRIPTION=Utility for getting info out of DVDs
-EAPI=5
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/lsdvd/
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/lsdvd/lsdvd-0.17.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=697840026323db5759fa685e909a0ab8
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff9155b81a69a37e4051d0208c3b4d38
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.2.1 b/metadata/md5-cache/media-video/mjpegtools-2.2.1
new file mode 100644
index 000000000000..09e900488c7b
--- /dev/null
+++ b/metadata/md5-cache/media-video/mjpegtools-2.2.1
@@ -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=compile configure install postinst prepare test
+DEPEND=virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 virtual/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
+DESCRIPTION=Tools for MJPEG video
+EAPI=7
+HOMEPAGE=http://mjpeg.sourceforge.net/
+IUSE=cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdlgfx? ( media-libs/sdl-gfx ) )
+REQUIRED_USE=sdlgfx? ( sdl )
+SLOT=1/2.2
+SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.2.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=764cb451f8bc35657064e18638482e4f
diff --git a/metadata/md5-cache/media-video/obs-studio-26.1.2-r1 b/metadata/md5-cache/media-video/obs-studio-26.1.2-r1
deleted file mode 100644
index c99b4a359ae1..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-26.1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) 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] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=7
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) 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] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://github.com/obsproject/obs-studio/archive/26.1.2.tar.gz -> obs-studio-26.1.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=71b673411cb88440c71cbc3fde93c2c2
diff --git a/metadata/md5-cache/media-video/obs-studio-26.1.2-r2 b/metadata/md5-cache/media-video/obs-studio-26.1.2-r2
new file mode 100644
index 000000000000..c822a1df1e70
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-26.1.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/jansson-2.5:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) 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] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=7
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.5:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) 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] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/obsproject/obs-studio/archive/26.1.2.tar.gz -> obs-studio-26.1.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=355d61e1a424d06e1d9fcffa16479161
diff --git a/metadata/md5-cache/media-video/obs-studio-27.0.1 b/metadata/md5-cache/media-video/obs-studio-27.0.1
deleted file mode 100644
index 4c9c0b1e9954..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-27.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=7
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
-REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/obsproject/obs-studio/archive/27.0.1.tar.gz -> obs-studio-27.0.1.tar.gz browser? ( https://github.com/obsproject/obs-browser/archive/f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz -> obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz ) browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_4280_linux64.tar.bz2 )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eca6a7fa3cc458dca0e38300919869ef
diff --git a/metadata/md5-cache/media-video/obs-studio-27.0.1-r1 b/metadata/md5-cache/media-video/obs-studio-27.0.1-r1
new file mode 100644
index 000000000000..477fde19d6b3
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-27.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=7
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://github.com/obsproject/obs-studio/archive/27.0.1.tar.gz -> obs-studio-27.0.1.tar.gz browser? ( https://github.com/obsproject/obs-browser/archive/f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz -> obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz ) browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_4280_linux64.tar.bz2 )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2a8dea366f85375531d795c8f2d712ec
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index d0ab560ee942..55fd6c308fc8 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -1,15 +1,15 @@
 BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=7
 HOMEPAGE=https://obsproject.com
 IUSE=+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
+RDEPEND=dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) 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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_4280_linux64.tar.bz2 )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eca6a7fa3cc458dca0e38300919869ef
+_md5_=2a8dea366f85375531d795c8f2d712ec
diff --git a/metadata/md5-cache/media-video/openshot-2.6.0 b/metadata/md5-cache/media-video/openshot-2.6.0
index 5d51a2badd1a..54e463021b88 100644
--- a/metadata/md5-cache/media-video/openshot-2.6.0
+++ b/metadata/md5-cache/media-video/openshot-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/httplib2[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.6.0.tar.gz -> openshot-2.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ec77da1b311dbcad67243832238b1e8f
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.36 b/metadata/md5-cache/media-video/pipewire-0.3.36
index 021190117118..4b7f883cb22a 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.36
+++ b/metadata/md5-cache/media-video/pipewire-0.3.36
@@ -5,7 +5,7 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.36/pipewire-0.3.36.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=5bb5109590c9c143d54e9b4480275a50
+_md5_=e874f5561adc9bd8144c0c3277f0f688
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.38 b/metadata/md5-cache/media-video/pipewire-0.3.38
new file mode 100644
index 000000000000..cae1ed9d5fe1
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.38
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman >=dev-util/meson-0.59 virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=jack-sdk? ( !jack-client )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.38/pipewire-0.3.38.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=d96b85ee630d1cde0a32f2c59c2126c5
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index d5e5bc3eccab..adce70a19c94 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-doc/xmltoman >=dev-util/meson-0.59 virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT LGPL-2.1+ GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[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] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=2a1bd9d09a0f88b778eb5a856aac5240
+_md5_=571fc6bc391f52f35ffbaf03e6686f98
diff --git a/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1 b/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
index 3d0bfefd721a..96cccfb9cb73 100644
--- a/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
+++ b/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
@@ -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 )
 SLOT=0
 SRC_URI=https://github.com/timothycrosley/streamdeck-ui/archive/9b6678d2d3027963ddac147ee3aeda322ec77f29.tar.gz -> streamdeck-ui-0.0_p20200102.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=575092086f18a2c61e230c2cb1e30631
diff --git a/metadata/md5-cache/media-video/streamdeck-ui-9999 b/metadata/md5-cache/media-video/streamdeck-ui-9999
index 1736e7479b55..3d9f446eab3c 100644
--- a/metadata/md5-cache/media-video/streamdeck-ui-9999
+++ b/metadata/md5-cache/media-video/streamdeck-ui-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 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pynput[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,designer] media-libs/elgato-streamdeck[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/hidapi python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=575092086f18a2c61e230c2cb1e30631
diff --git a/metadata/md5-cache/media-video/subliminal-2.1.0-r1 b/metadata/md5-cache/media-video/subliminal-2.1.0-r1
index eb18b121c732..9b1a15b22103 100644
--- a/metadata/md5-cache/media-video/subliminal-2.1.0-r1
+++ b/metadata/md5-cache/media-video/subliminal-2.1.0-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/Diaoul/subliminal/archive/2.1.0.tar.gz -> subliminal-2.1.0.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=349ed16532e98e34bbd42ade6d1bf11c
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 1c964f505099..c72dc661fa26 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd03a11fdad0b82aabf57dbfd6c3e4fc
diff --git a/metadata/md5-cache/media-video/vcsi-7-r2 b/metadata/md5-cache/media-video/vcsi-7-r2
index 97491d57f223..1122a25bf3c0 100644
--- a/metadata/md5-cache/media-video/vcsi-7-r2
+++ b/metadata/md5-cache/media-video/vcsi-7-r2
@@ -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/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee185fdab615aa343f9c8428359d90b5
diff --git a/metadata/md5-cache/media-video/vcsi-7.0.13 b/metadata/md5-cache/media-video/vcsi-7.0.13
index 89647a7b3d72..46831a3069a6 100644
--- a/metadata/md5-cache/media-video/vcsi-7.0.13
+++ b/metadata/md5-cache/media-video/vcsi-7.0.13
@@ -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/amietn/vcsi/archive/7c974f7396a5c6e459f7c6033674ad7144e820a8.tar.gz -> vcsi-7.0.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e70635f32df78000f44f95ecac410cb9
diff --git a/metadata/md5-cache/media-video/vidcutter-6.0.5 b/metadata/md5-cache/media-video/vidcutter-6.0.5
index d348db8a81fd..c985ae8e17ef 100644
--- a/metadata/md5-cache/media-video/vidcutter-6.0.5
+++ b/metadata/md5-cache/media-video/vidcutter-6.0.5
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,wi
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ozmartian/vidcutter/archive/6.0.5.tar.gz -> vidcutter-6.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad1cb1851f61ca341e923a920db2e3aa
diff --git a/metadata/md5-cache/media-video/vidcutter-6.0.5.1 b/metadata/md5-cache/media-video/vidcutter-6.0.5.1
new file mode 100644
index 000000000000..909182170673
--- /dev/null
+++ b/metadata/md5-cache/media-video/vidcutter-6.0.5.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) 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=>=media-video/mpv-0.25[libmpv] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI
+EAPI=7
+HOMEPAGE=http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-video/ffmpeg[X,encode] media-video/mediainfo python_targets_python3_8? ( dev-lang/python: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 )
+SLOT=0
+SRC_URI=https://github.com/ozmartian/vidcutter/archive/6.0.5.1.tar.gz -> vidcutter-6.0.5.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ad1cb1851f61ca341e923a920db2e3aa
diff --git a/metadata/md5-cache/media-video/vidcutter-9999 b/metadata/md5-cache/media-video/vidcutter-9999
index d71c03b80906..025379db9a4a 100644
--- a/metadata/md5-cache/media-video/vidcutter-9999
+++ b/metadata/md5-cache/media-video/vidcutter-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-video/ffmpeg[X,encode] media-video/mediainfo python_targets_python3_8? ( dev-lang/python: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 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad1cb1851f61ca341e923a920db2e3aa
diff --git a/metadata/md5-cache/media-video/vidify-2.2.6 b/metadata/md5-cache/media-video/vidify-2.2.6
index e2e6a741f782..57089b8373cf 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5f999d09040413764ae87b57ff394f89
diff --git a/metadata/md5-cache/media-video/vidify-audiosync-0.3.0 b/metadata/md5-cache/media-video/vidify-audiosync-0.3.0
index 98713f2f2fc2..1ac52702ee85 100644
--- a/metadata/md5-cache/media-video/vidify-audiosync-0.3.0
+++ b/metadata/md5-cache/media-video/vidify-audiosync-0.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/vidify/old-audiosync/archive/v0.3.0.tar.gz -> vidify-audiosync-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fcc869b7096ab3cd13bdf25ef0ce247
diff --git a/metadata/md5-cache/media-video/yle-dl-20210917 b/metadata/md5-cache/media-video/yle-dl-20210917
index 9b3af7f43595..7dbfa251a1ee 100644
--- a/metadata/md5-cache/media-video/yle-dl-20210917
+++ b/metadata/md5-cache/media-video/yle-dl-20210917
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20210917.tar.gz -> yle-dl-20210917.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b65148a02e0a8527c5aec125d7d0f52f
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.5.1 b/metadata/md5-cache/net-analyzer/2ping-4.5.1
index 68ba4d521a08..57110193a470 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.5.1
+++ b/metadata/md5-cache/net-analyzer/2ping-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab3d63659239ce6ec0e847314d5eddae
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b54bfbfebac1..81b2766525c1 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/arping-2.22 b/metadata/md5-cache/net-analyzer/arping-2.22
index 6a909ae4f90c..e61a73ededc4 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.22
+++ b/metadata/md5-cache/net-analyzer/arping-2.22
@@ -5,11 +5,11 @@ DESCRIPTION=A utility to see if a specific IP is taken and what MAC owns it
 EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
 IUSE=test +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] filecaps? ( sys-libs/libcap )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ThomasHabets/arping/archive/arping-2.22.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7318d6e2aa8ce8db6761ea0cfcf4eb4a
+_md5_=03fdde3b47db1d9c769b27a353f945ed
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r5 b/metadata/md5-cache/net-analyzer/carl-0.9-r5
index 8542afc878f4..bf6d5bb486a2 100644
--- a/metadata/md5-cache/net-analyzer/carl-0.9-r5
+++ b/metadata/md5-cache/net-analyzer/carl-0.9-r5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/carl-0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e11a4166ed738f4dc3614c4b3966a382
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
index 35be071f490e..683261e0be0c 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4fe482cc8d57e2dbd0c296df11ca2bac
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r1 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r1
index d7f75c04ed4f..2c01c1125933 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b265a06c39d5b08468385b2bb4c1512
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index 21575bcdbc0d..9573bab551ca 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba4a575866d71153a914d44b5d0e2811
diff --git a/metadata/md5-cache/net-analyzer/flent-1.3.2 b/metadata/md5-cache/net-analyzer/flent-1.3.2
index aec7aa47d449..4c2696da51da 100644
--- a/metadata/md5-cache/net-analyzer/flent-1.3.2
+++ b/metadata/md5-cache/net-analyzer/flent-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python3_8(-)?] ) plots? ( dev-pyt
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tohojo/flent/archive/v1.3.2.tar.gz -> flent-1.3.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4973e7a2f3f5310ee1510fdbf3af062c
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
index 602271b4113b..7985740c26b7 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_8(-)?] ) ldap? ( dev-
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b34121d7cbe89f8ee5086ed2d72f02cd
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.7 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
index ece65c6a0afb..ac798d6e5012 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f5fb45b8b949fb832b2fbf82b2f5112
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1 b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
index a3ac04e013e3..1ebc0be9af38 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v2.0.0.tar.gz -> gvm-tools-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fa27cf442723d25ca63b720ecb399cd
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0 b/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
index 9496271f0ef4..a5e1e69c475c 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v2.1.0.tar.gz -> gvm-tools-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1749dc5700a52bf0981451113d3f110
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-21.1.0 b/metadata/md5-cache/net-analyzer/gvm-tools-21.1.0
index 94f64ff1c43b..28890d7145b0 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-21.1.0
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-21.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v21.1.0.tar.gz -> gvm-tools-21.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a68ac836e470d53173a5f1fe452656cf
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
index b4cf684990c2..536718c95ba8 100644
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A console-based network monitoring utility
 EAPI=7
 HOMEPAGE=https://github.com/iptraf-ng/iptraf-ng
 IUSE=doc
-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=GPL-2 doc? ( FDL-1.1 )
 RDEPEND=>=sys-libs/ncurses-5.7-r7:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iptraf-ng/iptraf-ng/archive/v1.2.1.tar.gz -> iptraf-ng-1.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=def2fb1e9dade58b94f4f296ae4f7eaa
+_md5_=fd4270a297f59a7b97c36c4f0fa709a2
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 948f1c7f971f..868db3425012 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d68e524d3e2f23cde6f0d74b3881a994
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
index d1bfda2d81b0..01dcdb1caea9 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
@@ -4,12 +4,12 @@ DESCRIPTION=Check websites for broken links
 EAPI=7
 HOMEPAGE=https://github.com/linkcheck/linkchecker
 IUSE=sqlite python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[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[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b96356b12d34458036953ba625fee47
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=335cd6fea20faff95f4afd93d29a040c
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index 953e69ed8b0d..e27339a8d13d 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f3885c80273fe28fca175606b5c8ff5
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.94 b/metadata/md5-cache/net-analyzer/mtr-0.94
deleted file mode 100644
index 5c2d01bb92c8..000000000000
--- a/metadata/md5-cache/net-analyzer/mtr-0.94
+++ /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 filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=configure postinst prepare
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= )
-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 ~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	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e147b34df4962f17490fd36b4d322094
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.94-r1 b/metadata/md5-cache/net-analyzer/mtr-0.94-r1
new file mode 100644
index 000000000000..9a3d6639d5c8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/mtr-0.94-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 filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=configure postinst prepare
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) ncurses? ( sys-libs/ncurses:0= )
+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 ~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	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17700d8cb8bbd99f9a5aadd0ede20bef
diff --git a/metadata/md5-cache/net-analyzer/mtr-9999 b/metadata/md5-cache/net-analyzer/mtr-9999
index 8b6206b1b970..01eab3591c6a 100644
--- a/metadata/md5-cache/net-analyzer/mtr-9999
+++ b/metadata/md5-cache/net-analyzer/mtr-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure postinst prepare unpack
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= )
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) ncurses? ( sys-libs/ncurses:0= )
 DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=7
 HOMEPAGE=https://www.bitwizard.nl/mtr/
 IUSE=gtk +ipinfo +ipv6 jansson ncurses +filecaps
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38d6b3e0d322b93d76c2ce216505178c
+_md5_=a5c4265d467a4288f2a908714506e374
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
deleted file mode 100644
index c4ff2e4e9a0c..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Nagios plugin to execute multiple checks in parallel
-EAPI=7
-HOMEPAGE=https://github.com/clarkbox/check_multiple
-IUSE=test python_targets_python3_8
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52f23af7e2a2f59081bdde8cd7f86706
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
index 737b3c320da7..748c937755a0 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=A Nagios plugin to execute multiple checks in parallel
 EAPI=7
 HOMEPAGE=https://github.com/clarkbox/check_multiple
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9fcdfd5d1cd5f661a26b2588948984a
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bea88edabb77d8863dd5c85cd5cc48f6
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
deleted file mode 100644
index 8fc771a65bd2..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
+++ /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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Nagios plugin to check whether an OpenVPN server is alive
-EAPI=7
-HOMEPAGE=https://github.com/liquidat/nagios-icinga-openvpn
-IUSE=python_targets_python3_8
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fc745ca2083d35a75efb61b04766dbb6
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
index e86e87833a0a..3ec178186a6b 100644
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Nagios plugin to check whether an OpenVPN server is alive
 EAPI=7
 HOMEPAGE=https://github.com/liquidat/nagios-icinga-openvpn
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a84946d89c44c4dd33df31adb4c9eb2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dc21043a927487a10010df63c23aba4e
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
index daf911dfb6eb..1f358c63a180 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
@@ -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_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.4.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fad6fe0f8258b648036c0c697b48862
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0 b/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
index 01c152603c07..a3bfbc823d5e 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
@@ -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_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/HenriWahl/Nagstamon/archive/v3.6.0.tar.gz -> nagstamon-3.6.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d64f67420410328bc4fe09e9f6fc1a17
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.1 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.1
index 4aa3277eab6b..af81f24f3c3c 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.1
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.3.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=install nofetch postinst unpack
 DESCRIPTION=A remote security scanner for Linux - agent component
 EAPI=7
 HOMEPAGE=https://www.tenable.com/
-KEYWORDS=~amd64
+KEYWORDS=-* ~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-8.3.1-es8.x86_64.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2e12931b71a140244a9c834d33a1a66
+_md5_=fcfec454484f342f31f1097262af1f42
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.15.2 b/metadata/md5-cache/net-analyzer/nessus-bin-8.15.2
index 69aa3902c69e..b81e7f0fa063 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.15.2
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.15.2
@@ -3,10 +3,10 @@ DEFINED_PHASES=install nofetch postinst unpack
 DESCRIPTION=A remote security scanner for Linux
 EAPI=8
 HOMEPAGE=https://www.tenable.com/
-KEYWORDS=~amd64
+KEYWORDS=-* ~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-8.15.2-es8.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63a0ccfcbb17eef2b02b4831e3944cc7
+_md5_=512b2a2d3ce867f897b56bc72602de53
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
index 3d3d335191d8..130adc68291b 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f931333fde8e5e738938c793eebf3935
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
index 9572f37e7369..71d77017ae4e 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c172cdb121d5118d2df4eb2d9f4dbc79
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
index fa1e37dd9b8d..87526159a0f5 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
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 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	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14dcd0a47a0c0358cc90761f59c53559
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index 4f96547798b0..dee219f385bc 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95d7e525e06239df295800f22e5eed96
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.92 b/metadata/md5-cache/net-analyzer/nmap-7.92
index 3c0183ed5e79..fbc7046a792a 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.92
+++ b/metadata/md5-cache/net-analyzer/nmap-7.92
@@ -5,11 +5,11 @@ DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
 IUSE=ipv6 libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3 verify-sig
-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=|| ( NPSL GPL-2 )
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.92.tar.bz2 verify-sig? ( https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.asc )
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=bd358aeac6aa64b37fe3899fbf46a606
+_md5_=2fedc324f6d2756447b699ab924b64d3
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
index 7aca9f483734..a7fd53cc828c 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=7
 HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
 IUSE=elibc_Darwin
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=202dafe6aca1ed8eafed6a7bcb6a286c
+_md5_=d7a613cb47f4a8bba632193e34655995
diff --git a/metadata/md5-cache/net-analyzer/ospd-2.0.1 b/metadata/md5-cache/net-analyzer/ospd-2.0.1
index 6719b767707e..8de590357dcf 100644
--- a/metadata/md5-cache/net-analyzer/ospd-2.0.1
+++ b/metadata/md5-cache/net-analyzer/ospd-2.0.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/greenbone/ospd/archive/v2.0.1.tar.gz -> ospd-2.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee875052ef6401dddaf0f9e57137f510
diff --git a/metadata/md5-cache/net-analyzer/ospd-20.8.2 b/metadata/md5-cache/net-analyzer/ospd-20.8.2
index 0c86e7948bba..45f447eab931 100644
--- a/metadata/md5-cache/net-analyzer/ospd-20.8.2
+++ b/metadata/md5-cache/net-analyzer/ospd-20.8.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/greenbone/ospd/archive/v20.8.2.tar.gz -> ospd-20.8.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=107ec01b7a50f7506c09757f2d262e46
diff --git a/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1 b/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
index 760a8cb58593..a89cff4bde7e 100644
--- a/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
+++ b/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.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/greenbone/ospd-openvas/archive/v1.0.1.tar.gz -> ospd-openvas-1.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03c4949afea6111fee47e7866530f363
diff --git a/metadata/md5-cache/net-analyzer/ospd-openvas-20.8.1 b/metadata/md5-cache/net-analyzer/ospd-openvas-20.8.1
index 2ac7f598bd3d..fd01e72c637d 100644
--- a/metadata/md5-cache/net-analyzer/ospd-openvas-20.8.1
+++ b/metadata/md5-cache/net-analyzer/ospd-openvas-20.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/greenbone/ospd-openvas/archive/v20.8.1.tar.gz -> ospd-openvas-20.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bf20534bc843989700375c4bc910437
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.6 b/metadata/md5-cache/net-analyzer/pmacct-1.7.6
deleted file mode 100644
index f54047205288..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.7.6
+++ /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=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=7
-HOMEPAGE=http://www.pmacct.net/
-IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
-REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.7.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b1acc3cfd815b327a041accce5eaa09
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r1
deleted file mode 100644
index 98b9fbf18351..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.7.6-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=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=7
-HOMEPAGE=http://www.pmacct.net/
-IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
-REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.7.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f7a3dd18fa4dfc109d16e5bb44c6567
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r2 b/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r2
new file mode 100644
index 000000000000..d386353d782b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r2
@@ -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
+DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+DESCRIPTION=A network tool to gather IP traffic information
+EAPI=7
+HOMEPAGE=http://www.pmacct.net/
+IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
+SLOT=0
+SRC_URI=http://www.pmacct.net/pmacct-1.7.6.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=773a6aeb187016853f094be730b07f42
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r3 b/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r3
new file mode 100644
index 000000000000..899ae27b9714
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.7.6-r3
@@ -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
+DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+DESCRIPTION=A network tool to gather IP traffic information
+EAPI=7
+HOMEPAGE=http://www.pmacct.net/
+IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
+SLOT=0
+SRC_URI=http://www.pmacct.net/pmacct-1.7.6.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1373b2627839d25c99a41d88f39d7017
diff --git a/metadata/md5-cache/net-analyzer/pmacct-999999 b/metadata/md5-cache/net-analyzer/pmacct-999999
index cdeec041d2ac..744d4d06f343 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-999999
+++ b/metadata/md5-cache/net-analyzer/pmacct-999999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+DEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
 DESCRIPTION=A network tool to gather IP traffic information
 EAPI=7
 HOMEPAGE=http://www.pmacct.net/
 IUSE=+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+RDEPEND=dev-libs/libcdada net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson:= ) kafka? ( dev-libs/librdkafka ) mysql? ( dev-db/mysql-connector-c:0= sys-process/numactl ) ndpi? ( >=net-libs/nDPI-3.2:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
 REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c61189dc5718c0283da94b4ee630b66
+_md5_=13d765b1eca9d97c05ff307b6bc9672c
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
index cb7f8711d4c6..95668bc920ab 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
@@ -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(-)?] virtual/pkgconfig
+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(-)?] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Real time correlator of events received by Prelude Manager
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?] dev-python/netaddr[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(-)?] virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-correlator-5.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f1ee2a6a15e6bbef77562a3565bf29d5
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7403232c0b363011cc972dcae55ee007
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.9 b/metadata/md5-cache/net-analyzer/pypacker-4.9
index 8bd371814d16..8df9d870f20a 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.9
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.9
@@ -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 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.9/pypacker-v4.9.tar.gz -> pypacker-4.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=9a7faa3596cfa7e293d1c14cc4eaacd4
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-21.1.3 b/metadata/md5-cache/net-analyzer/python-gvm-21.1.3
index dbea2c6d1c24..52dbf9708315 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-21.1.3
+++ b/metadata/md5-cache/net-analyzer/python-gvm-21.1.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/greenbone/python-gvm/archive/v21.1.3.tar.gz -> python-gvm-21.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=989ff0b6e7e30dffd1cca969f5cc31dc
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
index 5f42d966e4c7..64e6bbdb9302 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7fcc4f0dfa69bfa06449bd49f1240209
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1
index c959c41c2966..71d8613b0826 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) acct-group/scanlog
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d7bc737f7f0c10f93b92cf419463e31
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
index cb240c2b6ee2..fb50ed58a010 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) acct-group/scanlog
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=https://www.openwall.com/scanlogd/scanlogd-2.2.8.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=716b559a68aff0f13044f4a9f1c64a12
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.4-r1 b/metadata/md5-cache/net-analyzer/scapy-2.4.4-r1
index 9c1ba0f24bb6..5225a0913a8b 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.4-r1
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.4.tar.gz -> scapy-2.4.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=63934791d1e9f5e65b5261815fd5ffa6
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.5 b/metadata/md5-cache/net-analyzer/scapy-2.4.5
index ce37b35c0aab..c07885040578 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.5
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.5.tar.gz -> scapy-2.4.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b29b9e024740968f129038056999272
diff --git a/metadata/md5-cache/net-analyzer/scapy-9999 b/metadata/md5-cache/net-analyzer/scapy-9999
index 0c27b66f7557..6aaa7d0efe81 100644
--- a/metadata/md5-cache/net-analyzer/scapy-9999
+++ b/metadata/md5-cache/net-analyzer/scapy-9999
@@ -9,5 +9,5 @@ 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(-)?] >=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
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aee3bf342dd709cb4e93ddf9963ec35d
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.6 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
index ccbfe7556ee5..7d79e191234b 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup4 python
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f6e1ad5fade669d1f6a609ec395d05c
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.8 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
index 4df298e6696d..b4b606e0661e 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup4 python
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f6e1ad5fade669d1f6a609ec395d05c
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.9 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
index 1994e3ba4096..eb1c2822e1fb 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup4 python
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b0332e25d87a009c74c7c97c493a34d
diff --git a/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4 b/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
index a6e861fdb0ff..64ccd30e4a49 100644
--- a/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
+++ b/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/pysnmp-apps >=dev-python/pysnmp-4.2.2[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/etingof/snmpclitools/archive/v0.6.4.tar.gz -> snmpclitools-0.6.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c11b2c01fe4a42632720b4b57bf97a60
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.3 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.3
index a8e6ed93e789..2096c35fb9a5 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.3
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.1.3.tar.gz -> speedtest-cli-2.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44e21bbaf77ca02be8bd7e5cf51cc3e8
diff --git a/metadata/md5-cache/net-analyzer/ssmping-0.9.1 b/metadata/md5-cache/net-analyzer/ssmping-0.9.1
index 0ae3c37fef99..43d594c0f87f 100644
--- a/metadata/md5-cache/net-analyzer/ssmping-0.9.1
+++ b/metadata/md5-cache/net-analyzer/ssmping-0.9.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool for testing multicast connectivity
 EAPI=7
 HOMEPAGE=http://www.venaas.no/multicast/ssmping/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.venaas.no/multicast/ssmping/ssmping-0.9.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9010a3cfd47c858d1eed798eb59c361e
+_md5_=c503d63e425937a59d27fbc5a47f18c4
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.7-r1 b/metadata/md5-cache/net-analyzer/suricata-5.0.7-r1
deleted file mode 100644
index fb7bc4808061..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=7
-HOMEPAGE=https://suricata.io/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.7.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=573b5a626c2abeda643dfdcd2bca22bd
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2 b/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2
new file mode 100644
index 000000000000..039c7a090d15
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson:= dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=7
+HOMEPAGE=https://suricata.io/
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson:= dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.7.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fcdf6625f98cb5ef2382d97fbceaa7f9
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.3-r1 b/metadata/md5-cache/net-analyzer/suricata-6.0.3-r1
deleted file mode 100644
index 7f4bd5b7429c..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=7
-HOMEPAGE=https://suricata.io/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ca98ac54e1f1701c84cc7d2c617e5b0
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2 b/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2
new file mode 100644
index 000000000000..c92defcf767d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson:= dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=7
+HOMEPAGE=https://suricata.io/
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson:= dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss 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_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.38 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) hyperscan? ( dev-libs/hyperscan ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.3.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=84ef2e9117ef7169ca0bf9a18a76d189
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.3 b/metadata/md5-cache/net-analyzer/wapiti-3.0.3
index 51cba152120a..7b37aabef637 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.3
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?] dev-python/lxml[
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d7be3a068093d047716d2f359e201ce
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.4 b/metadata/md5-cache/net-analyzer/wapiti-3.0.4
index e70d3e967e01..4a6422e035da 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.4
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ec360393e9320e4881c79a1c80db141
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.5 b/metadata/md5-cache/net-analyzer/wapiti-3.0.5
index 95ddcc79a293..9c67f51ee0dd 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.5
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ec360393e9320e4881c79a1c80db141
diff --git a/metadata/md5-cache/net-analyzer/wapiti-9999 b/metadata/md5-cache/net-analyzer/wapiti-9999
index 26f5a1b3fcad..77a514818686 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-9999
+++ b/metadata/md5-cache/net-analyzer/wapiti-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6187737cdba4325a3c9cfa6d72f3421
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.8 b/metadata/md5-cache/net-analyzer/wireshark-3.4.8
index 64b9e9f3235f..612a5c12e6e3 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.8
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.8
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp 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 ) ) 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 ) ) plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.4.8
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.8.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=877e6c7d147fa7695c40f108a5d5a038
+_md5_=705d90abc0165acdfac7a8ca39b507fc
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 57868665900a..56a029bf6e35 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/lrzsz-0.12.20-r4 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
index 775e877f357c..f92f82045427 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
@@ -5,9 +5,9 @@ DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer p
 EAPI=7
 HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
 IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79e48f3c82f869db6f9db655e8ea7c27
+_md5_=514a6936a8c1050b4307a3ae2c271912
diff --git a/metadata/md5-cache/net-dialup/minicom-2.8 b/metadata/md5-cache/net-dialup/minicom-2.8
index 6898e27c950a..86731f81ad66 100644
--- a/metadata/md5-cache/net-dialup/minicom-2.8
+++ b/metadata/md5-cache/net-dialup/minicom-2.8
@@ -5,10 +5,10 @@ DESCRIPTION=Serial Communication Program
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/minicom-team/minicom
 IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= net-dialup/lrzsz
 SLOT=0
 SRC_URI=https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/minicom-2.8.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7dde1b2153a85ab02ccffa03e46756c3
+_md5_=a2420dcabfa34cba05099c7459312ad6
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 7326f63aa0fd..c44045320561 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/dnscrypt-proxy-2.1.1 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
new file mode 100644
index 000000000000..fc55ccdb3dfa
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.13 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=7
+HOMEPAGE=https://github.com/DNSCrypt/dnscrypt-proxy
+IUSE=+pie +filecaps
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
+RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy filecaps? ( sys-libs/libcap )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/DNSCrypt/dnscrypt-proxy/archive/2.1.1.tar.gz -> dnscrypt-proxy-2.1.1.tar.gz
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8accf26c2fc6228b6b5bc470696537b5
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-9999 b/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
index fca61ef35021..9f1aea3f704b 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst test unpack
 DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
 EAPI=7
 HOMEPAGE=https://github.com/DNSCrypt/dnscrypt-proxy
-IUSE=pie +filecaps
+IUSE=+pie +filecaps
 LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
 PROPERTIES=live
 RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy filecaps? ( sys-libs/libcap )
 RESTRICT=strip
 SLOT=0
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e3125642486b4502c5c9ee92d05e6193
+_md5_=8accf26c2fc6228b6b5bc470696537b5
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 4aa226788c37..334558fb90ce 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 91592ced965b..741c013808c4 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 979ec8e18d4e..506d8e58c36e 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2bd38a88ca95355e4b247e0e2bfa8e9e
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.4 b/metadata/md5-cache/net-dns/dnsviz-0.9.4
new file mode 100644
index 000000000000..b7209aa0d8b1
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( net-dns/bind ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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=>=dev-python/dnspython-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
+EAPI=8
+HOMEPAGE=https://dnsviz.net/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/m2crypto-0.37.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygraphviz-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.4.tar.gz -> dnsviz-0.9.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea3b59b5b6f245c2e22045766922f050
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 386a4de71d4d..b1bf08d49dc8 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/conntrack-tools-1.4.6-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
index ff3ef613b221..9e88c33aa7c2 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Connection tracking userspace tools
 EAPI=7
 HOMEPAGE=http://conntrack-tools.netfilter.org
 IUSE=doc +cthelper +cttimeout systemd kernel_linux
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.8 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2
 _eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f7bafe47f50e588c5eb41304386642ea
+_md5_=17914775ed64657d8a808a21e657967b
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.8 b/metadata/md5-cache/net-firewall/nftables-0.9.8
deleted file mode 100644
index 2ff6449266bd..000000000000
--- a/metadata/md5-cache/net-firewall/nftables-0.9.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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= ) xtables? ( >=net-firewall/iptables-1.6.1 )
-DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
-EAPI=7
-HOMEPAGE=https://netfilter.org/projects/nftables/
-IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) 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= ) xtables? ( >=net-firewall/iptables-1.6.1 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-SLOT=0
-SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.8.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9860cad000bb67d49d641a32abd1840d
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.8-r1 b/metadata/md5-cache/net-firewall/nftables-0.9.8-r1
new file mode 100644
index 000000000000..f5dc839a1db7
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) 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= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) 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= ) xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.8.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fb2f55e91682ce207a7b4ce26491b986
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index c47515dab684..0839147dfddd 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0080ce8bc553768c006f49fd2dc915ad
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index a6e64013ac6a..6a9a2780a1ac 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.13.10-r1 b/metadata/md5-cache/net-fs/samba-4.13.10-r1
deleted file mode 100644
index 6ece453c68cb..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.13.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.13.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afc034764fce9998c812a34b883f5a74
diff --git a/metadata/md5-cache/net-fs/samba-4.13.10-r2 b/metadata/md5-cache/net-fs/samba-4.13.10-r2
new file mode 100644
index 000000000000..73b5e5830019
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.13.10-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.13.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b3c2d69f030160d4798ecf8ed9c454a
diff --git a/metadata/md5-cache/net-fs/samba-4.13.11 b/metadata/md5-cache/net-fs/samba-4.13.11
deleted file mode 100644
index 6e9ce9ca8b98..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.13.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.13.11.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afc034764fce9998c812a34b883f5a74
diff --git a/metadata/md5-cache/net-fs/samba-4.13.11-r1 b/metadata/md5-cache/net-fs/samba-4.13.11-r1
new file mode 100644
index 000000000000..6668ee89a8f9
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.13.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.13.11.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b3c2d69f030160d4798ecf8ed9c454a
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r2 b/metadata/md5-cache/net-fs/samba-4.13.9-r2
deleted file mode 100644
index 32318a4ac99d..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.13.9-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b66ec76028b340a22cef3163a0a871ba
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r3 b/metadata/md5-cache/net-fs/samba-4.13.9-r3
new file mode 100644
index 000000000000..aecaf846bc14
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.13.9-r3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.1[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3fec50d3d74bc11d0a1c0d0871d5669f
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r1 b/metadata/md5-cache/net-fs/samba-4.14.6-r1
deleted file mode 100644
index 6d54f31e064f..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.14.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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
-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	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=011808e852471d1f784f4b4b914b27d3
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r2 b/metadata/md5-cache/net-fs/samba-4.14.6-r2
new file mode 100644
index 000000000000..bb1f786a55be
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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
+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	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=984eb531ff4305dc3cfff50fae3d8181
diff --git a/metadata/md5-cache/net-fs/samba-4.14.7 b/metadata/md5-cache/net-fs/samba-4.14.7
deleted file mode 100644
index a31a1969d799..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.14.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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
-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.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=011808e852471d1f784f4b4b914b27d3
diff --git a/metadata/md5-cache/net-fs/samba-4.14.7-r1 b/metadata/md5-cache/net-fs/samba-4.14.7-r1
new file mode 100644
index 000000000000..1497e24b8776
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.14.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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
+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.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=984eb531ff4305dc3cfff50fae3d8181
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0 b/metadata/md5-cache/net-fs/samba-4.15.0
deleted file mode 100644
index 978e531a1710..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
-DESCRIPTION=Samba Suite Version 4
-EAPI=7
-HOMEPAGE=https://samba.org/
-IUSE=acl addc ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-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(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11354582ad5aa564c6b9bd8f56b54a62
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0-r1 b/metadata/md5-cache/net-fs/samba-4.15.0-r1
new file mode 100644
index 000000000000..701ced4fbc95
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.15.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+IUSE=acl addc ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+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(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.15.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1821527f9fca9b15705c647074ef3001
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 370b2bfdb3be..ed3db89a15c8 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/atftp-0.7.5 b/metadata/md5-cache/net-ftp/atftp-0.7.5
index 7e086c11fb36..db1c25bb5293 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.7.5
+++ b/metadata/md5-cache/net-ftp/atftp-0.7.5
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced TFTP implementation client/server
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/atftp/
 IUSE=selinux tcpd readline pcre
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre? ( dev-libs/libpcre ) !net-ftp/tftp-hpa !net-ftp/uftpd selinux? ( sec-policy/selinux-tftp )
 SLOT=0
 SRC_URI=mirror://sourceforge/atftp/atftp-0.7.5.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a28f5a9107404c47742bb9821c829b3
+_md5_=4ca79ac3390249ab666cc9c6dbb194d5
diff --git a/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1 b/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
new file mode 100644
index 000000000000..63761f4b7ce5
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/grep
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2:= readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Standard Linux FTP client
+EAPI=7
+HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
+IUSE=ipv6 readline ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.2:= readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/netkit-ftp-0.17.tar.gz mirror://debian/pool/main/n/netkit-ftp-ssl/netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz https://dev.gentoo.org/~sam/distfiles/net-ftp/ftp/netkit-ftp-0.17-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d287973df5a4a195d5a24c43c5bba1d9
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 5d8219da3d5d..bff1ae592ea7 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/err-6.1.7 b/metadata/md5-cache/net-im/err-6.1.7
index 318db26b67fe..615f1d31a8f6 100644
--- a/metadata/md5-cache/net-im/err-6.1.7
+++ b/metadata/md5-cache/net-im/err-6.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/errbotio/errbot/archive/6.1.7.tar.gz -> err-6.1.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc13f59f73eaf1635d0fe23a727e710b
diff --git a/metadata/md5-cache/net-im/gajim-1.3.1_p2 b/metadata/md5-cache/net-im/gajim-1.3.1_p2
index 34f34bd21d06..a5ed8f10c145 100644
--- a/metadata/md5-cache/net-im/gajim-1.3.1_p2
+++ b/metadata/md5-cache/net-im/gajim-1.3.1_p2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.1-2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d706cf0c33972bb0969552700f6fe1a1
diff --git a/metadata/md5-cache/net-im/gajim-1.3.2 b/metadata/md5-cache/net-im/gajim-1.3.2
index 1a1cfd197bbd..903fe19374e5 100644
--- a/metadata/md5-cache/net-im/gajim-1.3.2
+++ b/metadata/md5-cache/net-im/gajim-1.3.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5d32adf222bf44533d85144a2ac54dc9
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.6-r1 b/metadata/md5-cache/net-im/pidgin-2.14.6-r1
index c6d81e228faf..c6f6cb86e7f6 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.6-r1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=7
 HOMEPAGE=https://pidgin.im/
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.6.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d4abf8303fc08a71b4d3598612f8249b
+_md5_=279312da49ae0fd4df4559d02fec3ef8
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 64250b9e9d0b..b457aea441a4 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2fdbdd0a2ac5edd139d4a96830b2acb2
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 94f94c3dc8e9..65605f4b6377 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ac57cdea6d95e59ac37b4b6cea7818c6
diff --git a/metadata/md5-cache/net-im/prosody-modules-0_pre20210901 b/metadata/md5-cache/net-im/prosody-modules-0_pre20210901
index 1cadb7c423a9..b408caf40533 100644
--- a/metadata/md5-cache/net-im/prosody-modules-0_pre20210901
+++ b/metadata/md5-cache/net-im/prosody-modules-0_pre20210901
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-im/prosody
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/distfiles/prosody-modules-0_pre20210901.tar.xz
-_eclasses_=portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=2e1362fca2cbfcceb8081570204e8d4c
diff --git a/metadata/md5-cache/net-im/prosody-modules-9999 b/metadata/md5-cache/net-im/prosody-modules-9999
index 8119cc21cdab..56331a30bf8d 100644
--- a/metadata/md5-cache/net-im/prosody-modules-9999
+++ b/metadata/md5-cache/net-im/prosody-modules-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=net-im/prosody
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	caa671a93f3b46fa4eff65babfbac141	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	caa671a93f3b46fa4eff65babfbac141	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f0d60d827e0830a5311d7bb3edf0170
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.16.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.16.0
deleted file mode 100644
index 3aa83a364a63..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.16.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:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 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.16.0_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02cf4fd2d18eaeee9944e50b1bf5fa6d
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.17.2 b/metadata/md5-cache/net-im/signal-desktop-bin-5.17.2
new file mode 100644
index 000000000000..c31cdbf00227
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.17.2
@@ -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:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 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.17.2_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=02cf4fd2d18eaeee9944e50b1bf5fa6d
diff --git a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r2 b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r2
index c8b96d8d830b..85ba1031521a 100644
--- a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r2
+++ b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/transwhat/archive/d022243f6c7b23674d3c87a09819f00b10df1165.tar.gz -> transwhat-0.2.2_p20190426.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=725f7bfbe21040e5bd67318ff0f9ed32
diff --git a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905 b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
index c7c806246d77..32dfceea500b 100644
--- a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
+++ b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tgalal/yowsup/archive/2adc067f306d9e7d8b634f66e96c52d80a42e1ff.tar.gz -> yowsup-3.2.3_p20190905.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3424e823487fe8961011dd98e0399ceb
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 0d2dc29ad44a..1ecb6f73eb06 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/limnoria-20210527 b/metadata/md5-cache/net-irc/limnoria-20210527
index e80f6306ad31..d9e6182069c0 100644
--- a/metadata/md5-cache/net-irc/limnoria-20210527
+++ b/metadata/md5-cache/net-irc/limnoria-20210527
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2021-05-27.tar.gz -> limnoria-20210527.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a402e21d6b5d2c1a2049094a9a396a9
diff --git a/metadata/md5-cache/net-irc/limnoria-20210617-r1 b/metadata/md5-cache/net-irc/limnoria-20210617-r1
index 16269b472431..d862c06996ed 100644
--- a/metadata/md5-cache/net-irc/limnoria-20210617-r1
+++ b/metadata/md5-cache/net-irc/limnoria-20210617-r1
@@ -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/ProgVal/Limnoria/archive/master-2021-06-17.tar.gz -> limnoria-20210617.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dddc58b6246f7ad5c190a14557ee76f9
diff --git a/metadata/md5-cache/net-irc/limnoria-9999 b/metadata/md5-cache/net-irc/limnoria-9999
index 29e2cab6799b..8fc7b35a69f5 100644
--- a/metadata/md5-cache/net-irc/limnoria-9999
+++ b/metadata/md5-cache/net-irc/limnoria-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=740361e1d00b1300c03860e43935d2ff
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index 89a5311cd79f..4f29ecaeccdc 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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=33373316a7744dbb6652c53f7c6467ab
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 47e510151338..a16e8583e3d9 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5-r101 b/metadata/md5-cache/net-libs/axtls-2.1.5-r101
index 74c8487dff19..391c668335dc 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r101
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r101
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( acct-group/axtls acct-user/axtls cgi-lua? ( lua_single_target_l
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=938db8f7f2dda213f09f0e394866eeec
diff --git a/metadata/md5-cache/net-libs/libaxc-0.3.6 b/metadata/md5-cache/net-libs/libaxc-0.3.6
index 698be5b6d102..5780a4cb19a2 100644
--- a/metadata/md5-cache/net-libs/libaxc-0.3.6
+++ b/metadata/md5-cache/net-libs/libaxc-0.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=Client library for libsignal-protocol-c
 EAPI=7
 HOMEPAGE=https://github.com/gkdr/axc
 IUSE=static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt net-libs/libsignal-protocol-c
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gkdr/axc/archive/v0.3.6.tar.gz -> libaxc-0.3.6.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a303c34987257feba52589615e7c815
+_md5_=4a91e0f0993d49dc672a81ce6d8952a7
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.6.0 b/metadata/md5-cache/net-libs/libblkmaker-0.6.0
deleted file mode 100644
index b276107b6f27..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/jansson-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/libbase58[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/libgcrypt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C implementation of Bitcoin's getblocktemplate interface
-EAPI=7
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-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/libbase58[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/7
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.6.0.tar.gz -> libblkmaker-0.6.0-github.tgz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8cea439b0ed793f4a1d36aae172aee37
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1 b/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1
new file mode 100644
index 000000000000..78cc1d8d2157
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/jansson-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/libbase58[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/libgcrypt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=C implementation of Bitcoin's getblocktemplate interface
+EAPI=7
+HOMEPAGE=https://github.com/bitcoin/libblkmaker
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/jansson-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/libbase58[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/7
+SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.6.0.tar.gz -> libblkmaker-0.6.0-github.tgz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53748da2f8a08b780ad0d5232c406635
diff --git a/metadata/md5-cache/net-libs/libetpan-1.9.4-r1 b/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
index 5381658c55bd..7f3213657618 100644
--- a/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
+++ b/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A portable, efficient middleware for different kinds of mail access
 EAPI=7
 HOMEPAGE=http://libetpan.sourceforge.net/
 IUSE=berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib !lmdb? ( berkdb? ( sys-libs/db:= ) ) lmdb? ( dev-db/lmdb ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
 SLOT=0
 SRC_URI=https://github.com/dinhviethoa/libetpan/archive/1.9.4.tar.gz -> libetpan-1.9.4.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d2b878f98d81c91e9b619bfb0e04684
+_md5_=a447e2b095f509cc71a3ddca1547be8b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index f65c37890233..045b5d58c440 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Userspace library for interface to user-space helper for conntrack
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cthelper/
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
 _eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4272b794dd1a93ea66406eacacdba532
+_md5_=6a9d6e67a3d2e6729b4f0ab4c4074db2
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index aeebbe068994..4a4e9701dab2 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=netlink interface for conntrack timeout infrastructure in kernel's p
 EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cttimeout/
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
 _eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b94b23049f7a4fd6ba48c9febcd4421
+_md5_=ac7afbe07fed4200c29724f50f1477a4
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
deleted file mode 100644
index 33c5fd0e9bf3..000000000000
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=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=8
-HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-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] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 python_single_target_python3_8? ( dev-python/simplejson[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/simplejson[python_targets_python3_9(-)] )
-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	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=47f0eb9a39e2d93b25c1c91879dff31c
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r2 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r2
new file mode 100644
index 000000000000..1edf023239f2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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=8
+HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+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] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1:= python_single_target_python3_8? ( dev-python/simplejson[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/simplejson[python_targets_python3_9(-)] )
+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	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b0b24e940d902e0068407fc38d02edb
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-2.1 b/metadata/md5-cache/net-libs/libsignon-glib-2.1
index 3d6e68ed0ed6..61617307ea7c 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-2.1
+++ b/metadata/md5-cache/net-libs/libsignon-glib-2.1
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) test? ( dev-libs/check ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( ( dev-lang/python:3.9 ) ( dev-lang/python:3.8 ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) test? ( dev-libs/check ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=GLib binding for the D-Bus API provided by signond
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/-/archive/VERSION_2.1/libsignon-glib-VERSION_2.1.tar.gz -> libsignon-glib-2.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=172f1ee73b0d96909e39503d1d834594
+_md5_=05650ef3a4fc7a4140076e874bd94efb
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10-r1
index 2539e9e277a3..52410c59e63c 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1.2.10.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6cf0427f3f68c3b5e3f97c3f6856d7f3
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.11-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.11-r1
index cecea345551d..289f8276041e 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.11-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/v1.2.11.tar.gz -> libtorrent-1.2.11.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e8b1eb51235f605afe0f9b8bf8df17e2
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.12-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.12-r1
index edf20aa7607c..8d55a3f0d5e2 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.12-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.12-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/v1.2.12.tar.gz -> libtorrent-1.2.12.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb7d9328bf9abf7ecbdb2f824dbfe9d6
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.14 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.14
index a482cd876f2a..c8d01295ab0f 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.14
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.14
@@ -5,12 +5,12 @@ DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
 EAPI=7
 HOMEPAGE=https://libtorrent.org https://github.com/arvidn/libtorrent
 IUSE=debug +dht doc examples python +ssl static-libs test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads(+)] virtual/libiconv examples? ( !net-p2p/mldonkey ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/boost:=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/v1.2.14.tar.gz -> libtorrent-1.2.14.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3c0d4eaa76857b10b33d610942321351
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0ca2a46dd9ab2c6159fc009c836911fd
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6-r1
index 2baed411925e..d82f553bf586 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_2_6.tar.gz -> libtorrent-rasterbar-1.2.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a9dc2044db320a435cf2ea19cbe9dc
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9-r1
index 2c3c695b6834..a543f5a68396 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1.2.9.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6cf0427f3f68c3b5e3f97c3f6856d7f3
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.2.2 b/metadata/md5-cache/net-libs/libwebsockets-4.2.2
index 3725ff6aa6f2..cd146210452c 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.2.2
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl threads zip
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:= ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) mbedtls? ( ssl ) smtp? ( libuv ) socks5? ( client http-proxy ) ?? ( libev libevent )
 SLOT=0/18
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.2.2.tar.gz -> libwebsockets-4.2.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58eccc67a9996e0c492da8c88be33187
+_md5_=26464c9739563057fb5a5dea72e8e953
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.3 b/metadata/md5-cache/net-libs/miniupnpc-2.2.3
new file mode 100644
index 000000000000..87624a2b91d7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.3
@@ -0,0 +1,12 @@
+BDEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which ) verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=UPnP client library and a simple UPnP client
+EAPI=8
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=ipv6 kernel_linux verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+SLOT=0/17
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz.sig )
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=428e12d13fa9856622cb669df53b3fab
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
deleted file mode 100644
index e201667eedd4..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=080d59b5430de2f051f4d594a40aaed5
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3
new file mode 100644
index 000000000000..1200abb04fdd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b4a522f50f3926e6fda38d04a5a29ec3
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.44.0 b/metadata/md5-cache/net-libs/nghttp2-1.44.0
deleted file mode 100644
index 6ccf072a00bd..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.44.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.44.0/nghttp2-1.44.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84c8dbb8e9ed3e89e7f523c8a960e79e
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.44.0-r1 b/metadata/md5-cache/net-libs/nghttp2-1.44.0-r1
new file mode 100644
index 000000000000..77a8828146c2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.44.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.44.0/nghttp2-1.44.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=86232dea1b3084ade8f4223e674c6937
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.0 b/metadata/md5-cache/net-libs/nghttp2-1.45.0
deleted file mode 100644
index 3920d708dcf0..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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.45.0/nghttp2-1.45.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a1a4b55aab7204c7f1f852f6dd6a66b
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1
new file mode 100644
index 000000000000..c91e5aed8035
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.0/nghttp2-1.45.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6fcfd7d713d0b66242011e35081e5efd
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.1 b/metadata/md5-cache/net-libs/nghttp2-1.45.1
deleted file mode 100644
index 6d1417dc84a7..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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.45.1/nghttp2-1.45.1.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a1a4b55aab7204c7f1f852f6dd6a66b
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
new file mode 100644
index 000000000000..38bcdf57e453
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=7
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.1/nghttp2-1.45.1.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6fcfd7d713d0b66242011e35081e5efd
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 23428128ac35..7280dc024ef0 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
-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(-)?] )
+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
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8deaad8a91f748601b14ed27e6b181fc
+_md5_=c7e04be0edd2ecbf87fc63d58c7dafd6
diff --git a/metadata/md5-cache/net-libs/stem-1.8.0-r1 b/metadata/md5-cache/net-libs/stem-1.8.0-r1
index 3a98fa5a06d7..6948a9add3be 100644
--- a/metadata/md5-cache/net-libs/stem-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/stem-1.8.0-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/s/stem/stem-1.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=225fd61fdb9a7ef2e303a0f0e5661575
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d5e2d0ecc98e..a699a08bcb35 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/automx2-2021.4 b/metadata/md5-cache/net-mail/automx2-2021.4
index c2c703543fa0..bfdab7675d5a 100644
--- a/metadata/md5-cache/net-mail/automx2-2021.4
+++ b/metadata/md5-cache/net-mail/automx2-2021.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/rseichter/automx2/archive/2021.4.tar.gz -> automx2-2021.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f2ab5061cf484cfaba2bd4adc3fba20
diff --git a/metadata/md5-cache/net-mail/b4-0.7.2 b/metadata/md5-cache/net-mail/b4-0.7.2
index 8b0307c34094..1f465465ec94 100644
--- a/metadata/md5-cache/net-mail/b4-0.7.2
+++ b/metadata/md5-cache/net-mail/b4-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/b4/b4-0.7.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6f5a33db18616b1702667bc81d0881c
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r2 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r2
deleted file mode 100644
index c42146451a92..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=BSD-with-attribution GPL-2
-RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.13/cyrus-imapd-3.0.13.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a384ec2f37c9ac877891278530e9656d
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r3 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r3
new file mode 100644
index 000000000000..22ce30804d05
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=7
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+LICENSE=BSD-with-attribution GPL-2
+RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.13/cyrus-imapd-3.0.13.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c25c0e38b6bb555bde9f9bb768b8d6bc
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r2 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r2
deleted file mode 100644
index 632abb64701c..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=BSD-with-attribution GPL-2
-RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.14/cyrus-imapd-3.0.14.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ec5e6d10e881aff5068f65d61a2bd2b
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r3 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r3
new file mode 100644
index 000000000000..f4d299f60da1
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=7
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+LICENSE=BSD-with-attribution GPL-2
+RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.14/cyrus-imapd-3.0.14.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3ef4d210ef8cf0fde700c56e58f95629
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r2 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r2
deleted file mode 100644
index d1e0ebd90295..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=BSD-with-attribution GPL-2
-RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.15/cyrus-imapd-3.0.15.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f64f6051c2370cc39dcb6529957ec0b9
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r3 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r3
new file mode 100644
index 000000000000..189da8254cda
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.15-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=7
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+LICENSE=BSD-with-attribution GPL-2
+RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.15/cyrus-imapd-3.0.15.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=89d6e9eee841090c7b0a44f9c472d032
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16
deleted file mode 100644
index e7df033c8d84..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-with-attribution GPL-2
-RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.16/cyrus-imapd-3.0.16.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ac92fc1a137710a8066f4e5e8531a29
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16-r1
new file mode 100644
index 000000000000..1e5f2c5cdb5c
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=7
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-with-attribution GPL-2
+RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.16/cyrus-imapd-3.0.16.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=195efff0bd971141db54863a2be94f57
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2 b/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2
deleted file mode 100644
index 43682446f650..000000000000
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( >=net-mail/mailbase-1 sys-libs/pam ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
-DESCRIPTION=The Cyrus IMAP Server
-EAPI=7
-HOMEPAGE=https://www.cyrusimap.org/
-IUSE=afs backup calalarm caps clamav http kerberos ldap mysql nntp pam perl postgres replication +server sieve sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-with-attribution GPL-2
-RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( >=net-mail/mailbase-1 sys-libs/pam ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
-REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.4.2/cyrus-imapd-3.4.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b043900258c6058562fc4228513e124b
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1
new file mode 100644
index 000000000000..6f88f484c66d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( >=net-mail/mailbase-1 sys-libs/pam ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) test? ( dev-util/cunit )
+DESCRIPTION=The Cyrus IMAP Server
+EAPI=7
+HOMEPAGE=https://www.cyrusimap.org/
+IUSE=afs backup calalarm caps clamav http kerberos ldap mysql nntp pam perl postgres replication +server sieve sqlite ssl static-libs tcpd test xapian ssl
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-with-attribution GPL-2
+RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson:= dev-libs/icu:0= sys-fs/e2fsprogs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( >=net-mail/mailbase-1 sys-libs/pam ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
+REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.4.2/cyrus-imapd-3.4.2.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b1c30434696e84ee06e48e663541ba2d
diff --git a/metadata/md5-cache/net-mail/django-mailman3-1.3.4 b/metadata/md5-cache/net-mail/django-mailman3-1.3.4
index 90623584b799..d302ef0e9240 100644
--- a/metadata/md5-cache/net-mail/django-mailman3-1.3.4
+++ b/metadata/md5-cache/net-mail/django-mailman3-1.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_8(-)?] net-mail/mailmanclient[p
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mailman3/django-mailman3-1.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68f7ebb41084b260d9471132dab9506d
diff --git a/metadata/md5-cache/net-mail/django-mailman3-1.3.7 b/metadata/md5-cache/net-mail/django-mailman3-1.3.7
new file mode 100644
index 000000000000..2af868ef941e
--- /dev/null
+++ b/metadata/md5-cache/net-mail/django-mailman3-1.3.7
@@ -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=Django-based interfaces interacting with Mailman 3
+EAPI=7
+HOMEPAGE=https://www.list.org
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/mailmanclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-allauth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-gravatar2[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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-mailman3/django-mailman3-1.3.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aa26364ebad2937c930cdd976bc9c3be
diff --git a/metadata/md5-cache/net-mail/getmail-6.14 b/metadata/md5-cache/net-mail/getmail-6.14
index 682e32505505..7208db854e1c 100644
--- a/metadata/md5-cache/net-mail/getmail-6.14
+++ b/metadata/md5-cache/net-mail/getmail-6.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ssl] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/getmail6/getmail6/archive/v6.14.tar.gz -> getmail-6.14.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d40bb2fd45ea4093a0197648e73da6b
diff --git a/metadata/md5-cache/net-mail/hyperkitty-1.3.3 b/metadata/md5-cache/net-mail/hyperkitty-1.3.3
index 0bb3f1103f89..17f1979a7cfc 100644
--- a/metadata/md5-cache/net-mail/hyperkitty-1.3.3
+++ b/metadata/md5-cache/net-mail/hyperkitty-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/H/HyperKitty/HyperKitty-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4effd2b71ca1634674ef9bbf208edcf
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.2 b/metadata/md5-cache/net-mail/mailman-3.3.2
index 274a76c2525c..8a0f653a2a95 100644
--- a/metadata/md5-cache/net-mail/mailman-3.3.2
+++ b/metadata/md5-cache/net-mail/mailman-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_8(-)?] dev-python/alemb
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=3
 SRC_URI=mirror://pypi/m/mailman/mailman-3.3.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc7213689947033546ad3bb5160d3088
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.4 b/metadata/md5-cache/net-mail/mailman-3.3.4
new file mode 100644
index 000000000000..8b3d69717679
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailman-3.3.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/flufl-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mailman -- the GNU mailing list manager
+EAPI=7
+HOMEPAGE=https://www.list.org
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/aiosmtpd-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/alembic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/authheaders-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/authres-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/falcon-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flufl-bounce[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flufl-i18n-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flufl-lock-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) www-servers/gunicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazr-config[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-configuration[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zope-interface-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=3
+SRC_URI=mirror://pypi/m/mailman/mailman-3.3.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=74b67d30adf5e7a343ed5e6a5ccfde8d
diff --git a/metadata/md5-cache/net-mail/mailmanclient-3.3.1 b/metadata/md5-cache/net-mail/mailmanclient-3.3.1
index a56f0b174c3f..dbc047d78b8d 100644
--- a/metadata/md5-cache/net-mail/mailmanclient-3.3.1
+++ b/metadata/md5-cache/net-mail/mailmanclient-3.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailmanclient/mailmanclient-3.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97f5c8cb77c021b0e0f44e1710e6e70e
diff --git a/metadata/md5-cache/net-mail/mailmanclient-3.3.3 b/metadata/md5-cache/net-mail/mailmanclient-3.3.3
new file mode 100644
index 000000000000..6bcf97b49367
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailmanclient-3.3.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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-services[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/mailman[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for the GNU Mailman 3 REST API
+EAPI=7
+HOMEPAGE=https://www.list.org
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=LGPL-3+
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/mailmanclient/mailmanclient-3.3.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=af880626d4311804ddcdbcfe6f4f01a0
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3-r1 b/metadata/md5-cache/net-mail/notmuch-0.31.3-r1
index d07176c68bf0..0f75d6af335b 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=34afc54dc9b4baa1aa61b9b9db39b174
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.1-r1 b/metadata/md5-cache/net-mail/notmuch-0.32.1-r1
index ea007f6cfd1b..183569a45559 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.32.1-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.32.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6ec6e48f40b1e40d782b9490dcf2c467
diff --git a/metadata/md5-cache/net-mail/notmuch-0.32.2-r1 b/metadata/md5-cache/net-mail/notmuch-0.32.2-r1
index 1f7d276d849f..1cce87823372 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.32.2-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.32.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.32.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=117fde74d8d6be856b14f676a849c670
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.1 b/metadata/md5-cache/net-mail/onionrouter-0.6.1
index 85faa2f063f0..5ce82b3aac7d 100644
--- a/metadata/md5-cache/net-mail/onionrouter-0.6.1
+++ b/metadata/md5-cache/net-mail/onionrouter-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd2e1efbbced09714286f2a4cbf83a84
diff --git a/metadata/md5-cache/net-mail/onionrouter-9999 b/metadata/md5-cache/net-mail/onionrouter-9999
index 0b854e588957..461dffa29fff 100644
--- a/metadata/md5-cache/net-mail/onionrouter-9999
+++ b/metadata/md5-cache/net-mail/onionrouter-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd2e1efbbced09714286f2a4cbf83a84
diff --git a/metadata/md5-cache/net-mail/postorius-1.3.3 b/metadata/md5-cache/net-mail/postorius-1.3.3
deleted file mode 100644
index 9e37a18b7bd5..000000000000
--- a/metadata/md5-cache/net-mail/postorius-1.3.3
+++ /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 prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=A web user interface for GNU Mailman 3
-EAPI=7
-HOMEPAGE=https://www.list.org
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=net-mail/django-mailman3[python_targets_python3_8(-)?] dev-python/django[python_targets_python3_8(-)?] net-mail/mailmanclient[python_targets_python3_8(-)?] dev-python/readme_renderer[python_targets_python3_8(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?] dev-python/vcrpy[python_targets_python3_8(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?] dev-python/isort[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/p/postorius/postorius-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=421905c8437b94a384b1eb244e753b9c
diff --git a/metadata/md5-cache/net-mail/postorius-1.3.5 b/metadata/md5-cache/net-mail/postorius-1.3.5
new file mode 100644
index 000000000000..db3f8eaba967
--- /dev/null
+++ b/metadata/md5-cache/net-mail/postorius-1.3.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/mailman[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/readme_renderer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/django-mailman3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/mailmanclient[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 web user interface for GNU Mailman 3
+EAPI=7
+HOMEPAGE=https://www.list.org
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/readme_renderer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/django-mailman3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-mail/mailmanclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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/postorius/postorius-1.3.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea04da099c7e4fca24d1f888edcdcd20
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.2-r1 b/metadata/md5-cache/net-mail/rss2email-3.12.2-r1
index ad5fb681dd32..cdedf261560c 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.12.2-r1
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.2-r1
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_8(-)?] >=dev-python/html
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.2.tar.gz -> rss2email-3.12.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14fbaad13f58b0488a7d54ea3846f602
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.3 b/metadata/md5-cache/net-mail/rss2email-3.12.3
index 3d27f170294c..24fac54064e2 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.12.3
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.3
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_8(-)?] >=dev-python/html
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.3.tar.gz -> rss2email-3.12.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6fc3c074abd888138e554cf8a55502d
diff --git a/metadata/md5-cache/net-mail/rss2email-3.13 b/metadata/md5-cache/net-mail/rss2email-3.13
index 42496845bf6c..6d14ff80bb26 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.13
+++ b/metadata/md5-cache/net-mail/rss2email-3.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.13.tar.gz -> rss2email-3.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e72c9eeda485726f7219ba716a5241d
diff --git a/metadata/md5-cache/net-mail/rss2email-3.13.1 b/metadata/md5-cache/net-mail/rss2email-3.13.1
index 84fc1c939ec1..c6f323d712bb 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.13.1
+++ b/metadata/md5-cache/net-mail/rss2email-3.13.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/rss2email/rss2email/archive/v3.13.1.tar.gz -> rss2email-3.13.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd5216b454daafd7ade775a28f1de359
diff --git a/metadata/md5-cache/net-mail/ytnef-2.0 b/metadata/md5-cache/net-mail/ytnef-2.0
index 96afaa1033a9..d5dc11ffe776 100644
--- a/metadata/md5-cache/net-mail/ytnef-2.0
+++ b/metadata/md5-cache/net-mail/ytnef-2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
 EAPI=8
 HOMEPAGE=https://github.com/Yeraze/ytnef
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/MIME-tools
 SLOT=0
 SRC_URI=https://github.com/Yeraze/ytnef/archive/v2.0.tar.gz -> ytnef-2.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1191af82f9e868d4167db775831bc816
+_md5_=8ac40f2995a1273c1e3a99893a849703
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 442d1b80c44f..7c838cbdb20f 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.3 b/metadata/md5-cache/net-misc/asterisk-13.38.3
deleted file mode 100644
index 04a7a4eecc17..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.38.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
-REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0/13
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df16696a66729361e680f9ea7b2c9641
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.3-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.3-r1
new file mode 100644
index 000000000000..1da2258ebff0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt virtual/libcrypt:= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/13
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.3.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c609c8958fc81fed55c10bd893a4df0f
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.1 b/metadata/md5-cache/net-misc/asterisk-16.19.1
deleted file mode 100644
index 64cff6110c86..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-16.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
-REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0/16
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.19.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75d4574a72e2eb3ad6165eb8f4bf870b
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.1-r1 b/metadata/md5-cache/net-misc/asterisk-16.19.1-r1
new file mode 100644
index 000000000000..e7210663e144
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.19.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/16
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.19.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=01a7eff4fac3d5d03a23f68f1f96730c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.20.0 b/metadata/md5-cache/net-misc/asterisk-16.20.0
deleted file mode 100644
index ee67ba5008f3..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-16.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
-REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0/16
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.20.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfb7bb0b205976eb890087945bc9770c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.20.0-r1 b/metadata/md5-cache/net-misc/asterisk-16.20.0-r1
new file mode 100644
index 000000000000..d7ffc01aaa5b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.20.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/16
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.20.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e5f026629f79d3083d94bcc2afd6c6aa
diff --git a/metadata/md5-cache/net-misc/asterisk-18.5.1 b/metadata/md5-cache/net-misc/asterisk-18.5.1
deleted file mode 100644
index c4f8e1cd7298..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-18.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
-REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
-SLOT=0/18
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.5.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=782a72321f846da6511ee8b67f22ca7e
diff --git a/metadata/md5-cache/net-misc/asterisk-18.5.1-r1 b/metadata/md5-cache/net-misc/asterisk-18.5.1-r1
new file mode 100644
index 000000000000..bcc7fa652ee6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/18
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.5.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e645371db43f20ef522695243a0699cc
diff --git a/metadata/md5-cache/net-misc/asterisk-18.6.0 b/metadata/md5-cache/net-misc/asterisk-18.6.0
deleted file mode 100644
index f655ddb6cf4e..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-18.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
-REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
-SLOT=0/18
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.6.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=782a72321f846da6511ee8b67f22ca7e
diff --git a/metadata/md5-cache/net-misc/asterisk-18.6.0-r1 b/metadata/md5-cache/net-misc/asterisk-18.6.0-r1
new file mode 100644
index 000000000000..38f83dcb9336
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/18
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.6.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e645371db43f20ef522695243a0699cc
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1 b/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1
deleted file mode 100644
index 5de76e4ecaea..000000000000
--- a/metadata/md5-cache/net-misc/bfgminer-5.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
-DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
-EAPI=6
-HOMEPAGE=https://bitcointalk.org/?topic=168174
-IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
-REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
-SLOT=0
-SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.tar.xz
-_md5_=c9e0c4285843342e3a1b3159766d03f8
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.5.0-r2 b/metadata/md5-cache/net-misc/bfgminer-5.5.0-r2
new file mode 100644
index 000000000000..4dad4a1300b7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bfgminer-5.5.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2:= dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
+DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
+EAPI=6
+HOMEPAGE=https://bitcointalk.org/?topic=168174
+IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode(+)?] ) >=dev-libs/jansson-2:= dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
+REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
+SLOT=0
+SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.tar.xz
+_md5_=9fdc9c558b737c0ffd98b6d47f4b7d66
diff --git a/metadata/md5-cache/net-misc/cadaver-0.23.3 b/metadata/md5-cache/net-misc/cadaver-0.23.3
deleted file mode 100644
index 09719d7c1a04..000000000000
--- a/metadata/md5-cache/net-misc/cadaver-0.23.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 prepare
-DEPEND=>=net-libs/neon-0.27.0
-DESCRIPTION=Command-line WebDAV client
-EAPI=7
-HOMEPAGE=http://webdav.org/cadaver/ https://github.com/notroj/cadaver
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/neon-0.27.0
-SLOT=0
-SRC_URI=http://webdav.org/cadaver/cadaver-0.23.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=37329e978939b60767af68c6eae3db4e
diff --git a/metadata/md5-cache/net-misc/cadaver-0.23.3-r1 b/metadata/md5-cache/net-misc/cadaver-0.23.3-r1
new file mode 100644
index 000000000000..44583e3806f6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cadaver-0.23.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=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 prepare
+DEPEND=<net-libs/neon-0.33.0:=
+DESCRIPTION=Command-line WebDAV client
+EAPI=7
+HOMEPAGE=http://webdav.org/cadaver/ https://github.com/notroj/cadaver
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=<net-libs/neon-0.33.0:=
+SLOT=0
+SRC_URI=http://webdav.org/cadaver/cadaver-0.23.3.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c0b60f3f745d2c9a37f441488851602a
diff --git a/metadata/md5-cache/net-misc/cgminer-4.10.0 b/metadata/md5-cache/net-misc/cgminer-4.10.0
deleted file mode 100644
index 749ddd2e9e7b..000000000000
--- a/metadata/md5-cache/net-misc/cgminer-4.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=net-misc/curl >=dev-libs/jansson-2.6 virtual/libusb:1[udev] ncurses? ( sys-libs/ncurses:0= ) udev? ( virtual/libudev )
-DESCRIPTION=Bitcoin CPU/GPU/FPGA/ASIC miner in C
-EAPI=7
-HOMEPAGE=https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer
-IUSE=doc examples udev hardened ncurses ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl >=dev-libs/jansson-2.6 virtual/libusb:1[udev] ncurses? ( sys-libs/ncurses:0= ) udev? ( virtual/libudev )
-REQUIRED_USE=|| ( ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30 )
-SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-4.10.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=41c66989a192583861ca7efbe5ddcc79
diff --git a/metadata/md5-cache/net-misc/cgminer-4.10.0-r1 b/metadata/md5-cache/net-misc/cgminer-4.10.0-r1
new file mode 100644
index 000000000000..cb960ee87d26
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cgminer-4.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=net-misc/curl >=dev-libs/jansson-2.6:= virtual/libusb:1[udev] ncurses? ( sys-libs/ncurses:0= ) udev? ( virtual/libudev )
+DESCRIPTION=Bitcoin CPU/GPU/FPGA/ASIC miner in C
+EAPI=7
+HOMEPAGE=https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer
+IUSE=doc examples udev hardened ncurses ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl >=dev-libs/jansson-2.6:= virtual/libusb:1[udev] ncurses? ( sys-libs/ncurses:0= ) udev? ( virtual/libudev )
+REQUIRED_USE=|| ( ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30 )
+SLOT=0
+SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-4.10.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=406376c78c060a42c84a42bc1a7aa75d
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-93.0.4577.16 b/metadata/md5-cache/net-misc/chrome-remote-desktop-93.0.4577.16
deleted file mode 100644
index 0f5600dabaa7..000000000000
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-93.0.4577.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=kernel_AIX? ( app-arch/deb2targz ) kernel_AIX? ( app-arch/deb2targz )
-DESCRIPTION=access remote computers via Chrome!
-EAPI=7
-HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-admin/sudo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-apps/dbus sys-devel/gcc sys-libs/glibc sys-libs/pam x11-apps/xdpyinfo x11-apps/setxkbmap x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
-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_93.0.4577.16_amd64.deb )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=aa4e251fe21dd3266048e3e580a1e6b5
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-94.0.4606.27 b/metadata/md5-cache/net-misc/chrome-remote-desktop-94.0.4606.27
new file mode 100644
index 000000000000..fd964a1ec4ab
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-94.0.4606.27
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare setup unpack
+DEPEND=kernel_AIX? ( app-arch/deb2targz ) kernel_AIX? ( app-arch/deb2targz )
+DESCRIPTION=access remote computers via Chrome!
+EAPI=7
+HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-admin/sudo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-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/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-apps/dbus sys-devel/gcc sys-libs/glibc sys-libs/pam x11-apps/xdpyinfo x11-apps/setxkbmap x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
+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_94.0.4606.27_amd64.deb )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=d1d82654d7615b0cac9482f4ef4d1bd0
diff --git a/metadata/md5-cache/net-misc/chrony-4.1-r1 b/metadata/md5-cache/net-misc/chrony-4.1-r1
index d906a60ed63a..5929a8485d8a 100644
--- a/metadata/md5-cache/net-misc/chrony-4.1-r1
+++ b/metadata/md5-cache/net-misc/chrony-4.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=NTP client and server programs
 EAPI=7
 HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
 IUSE=+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.1.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.1-tar-gz-asc.txt -> chrony-4.1.tar.gz.asc )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=872b5da74d87f9a6026e84e9699862f2
+_md5_=37f8fb6ca9d7ebad0048f84a6adb21b0
diff --git a/metadata/md5-cache/net-misc/curl-7.79.1 b/metadata/md5-cache/net-misc/curl-7.79.1
index 06b5d0a51c7c..25d2e1b08597 100644
--- a/metadata/md5-cache/net-misc/curl-7.79.1
+++ b/metadata/md5-cache/net-misc/curl-7.79.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.79.1.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1d375f9ca037ed6ad5abd791eabf170
+_md5_=8d7808b9f5a53e68eef82c93e411d449
diff --git a/metadata/md5-cache/net-misc/dropbear-2020.81-r3 b/metadata/md5-cache/net-misc/dropbear-2020.81-r3
index ecc81af7a587..875bd32c51a2 100644
--- a/metadata/md5-cache/net-misc/dropbear-2020.81-r3
+++ b/metadata/md5-cache/net-misc/dropbear-2020.81-r3
@@ -10,5 +10,5 @@ RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2020.81.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be381b25e2382a302267dfa4438e68e1
diff --git a/metadata/md5-cache/net-misc/dropbox-130.4.4978 b/metadata/md5-cache/net-misc/dropbox-130.4.4978
deleted file mode 100644
index cad20f457a2e..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-130.4.4978
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-IUSE=selinux X
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-130.4.4978.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-130.4.4978.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d303c3393ad0f33b4bad318a29dc488
diff --git a/metadata/md5-cache/net-misc/dropbox-131.4.3968 b/metadata/md5-cache/net-misc/dropbox-131.4.3968
index 87bcbb267e52..c9082621a299 100644
--- a/metadata/md5-cache/net-misc/dropbox-131.4.3968
+++ b/metadata/md5-cache/net-misc/dropbox-131.4.3968
@@ -5,11 +5,11 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-131.4.3968.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-131.4.3968.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e792a6a58a299121e467bbadbd00e03
+_md5_=9d303c3393ad0f33b4bad318a29dc488
diff --git a/metadata/md5-cache/net-misc/dropbox-132.4.3800 b/metadata/md5-cache/net-misc/dropbox-132.4.3800
new file mode 100644
index 000000000000..39ab14099d55
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-132.4.3800
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-132.4.3800.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-132.4.3800.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5e792a6a58a299121e467bbadbd00e03
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2 b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
index 72730ae25528..a1792d3477c5 100644
--- a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
+++ b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/4.0.2.tar.gz -> electron-cash-4.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7ab84255b4697cdc8f6a96ca61bb6417
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.2.3 b/metadata/md5-cache/net-misc/electron-cash-4.2.3
index ee0576194355..63b051fec74a 100644
--- a/metadata/md5-cache/net-misc/electron-cash-4.2.3
+++ b/metadata/md5-cache/net-misc/electron-cash-4.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=!audio_modem || ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/4.2.3.tar.gz -> electron-cash-4.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cb2c7e08a4181ef856992923eab38886
diff --git a/metadata/md5-cache/net-misc/electrum-4.1.5 b/metadata/md5-cache/net-misc/electrum-4.1.5
index f65e15683755..eeccd42f8f26 100644
--- a/metadata/md5-cache/net-misc/electrum-4.1.5
+++ b/metadata/md5-cache/net-misc/electrum-4.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4b0f10c127bc95f49e351ed14e9ace31
diff --git a/metadata/md5-cache/net-misc/electrum-ltc-4.0.9.1 b/metadata/md5-cache/net-misc/electrum-ltc-4.0.9.1
index 186518a94285..8b9f94e032de 100644
--- a/metadata/md5-cache/net-misc/electrum-ltc-4.0.9.1
+++ b/metadata/md5-cache/net-misc/electrum-ltc-4.0.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/p
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pooler/electrum-ltc/archive/4.0.9.1.tar.gz -> electrum-ltc-4.0.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=80fa4419f9b00dac67355159f0dd9e2f
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1 b/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
index b43f5e0f76f2..e8b16988b0bf 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.11-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/Exa-Networks/exabgp/archive/4.2.11.tar.gz -> exabgp-4.2.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3fe48b4caf26593b187af17edf210d90
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.11-r2 b/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
index a019593ba093..911d6516159e 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.2.11.tar.gz -> exabgp-4.2.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9f06cbd8f76d3c05a38c2b9d75f34c4
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 0ec8e0ffbf9c..ea98af9c78fa 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 c41d4262a2d0..0bc5e0bb66ec 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 ab6326635e2d..2d3ae8256ccd 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=771541f83190d41d1704f9cb9d03163b
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.2.24 b/metadata/md5-cache/net-misc/gns3-gui-2.2.24
index 160fde45cbbe..4be5a00ff3d7 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.2.24
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.2.24.tar.gz -> gns3-gui-2.2.24.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad55096efe367dafa810ac5439bf17d7
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.2.25 b/metadata/md5-cache/net-misc/gns3-gui-2.2.25
index 79e6d23f1b7e..f29083e5a1f2 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.2.25
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.2.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.2.25.tar.gz -> gns3-gui-2.2.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=48fd8f9cf5e41faf89a598ca04a9cc5a
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.24 b/metadata/md5-cache/net-misc/gns3-server-2.2.24
index f6a6c0bf470f..ca67393a44f9 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.24
+++ b/metadata/md5-cache/net-misc/gns3-server-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://github.com/GNS3/gns3-server/archive/v2.2.24.tar.gz -> gns3-server-2.2.24.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca9e5b6898191b45378e4f73a0841bf3
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.25 b/metadata/md5-cache/net-misc/gns3-server-2.2.25
index f183cf2d9eeb..c3948dee6aeb 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.25
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.25
@@ -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.25.tar.gz -> gns3-server-2.2.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23e5b175971acd090de76a1b7af21713
diff --git a/metadata/md5-cache/net-misc/gsutil-4.59-r1 b/metadata/md5-cache/net-misc/gsutil-4.59-r1
index cfae3ed7c193..86c6822ef481 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.59-r1
+++ b/metadata/md5-cache/net-misc/gsutil-4.59-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.59.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb29386cee74ab5d25b2dde572de192
diff --git a/metadata/md5-cache/net-misc/gsutil-4.60-r1 b/metadata/md5-cache/net-misc/gsutil-4.60-r1
index 45e3e9a5fdcb..e5aa58465df3 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.60-r1
+++ b/metadata/md5-cache/net-misc/gsutil-4.60-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.60.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efb29386cee74ab5d25b2dde572de192
diff --git a/metadata/md5-cache/net-misc/httpie-2.4.0 b/metadata/md5-cache/net-misc/httpie-2.4.0
index 01540e357e31..a12e05748a60 100644
--- a/metadata/md5-cache/net-misc/httpie-2.4.0
+++ b/metadata/md5-cache/net-misc/httpie-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.4.0.tar.gz -> httpie-2.4.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7881a2f3f2aba7805d3c59953db35097
diff --git a/metadata/md5-cache/net-misc/httpie-2.5.0 b/metadata/md5-cache/net-misc/httpie-2.5.0
index 6ab805549171..e1cf53c14354 100644
--- a/metadata/md5-cache/net-misc/httpie-2.5.0
+++ b/metadata/md5-cache/net-misc/httpie-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/httpie/httpie/archive/2.5.0.tar.gz -> httpie-2.5.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=878ec6ef9e66dabdbff98a61ba88572b
diff --git a/metadata/md5-cache/net-misc/httpstat-1.3.1 b/metadata/md5-cache/net-misc/httpstat-1.3.1
index 4562d18e6a57..6eae9bdba468 100644
--- a/metadata/md5-cache/net-misc/httpstat-1.3.1
+++ b/metadata/md5-cache/net-misc/httpstat-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/reorx/httpstat/archive/1.3.1.tar.gz -> httpstat-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6346e9cc43ee3a987d020a0364e0e487
diff --git a/metadata/md5-cache/net-misc/ipv6calc-3.1.1 b/metadata/md5-cache/net-misc/ipv6calc-3.1.1
index c3f9b149b699..f5c357aa6210 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-3.1.1
+++ b/metadata/md5-cache/net-misc/ipv6calc-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=IPv6 address calculator
 EAPI=7
 HOMEPAGE=https://www.deepspace6.net/projects/ipv6calc.html
 IUSE=geoip test
-KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:= geoip? ( >=dev-libs/geoip-1.4.7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/3.1.1.tar.gz -> ipv6calc-3.1.1.tar.gz
-_md5_=30297db4ab25f38972fac7f5dad150e5
+_md5_=804a5c18638b093d409ba6916543cc9d
diff --git a/metadata/md5-cache/net-misc/jwhois-4.0-r1 b/metadata/md5-cache/net-misc/jwhois-4.0-r1
index 5bf5ab243bf3..66bb1d208e9b 100644
--- a/metadata/md5-cache/net-misc/jwhois-4.0-r1
+++ b/metadata/md5-cache/net-misc/jwhois-4.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Advanced Internet Whois client capable of recursive queries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/jwhois/
 IUSE=idn nls
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=mirror://gnu/jwhois/jwhois-4.0.tar.gz
-_md5_=202222b9ca9e011daa20ab7558e9e498
+_md5_=7189f88a33305c060392cc9a0ee9b48c
diff --git a/metadata/md5-cache/net-misc/libteam-1.31 b/metadata/md5-cache/net-misc/libteam-1.31
deleted file mode 100644
index fc0c40f46a2c..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.31
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=7
-HOMEPAGE=http://libteam.org
-IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69599cde90aa88843fe8a7a9e5939dac
diff --git a/metadata/md5-cache/net-misc/libteam-1.31-r1 b/metadata/md5-cache/net-misc/libteam-1.31-r1
new file mode 100644
index 000000000000..81d9e94d5e5e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/libteam-1.31-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
+DESCRIPTION=Library and tools set for controlling team network device
+EAPI=7
+HOMEPAGE=http://libteam.org
+IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
+SLOT=0
+SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=74d61c9d81afebeeb5e33f802e460ece
diff --git a/metadata/md5-cache/net-misc/libteam-9999 b/metadata/md5-cache/net-misc/libteam-9999
index 4051eb5c865e..2beaec52188a 100644
--- a/metadata/md5-cache/net-misc/libteam-9999
+++ b/metadata/md5-cache/net-misc/libteam-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
+DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=7
 HOMEPAGE=http://libteam.org
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
 LICENSE=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
+RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b806f44bc8968d160a0023b6ccd4c05e
+_md5_=592786e40fb35bc978137378c03e36a7
diff --git a/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r1 b/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r1
index 61e7f1e063af..4021cd082859 100644
--- a/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r1
+++ b/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r1
@@ -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/enricobacis/lyricwikia/archive/0.1.11.tar.gz -> lyricwikia-0.1.11.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b632296ab3c6c5821e3c75dae0da4a4e
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.12 b/metadata/md5-cache/net-misc/memcached-1.6.12
new file mode 100644
index 000000000000..5f1cad48b993
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.6.12
@@ -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 test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=7
+HOMEPAGE=http://memcached.org/
+IUSE=debug sasl seccomp selinux slabs-reassign test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.6.12.tar.gz https://www.memcached.org/files/old/memcached-1.6.12.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=16988b08d2aa76dae4d72b4d240b167d
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.9 b/metadata/md5-cache/net-misc/memcached-1.6.9
deleted file mode 100644
index 6657c990bdce..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.6.9
+++ /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 test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )
-DESCRIPTION=High-performance, distributed memory object caching system
-EAPI=7
-HOMEPAGE=http://memcached.org/
-IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.6.9.tar.gz https://www.memcached.org/files/old/memcached-1.6.9.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f4250d35048148601f3692ddf3053bc4
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.10 b/metadata/md5-cache/net-misc/networkmanager-1.32.10
deleted file mode 100644
index 9114974912ed..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7 >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7 >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca863981523aa08f2e76ffc39bd0c732
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
new file mode 100644
index 000000000000..676f66119952
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi 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 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.10.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=71b2615cecbfd91eb97702bd41ffc1bc
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.4 b/metadata/md5-cache/net-misc/networkmanager-1.32.4
deleted file mode 100644
index e7597f0a6d6d..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.4.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8250a6c77120c5d4c177f31411ac6d1e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
new file mode 100644
index 000000000000..82be3e448cb7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson:= ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson:= >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson:= ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson:= >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.4.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0884bda5ec8d42cddddb671fbff1da2b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.8 b/metadata/md5-cache/net-misc/networkmanager-1.32.8
deleted file mode 100644
index 0cce93f25b49..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.8.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e2d78344a04c8c1a65d8c6aa8e495efd
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
new file mode 100644
index 000000000000..236669adef2e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson:= ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson:= >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson:= ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson:= >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.8.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8f53d656eb91902866b6656eca7466e5
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.2.1 b/metadata/md5-cache/net-misc/nextcloud-client-3.2.1
deleted file mode 100644
index 77db42ead476..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=7
-HOMEPAGE=https://github.com/nextcloud/desktop
-IUSE=doc dolphin nautilus test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.2.1.tar.gz -> nextcloud-client-3.2.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a18c84a2af4c1b0c80b902ed1b550fe2
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.2.2 b/metadata/md5-cache/net-misc/nextcloud-client-3.2.2
deleted file mode 100644
index 72b59c179d5c..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=7
-HOMEPAGE=https://github.com/nextcloud/desktop
-IUSE=doc dolphin nautilus test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.2.2.tar.gz -> nextcloud-client-3.2.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a18c84a2af4c1b0c80b902ed1b550fe2
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.2.3 b/metadata/md5-cache/net-misc/nextcloud-client-3.2.3
deleted file mode 100644
index a846e7aa55a6..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=7
-HOMEPAGE=https://github.com/nextcloud/desktop
-IUSE=doc dolphin nautilus test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) >=dev-libs/openssl-1.1.0:0= nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.2.3.tar.gz -> nextcloud-client-3.2.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=edc28169f37195883086aadb6711d458
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.3.4 b/metadata/md5-cache/net-misc/nextcloud-client-3.3.4
new file mode 100644
index 000000000000..04ce8f41859b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.3.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 gnome-base/librsvg doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Desktop Syncing Client for Nextcloud
+EAPI=7
+HOMEPAGE=https://github.com/nextcloud/desktop
+IUSE=doc dolphin nautilus test webengine
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nextcloud/desktop/archive/v3.3.4.tar.gz -> nextcloud-client-3.3.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=233c8bc68eaed37dc8c9940b2a16e293
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.0-r3 b/metadata/md5-cache/net-misc/ntpsec-1.2.0-r3
index 1c40fd3c4c70..b86330ffc1c3 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.0-r3
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) nist? ( rc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6cae939e8b1a4897ac66c338659e27f0
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.1 b/metadata/md5-cache/net-misc/ntpsec-1.2.1
index 40875bbe86f2..08f8b2474779 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.1
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) nist? ( rc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2d631673c0fbd21c8d865ad74755257
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0-r2 b/metadata/md5-cache/net-misc/nyx-2.1.0-r2
index 9b0e6c430e02..84901ab86384 100644
--- a/metadata/md5-cache/net-misc/nyx-2.1.0-r2
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0-r2
@@ -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/n/nyx/nyx-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d1e2f91bbb60e10f32ed5c7a6c48546
diff --git a/metadata/md5-cache/net-misc/openssh-8.8_p1 b/metadata/md5-cache/net-misc/openssh-8.8_p1
new file mode 100644
index 000000000000..0226eb1d4422
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-8.8_p1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist(-)=] <dev-libs/openssl-1.1.0:0[bindist(-)=] ) >=dev-libs/openssl-1.1.0g:0[bindist(-)=] ) dev-libs/openssl:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist(-)=] <dev-libs/openssl-1.1.0:0[bindist(-)=] ) >=dev-libs/openssl-1.1.0g:0[bindist(-)=] ) dev-libs/openssl:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=7
+HOMEPAGE=https://www.openssh.com/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist(-)=] <dev-libs/openssl-1.1.0:0[bindist(-)=] ) >=dev-libs/openssl-1.1.0g:0[bindist(-)=] ) dev-libs/openssl:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( !prefix? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )
+REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.8p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.8p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=32673df8ed1f2f1c7e13756674b6b246
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.9.0.5150 b/metadata/md5-cache/net-misc/owncloud-client-2.9.0.5150
new file mode 100644
index 000000000000..a1496c0564af
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.9.0.5150
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=7
+HOMEPAGE=https://owncloud.org/
+IUSE=dolphin gnome-keyring nautilus test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.9.0.5150/source/ownCloud-2.9.0.5150.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3203a418a1783702e1a0f392f76f7e8c
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.4-r1 b/metadata/md5-cache/net-misc/pssh-2.3.4-r1
index cc3d084b75e4..7616f36f61c3 100644
--- a/metadata/md5-cache/net-misc/pssh-2.3.4-r1
+++ b/metadata/md5-cache/net-misc/pssh-2.3.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lilydjwg/pssh/archive/v2.3.4.tar.gz -> pssh-2.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2026e063f259752c4bed32751b7f1e4
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999 b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
index 485adfca1e3d..5fdc72b90b55 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/notify2-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyroute2-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/lxml-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pychromecast-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dbus-python-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zeroconf-0.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject[cairo,python_targets_python3_8(-)?,python_targets_python3_9(-)?] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) python_targets_python3_8? ( dev-lang/python: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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1fc6ed224b56014934c448c6434923e
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
index f634c00efe8b..09147a61a121 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6aad9f6becd4c03461b2d7e4742e7f30
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
index 4f69b4561825..88f67a5ea209 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycups[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4f2f42eef69ca56b3b5a81ac6c88902
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
index bfed4f1ae2ad..a9c204a6aa83 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c5995f5aa91134b5f0461b778886656b
diff --git a/metadata/md5-cache/net-misc/radvd-2.19-r2 b/metadata/md5-cache/net-misc/radvd-2.19-r2
index af8aaefef55a..c35338237eee 100644
--- a/metadata/md5-cache/net-misc/radvd-2.19-r2
+++ b/metadata/md5-cache/net-misc/radvd-2.19-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=7
 HOMEPAGE=http://v6web.litech.org/radvd/
 IUSE=kernel_FreeBSD selinux test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon acct-group/radvd acct-user/radvd selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.19.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=536480fda74c03203038be2d00beed1b
+_md5_=619d19f544c7c0099fdba1cd584b926d
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.1.0 b/metadata/md5-cache/net-misc/s3cmd-2.1.0
index 66ae9febdc05..f21f2a7bc123 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.1.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0c991d54c36c9689da695cacb7fd8904
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1 b/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
index bc55e9a17d98..cc5063beacbc 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
+++ b/metadata/md5-cache/net-misc/s3cmd-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.1.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e83a9a4acf308323bd4b42706056d51b
diff --git a/metadata/md5-cache/net-misc/s4cmd-2.1.0 b/metadata/md5-cache/net-misc/s4cmd-2.1.0
index 243fe841f895..18600f80a52b 100644
--- a/metadata/md5-cache/net-misc/s4cmd-2.1.0
+++ b/metadata/md5-cache/net-misc/s4cmd-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/bloomreach/s4cmd/archive/refs/tags/2.1.0.tar.gz -> s4cmd-2.1.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f8ff512728c171316b5e6af841a65c8
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.1 b/metadata/md5-cache/net-misc/seafile-8.0.1
deleted file mode 100644
index 7b294840d18f..000000000000
--- a/metadata/md5-cache/net-misc/seafile-8.0.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=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
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-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-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
-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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afcebb10dd14ebdc824ac510a5239d7e
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.1-r1 b/metadata/md5-cache/net-misc/seafile-8.0.1-r1
new file mode 100644
index 000000000000..3c8b74eaa699
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-8.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=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
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+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-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
+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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=add9d2b34ad65a9a1b65bb1179fa17a0
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.2 b/metadata/md5-cache/net-misc/seafile-8.0.2
deleted file mode 100644
index 025979231a35..000000000000
--- a/metadata/md5-cache/net-misc/seafile-8.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup
-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
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-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-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
-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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=21c68357d60ae06629ff38f1af60e4f5
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.2-r2 b/metadata/md5-cache/net-misc/seafile-8.0.2-r2
new file mode 100644
index 000000000000..2f49c2fa04e2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-8.0.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+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-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
+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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a765199e5e24772daad5adf9c2ffe04e
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.3 b/metadata/md5-cache/net-misc/seafile-8.0.3
deleted file mode 100644
index 1142b3f270e0..000000000000
--- a/metadata/md5-cache/net-misc/seafile-8.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) || ( dev-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/gnuconfig >=app-portage/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=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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
-DESCRIPTION=File syncing and sharing software with file encryption and group sharing
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-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-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
-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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7e598132e4764753825630bc63158fe
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.3-r3 b/metadata/md5-cache/net-misc/seafile-8.0.3-r3
new file mode 100644
index 000000000000..e756752c9ed2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-8.0.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) || ( dev-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/gnuconfig >=app-portage/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=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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
+DESCRIPTION=File syncing and sharing software with file encryption and group sharing
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+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-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
+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	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0758b2f0076fdbd4b28adeb367b7d462
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.1-r2 b/metadata/md5-cache/net-misc/seafile-client-8.0.1-r2
deleted file mode 100644
index 1355998dc1a6..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-8.0.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/jansson dev-libs/libevent dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.1 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Seafile desktop client
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
-IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/jansson dev-libs/libevent dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.1 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/v8.0.1.tar.gz -> seafile-client-8.0.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d185860f5b9f9b4c481f92724dabbde2
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.1-r3 b/metadata/md5-cache/net-misc/seafile-client-8.0.1-r3
new file mode 100644
index 000000000000..a4ee63d59d19
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-client-8.0.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/jansson:= dev-libs/libevent:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.1 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
+DESCRIPTION=Seafile desktop client
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
+IUSE=shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-db/sqlite:3 dev-libs/jansson:= dev-libs/libevent:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.1 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile-client/archive/v8.0.1.tar.gz -> seafile-client-8.0.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=06e9a0f8a965e93c59b0261664317508
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.2 b/metadata/md5-cache/net-misc/seafile-client-8.0.2
deleted file mode 100644
index 34ed005ea349..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-8.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/jansson dev-libs/libevent dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.2 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Seafile desktop client
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
-IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/jansson dev-libs/libevent dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.2 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/837be8efd5cab4aea8fc1138ab91e93539a4e010.tar.gz -> seafile-client-8.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=50393093ffced66e94dc4f9ee2cecac8
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.2-r1 b/metadata/md5-cache/net-misc/seafile-client-8.0.2-r1
new file mode 100644
index 000000000000..d56950e2885b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-client-8.0.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/jansson:= dev-libs/libevent:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.2 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) test? ( dev-qt/qttest:5 )
+DESCRIPTION=Seafile desktop client
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
+IUSE=shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-db/sqlite:3 dev-libs/jansson:= dev-libs/libevent:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-libs/openssl:= net-libs/libsearpc ~net-misc/seafile-8.0.2 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile-client/archive/837be8efd5cab4aea8fc1138ab91e93539a4e010.tar.gz -> seafile-client-8.0.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4404fb4e4cc264d4cdfcfb37d02f554b
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.3 b/metadata/md5-cache/net-misc/seafile-client-8.0.3
deleted file mode 100644
index f89466b2f64b..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-8.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson dev-libs/libevent dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/libsearpc ~net-misc/seafile-8.0.3 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) sys-libs/zlib test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Seafile desktop client
-EAPI=7
-HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
-IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson dev-libs/libevent dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/libsearpc ~net-misc/seafile-8.0.3 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/c49c317f3bf19001c06f189d0706b6a3a2d6533c.tar.gz -> seafile-client-8.0.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ef1723ea79beb63146202bdec5989c33
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.3-r1 b/metadata/md5-cache/net-misc/seafile-client-8.0.3-r1
new file mode 100644
index 000000000000..eb4094d9614d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-client-8.0.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/libsearpc ~net-misc/seafile-8.0.3 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) sys-libs/zlib test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Seafile desktop client
+EAPI=7
+HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
+IUSE=shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/libsearpc ~net-misc/seafile-8.0.3 shibboleth? ( dev-qt/qtwebengine:5[widgets] ) sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile-client/archive/c49c317f3bf19001c06f189d0706b6a3a2d6533c.tar.gz -> seafile-client-8.0.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a8f4f02d4a0b829dc2ea55ff7f9b9ea0
diff --git a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r2 b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r2
index cf91d0e2210a..5b0223c073fe 100644
--- a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r2
+++ b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r2
@@ -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
 DEFINED_PHASES=configure prepare
-DEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
+DEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 DESCRIPTION=Maintain remote web sites with ease
 EAPI=7
 HOMEPAGE=http://www.manyfish.co.uk/sitecopy/
 IUSE=expat nls rsh ssl webdav xml zlib
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
+RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 SLOT=0
 SRC_URI=mirror://gentoo/sitecopy-0.16.6.tar.gz https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11a6dd9fba7184fe5dffc8db04cddf13
+_md5_=c2b4e86faa21f6267d47025beca73f48
diff --git a/metadata/md5-cache/net-misc/smb4k-3.1.1 b/metadata/md5-cache/net-misc/smb4k-3.1.1
new file mode 100644
index 000000000000..adf2faa3cf08
--- /dev/null
+++ b/metadata/md5-cache/net-misc/smb4k-3.1.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 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-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.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/kdnssd-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/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-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-frameworks/solid-5.82.0:5 net-fs/samba[cups] discovery? ( net-libs/kdsoap net-libs/kdsoap-ws-discovery-client ) dev-qt/qtcore:5
+DESCRIPTION=Advanced network neighborhood browser
+EAPI=8
+HOMEPAGE=https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/
+IUSE=+discovery plasma debug +handbook
+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.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/kdnssd-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/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-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-frameworks/solid-5.82.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.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://sourceforge/smb4k/smb4k-3.1.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=52c5e42a68bda3ebf22e7b8db2e652e8
diff --git a/metadata/md5-cache/net-misc/socket-burst-dampener-1.3.1 b/metadata/md5-cache/net-misc/socket-burst-dampener-1.3.1
index 551c99bfc6b5..b1d96336dfc6 100644
--- a/metadata/md5-cache/net-misc/socket-burst-dampener-1.3.1
+++ b/metadata/md5-cache/net-misc/socket-burst-dampener-1.3.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/s/socket-burst-dampener/socket-burst-dampener-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d00fc524782d5f2773f5068dea5c3ca2
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1 b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
index 14d7d77d1ff4..fa9b7b643a6a 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
+++ b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.1/streamlink-1.3.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf8fe80ef7e0fad8c6472a5956130e34
diff --git a/metadata/md5-cache/net-misc/streamlink-2.0.0 b/metadata/md5-cache/net-misc/streamlink-2.0.0
index 0be33611a766..b4db1cf2c2c8 100644
--- a/metadata/md5-cache/net-misc/streamlink-2.0.0
+++ b/metadata/md5-cache/net-misc/streamlink-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/2.0.0/streamlink-2.0.0.tar.gz https://dev.gentoo.org/~leio/distfiles/streamlink.1-2.0.0.man.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12b6d198b592976327f53f8a76779184
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 2288e251817f..368510cd0de4 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_tar
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12b6d198b592976327f53f8a76779184
diff --git a/metadata/md5-cache/net-misc/stunnel-5.59 b/metadata/md5-cache/net-misc/stunnel-5.59
index 260e5d8bfdd3..bd133178afeb 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.59
+++ b/metadata/md5-cache/net-misc/stunnel-5.59
@@ -5,11 +5,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=7
 HOMEPAGE=https://www.stunnel.org/index.html
 IUSE=ipv6 selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.stunnel.org/downloads/stunnel-5.59.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.59.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.59.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.59.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.59.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.59.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.59.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.59.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	ssl-cert	1283a22296251a63df6c137c9b929269	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ce3cab42c67761f45fb1ea233c0c29c
+_md5_=8b2bdcbdd9c2a81a82c6f6c6275c345f
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
index c57f0c00698e..f2f7bd30b228 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
@@ -7,9 +7,9 @@ HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=acct-user/x2gouser acct-user/x2goprint dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=acct-user/x2gouser acct-user/x2goprint dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which dev-perl/Switch dev-perl/Try-Tiny media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) virtual/tmpfiles
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5ac877c24bd6e0ae5a99a383917ac1a2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=66611cd9cd04f9467d727c2a847e5b48
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1525 b/metadata/md5-cache/net-misc/you-get-0.4.1525
index cecc61ae7b2b..4adc269d3fd9 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1525
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1525
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1525/you-get-0.4.1525.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=254598baaef83620bac9fd12127849e5
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1527 b/metadata/md5-cache/net-misc/you-get-0.4.1527
index c45f6b3fc50f..f1f13aa061bc 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1527
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1527
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1527/you-get-0.4.1527.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0351101424226711b8b897af1523046
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1545 b/metadata/md5-cache/net-misc/you-get-0.4.1545
index f99a7e5b6d7d..73e424c457d0 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1545
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1545
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1545/you-get-0.4.1545.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce4f6c44b38fc3bfe0de5bab9eb6cacd
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.06.06 b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
index 133ffa7c9f79..d7384c6e1d6a 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2021.06.06/youtube-dl-2021.06.06.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b9b8df6fc44933040b19fca1d408700
diff --git a/metadata/md5-cache/net-misc/youtube-dl-9999 b/metadata/md5-cache/net-misc/youtube-dl-9999
index f89eb2f36ce9..aeb1b4252544 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-9999
+++ b/metadata/md5-cache/net-misc/youtube-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2136af00ab4792c02be25819fb1773e
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.8.10 b/metadata/md5-cache/net-misc/yt-dlp-2021.8.10
index 68af30f8519f..3f088afcb1a6 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2021.8.10
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.8.10
@@ -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/y/yt-dlp/yt-dlp-2021.8.10.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b7084643ac644b7ace98198021d65e6
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.9.1 b/metadata/md5-cache/net-misc/yt-dlp-2021.9.1
index 18d96c419641..98dbd8f66f48 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2021.9.1
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.9.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/y/yt-dlp/yt-dlp-2021.9.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b7084643ac644b7ace98198021d65e6
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.9.25 b/metadata/md5-cache/net-misc/yt-dlp-2021.9.25
new file mode 100644
index 000000000000..7b655ba72f23
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.9.25
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg >=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=A youtube-dl fork with additional features and fixes
+EAPI=7
+HOMEPAGE=https://github.com/yt-dlp/yt-dlp
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=public-domain
+RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-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/y/yt-dlp/yt-dlp-2021.9.25.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1b7084643ac644b7ace98198021d65e6
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.4.4.17 b/metadata/md5-cache/net-nds/389-ds-base-1.4.4.17
index 75243412c4f7..5c30cb460470 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.4.4.17
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.4.4.17
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=1.4/0
 SRC_URI=https://github.com/389ds/389-ds-base/archive/refs/tags/389-ds-base-1.4.4.17.tar.gz https://crates.io/api/v1/crates/ahash/0.7.2/download -> ahash-0.7.2.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/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/concread/0.2.9/download -> concread-0.2.9.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.1/download -> crossbeam-channel-0.5.1.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/fernet/0.1.4/download -> fernet-0.1.4.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.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/openssl/0.10.33/download -> openssl-0.10.33.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/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.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.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.6/download -> redox_syscall-0.2.6.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.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/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.69/download -> syn-1.0.69.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.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/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/zeroize/1.2.0/download -> zeroize-1.2.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.0.1/download -> zeroize_derive-1.0.1.crate
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	cargo	c7fefacaebdcb455d2a7b59429eb47a6	db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	cargo	c7fefacaebdcb455d2a7b59429eb47a6	db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9724c2af00484fa08f271365053846f
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 0f2fe8c24b0a..d415a5ae3095 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/nsscache-0.39 b/metadata/md5-cache/net-nds/nsscache-0.39
index 83d4ad64f83b..8d4f03c5a736 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.39
+++ b/metadata/md5-cache/net-nds/nsscache-0.39
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.39.tar.gz -> nsscache-0.39.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0fe3e372760c320a4784528797e8d37
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index a4471b58a638..9e18be580e2b 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/canto-curses-0.9.9 b/metadata/md5-cache/net-news/canto-curses-0.9.9
index 189c471f8c4d..4265578820d5 100644
--- a/metadata/md5-cache/net-news/canto-curses-0.9.9
+++ b/metadata/md5-cache/net-news/canto-curses-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=>=net-news/canto-daemon-0.9.1[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-curses/archive/v0.9.9.tar.gz -> canto-curses-0.9.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9221b04266c916d0a8747153d3d90d4
diff --git a/metadata/md5-cache/net-news/canto-daemon-0.9.8 b/metadata/md5-cache/net-news/canto-daemon-0.9.8
index 7d375d734181..abfe84148cd1 100644
--- a/metadata/md5-cache/net-news/canto-daemon-0.9.8
+++ b/metadata/md5-cache/net-news/canto-daemon-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-next/archive/v0.9.8.tar.gz -> canto-daemon-0.9.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64a2d5cf8cda495fcbdc0fd6c30cb755
diff --git a/metadata/md5-cache/net-news/rssguard-4.0.1 b/metadata/md5-cache/net-news/rssguard-4.0.1
deleted file mode 100644
index 47e758b0c57d..000000000000
--- a/metadata/md5-cache/net-news/rssguard-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm preinst prepare pretend
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
-DESCRIPTION=Simple (yet powerful) feed reader
-EAPI=8
-HOMEPAGE=https://github.com/martinrotter/rssguard
-IUSE=debug webengine
-KEYWORDS=~amd64
-LICENSE=|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
-SLOT=0
-SRC_URI=https://github.com/martinrotter/rssguard/archive/4.0.1.tar.gz -> rssguard-4.0.1.tar.gz
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a297fa9c07676ab5a8e166248d92e2fe
diff --git a/metadata/md5-cache/net-news/rssguard-4.0.3 b/metadata/md5-cache/net-news/rssguard-4.0.3
new file mode 100644
index 000000000000..e245b4c6bfd6
--- /dev/null
+++ b/metadata/md5-cache/net-news/rssguard-4.0.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
+DESCRIPTION=Simple (yet powerful) feed reader
+EAPI=8
+HOMEPAGE=https://github.com/martinrotter/rssguard
+IUSE=debug webengine
+KEYWORDS=~amd64
+LICENSE=|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
+SLOT=0
+SRC_URI=https://github.com/martinrotter/rssguard/archive/4.0.3.tar.gz -> rssguard-4.0.3.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=875b1babfc2e4d6f9fede47896f8d228
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index fe5c4f191c36..de1f65ce706f 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.4.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.4.1
deleted file mode 100644
index 057f73ee7561..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=8
-HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.4.1/SABnzbd-3.4.1-src.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=baf60926753f04fab017f4671f7dd590
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.4.1-r1 b/metadata/md5-cache/net-nntp/sabnzbd-3.4.1-r1
new file mode 100644
index 000000000000..fa7183ff60db
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.4.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst setup
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=8
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.4.1/SABnzbd-3.4.1-src.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5fc313be5d92c0ec075877ecb67212d8
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 95135fe8553c..b19d39308c94 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.11.2 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.2
new file mode 100644
index 000000000000..538fd1ab0379
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.2
@@ -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-3.20.5 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=8
+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.2.tar.gz -> airdcpp-webclient-2.11.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=58902bf20cf749a06a80bc9e1aadc9a0
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
index 26f97f14c9ee..78c112448369 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6533b4f638f6d90bef112832a31f24fe
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
index 0cc666935038..56e9dbcf0b88 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
@@ -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=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d83c7216d1d0fe28b86809947850afd
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
index a902e8205ce6..dd9b49895a5f 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
@@ -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=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ba9fe025e905b9aab1ea14e14cc34586
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4
deleted file mode 100644
index 1141a0a0e064..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4
+++ /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=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.16.4.tar.gz -> cpuminer-opt-3.16.4.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f06866ec9db98bb526d9567c8750d4c4
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
new file mode 100644
index 000000000000..0dd9e4fdb7eb
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.16.4.tar.gz -> cpuminer-opt-3.16.4.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1
deleted file mode 100644
index 66a1bff74991..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.17.1.tar.gz -> cpuminer-opt-3.17.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f06866ec9db98bb526d9567c8750d4c4
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
new file mode 100644
index 000000000000..8ff6e545b2fa
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.17.1.tar.gz -> cpuminer-opt-3.17.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
new file mode 100644
index 000000000000..287a8c18355c
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
@@ -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=configure install prepare test
+DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.18.0.tar.gz -> cpuminer-opt-3.18.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-9999 b/metadata/md5-cache/net-p2p/cpuminer-opt-9999
index e741f864e619..fcceca196bbc 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-9999
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 DESCRIPTION=Optimized multi algo CPU miner
 EAPI=7
 HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
 IUSE=cpu_flags_x86_sse2 curl
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
+RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f06866ec9db98bb526d9567c8750d4c4
+_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r10 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r10
new file mode 100644
index 000000000000..d5edb11bfb49
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r10
@@ -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] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_9(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_9(-)] <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_9(-)] geoip? ( dev-python/geoip-python[python_targets_python3_9(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_9(-)] ) dev-python/pygobject:3[python_targets_python3_9(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/mako[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 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=457b2ef1618eb867ec4ac0e58e95d307
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
index b7f729d81da8..99153686a504 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=571c06d24928503b1bc338c21503072f
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r9 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r9
index 0fbc1c55d404..81b01051f70c 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r9
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r9
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3ea6701834af502ab97aae09023d0ca
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index f60755393585..ccd2e45796d1 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -1,14 +1,14 @@
 BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=BitTorrent client with a client/server model
 EAPI=7
 HOMEPAGE=https://deluge-torrent.org/
 IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_9(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_9(-)] geoip? ( dev-python/geoip-python[python_targets_python3_9(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_9(-)] ) dev-python/pygobject:3[python_targets_python3_9(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_9(-)] dev-python/mako[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] )
+RDEPEND=python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_9(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_9(-)] <net-libs/libtorrent-rasterbar-2.0.0[python,python_targets_python3_9(-)] geoip? ( dev-python/geoip-python[python_targets_python3_9(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_9(-)] ) dev-python/pygobject:3[python_targets_python3_9(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/mako[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 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62bab09867242b2a1c5a7eba00b466d5
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=457b2ef1618eb867ec4ac0e58e95d307
diff --git a/metadata/md5-cache/net-p2p/nicotine+-2.2.2 b/metadata/md5-cache/net-p2p/nicotine+-2.2.2
index 3a75d2ea642d..41624b57225c 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-2.2.2
+++ b/metadata/md5-cache/net-p2p/nicotine+-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/2.2.2.tar.gz -> nicotine+-2.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2007941ec74b38f26ac3418c5f583c8b
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.0.2 b/metadata/md5-cache/net-p2p/nicotine+-3.0.2
index cdb4fca4c6e2..346d9526dae5 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.0.2
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.0.2.tar.gz -> nicotine+-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a4409648639192d782db1b221ec9370e
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.0.4 b/metadata/md5-cache/net-p2p/nicotine+-3.0.4
index ab965a7490d8..f14bdc11218f 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.0.4
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.0.4.tar.gz -> nicotine+-3.0.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=47d2825e2186f3ef090e0c799f534829
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.0.6 b/metadata/md5-cache/net-p2p/nicotine+-3.0.6
index d3e8febdcf18..17836420f6b1 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.0.6
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.0.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.0.6.tar.gz -> nicotine+-3.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=47d2825e2186f3ef090e0c799f534829
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.1.1 b/metadata/md5-cache/net-p2p/nicotine+-3.1.1
new file mode 100644
index 000000000000..6ee2f58a9e7e
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[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(-)?]
+DESCRIPTION=A fork of nicotine, a Soulseek client in Python
+EAPI=7
+HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[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(-)?] python_targets_python3_8? ( dev-lang/python: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/Nicotine-Plus/nicotine-plus/archive/3.1.1.tar.gz -> nicotine+-3.1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=47d2825e2186f3ef090e0c799f534829
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.18.1 b/metadata/md5-cache/net-p2p/syncthing-1.18.1
index 11a6ca28a21b..6714be3a4664 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.18.1
+++ b/metadata/md5-cache/net-p2p/syncthing-1.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=8
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD BSD-2 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	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ea5d864c7783f7eae3d73d593c8f3116
+_md5_=7d64d66377326612ab9857b9e6346af6
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
index 122351341eb6..caec1c2b857d 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
@@ -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/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ee9865ae48dbe0c4ded6bfe236033f8
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 0b94c077ec5e..ad885ae68f5f 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cnrdrvcups-lb-5.40 b/metadata/md5-cache/net-print/cnrdrvcups-lb-5.40
new file mode 100644
index 000000000000..e74482e5ea93
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnrdrvcups-lb-5.40
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/libglade:2.0 media-libs/jbigkit media-libs/libjpeg-turbo net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/pango
+DESCRIPTION=Canon UFR II / LIPSLX Printer Driver for Linux
+EAPI=8
+HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Canon-UFR-II GPL-2 MIT
+RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/libglade:2.0 media-libs/jbigkit media-libs/libjpeg-turbo net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/pango !net-print/cndrvcups-common-lb !net-print/cndrvcups-lb
+SLOT=0
+SRC_URI=https://gdlp01.c-wss.com/gds/8/0100007658/25/linux-UFRII-drv-v540-uken-08.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=49f930e08d77182eac909d8eb7bc53af
diff --git a/metadata/md5-cache/net-print/hplip-3.21.8 b/metadata/md5-cache/net-print/hplip-3.21.8
new file mode 100644
index 000000000000..1ed2caf84676
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.21.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_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] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_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] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) app-text/ghostscript-gpl !minimal? ( 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(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.21.8.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.4-patches-1.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=6877dbcdba66091847207ade876a793e
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index cf2b7f653933..0723f5eaa510 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-7.0.3 b/metadata/md5-cache/net-proxy/mitmproxy-7.0.3
index 7538978f742d..136991027e24 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-7.0.3
+++ b/metadata/md5-cache/net-proxy/mitmproxy-7.0.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/mitmproxy/mitmproxy/archive/v7.0.3.tar.gz -> mitmproxy-7.0.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2149739e4eddc5dc5d3d5b547a5ba858
diff --git a/metadata/md5-cache/net-proxy/sshuttle-1.0.5 b/metadata/md5-cache/net-proxy/sshuttle-1.0.5
index e781a5c74ff5..7f99b3540d93 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-1.0.5
+++ b/metadata/md5-cache/net-proxy/sshuttle-1.0.5
@@ -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/sshuttle/sshuttle-1.0.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87cae0c55960e84107e18a511c7fc0fa
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 33dec018cbd0..0018e4ee4c6f 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/sipvicious-0.3.0 b/metadata/md5-cache/net-voip/sipvicious-0.3.0
index 9dd019c5106a..3f729052227c 100644
--- a/metadata/md5-cache/net-voip/sipvicious-0.3.0
+++ b/metadata/md5-cache/net-voip/sipvicious-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/EnableSecurity/sipvicious/archive/v0.3.0.tar.gz -> sipvicious-0.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8b4c726bf388d08327eaf24ed1e3ec6
diff --git a/metadata/md5-cache/net-voip/sipvicious-0.3.3 b/metadata/md5-cache/net-voip/sipvicious-0.3.3
index cb7b76a31e82..a2ef98d7c5b7 100644
--- a/metadata/md5-cache/net-voip/sipvicious-0.3.3
+++ b/metadata/md5-cache/net-voip/sipvicious-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/EnableSecurity/sipvicious/archive/v0.3.3.tar.gz -> sipvicious-0.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=097fdc6ecf54e32d10a89c4873c117b7
diff --git a/metadata/md5-cache/net-voip/sipvicious-0.3.4 b/metadata/md5-cache/net-voip/sipvicious-0.3.4
index d61b62bfa046..3e8047c12946 100644
--- a/metadata/md5-cache/net-voip/sipvicious-0.3.4
+++ b/metadata/md5-cache/net-voip/sipvicious-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/EnableSecurity/sipvicious/archive/v0.3.4.tar.gz -> sipvicious-0.3.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98b2db6babcffd8f10497a2a6f04a200
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index fca2e7652704..6f5cd7680b94 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/ipsec-tools-0.8.2-r8 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r8
deleted file mode 100644
index 5e58e89c2708..000000000000
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/openssl:0= virtual/libcrypt:= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-2.6.30 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
-EAPI=6
-HOMEPAGE=http://ipsec-tools.sourceforge.net/
-IUSE=hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats kernel_linux
-KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/ipsec-tools-add-openssl-1.1.x-support.patch
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=906fd7610c7df835c5a5fab95f503ee0
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
index b612d41d5dd4..4445b518a6a5 100644
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
+++ b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docopt[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/ProtonVPN/linux-cli/archive/v2.2.6.tar.gz -> protonvpn-cli-2.2.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dff777953ab9486b651d354cec757c59
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
index b5ed450bdc7f..0d3650721a63 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
@@ -4,10 +4,10 @@ DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
 EAPI=7
 HOMEPAGE=https://www.wireguard.com/
 IUSE=+wg-quick selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) selinux? ( sec-policy/selinux-wireguard )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210914.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5bc6ef0438cc4484dd4fca72bf9293a9
+_md5_=d09bbbbf9fc48c3a0b115d048ab17240
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 536306dcba55..7a80ef75562c 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/aircrack-ng-1.6_p20200722 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
index 50a3764cb571..94c9ac8906fb 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libpcap sys-apps/hwloc:0= dev-libs/openssl:0= netlink? ( dev-li
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) airgraph-ng? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/aircrack-ng/aircrack-ng/archive/5a02ac4818b30d2e87b3e18e497a5f9e5319394f.tar.gz -> aircrack-ng-1.6_p20200722.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a178cc625989227fc7645a2e2769426f
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-9999 b/metadata/md5-cache/net-wireless/aircrack-ng-9999
index 23a137952ff4..e40737c9b491 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-9999
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=net-libs/libpcap sys-apps/hwloc:0= dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) airgraph-ng? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) airgraph-ng? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20f27bb390df1f97fdce9843a537a380
diff --git a/metadata/md5-cache/net-wireless/blueman-2.2.2 b/metadata/md5-cache/net-wireless/blueman-2.2.2
index 35f2263381f1..0b957e57885f 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.2.2
+++ b/metadata/md5-cache/net-wireless/blueman-2.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
 IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3+ GPL-2
 RDEPEND=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(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.2.2/blueman-2.2.2.tar.xz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a123fa9d778b60c96c57a05cd00a57c5
+_md5_=cce1679717bae213167140ba3fe4bc8d
diff --git a/metadata/md5-cache/net-wireless/dump1090-5.0 b/metadata/md5-cache/net-wireless/dump1090-5.0
index b886fde4d213..f07f71069e41 100644
--- a/metadata/md5-cache/net-wireless/dump1090-5.0
+++ b/metadata/md5-cache/net-wireless/dump1090-5.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )
 DESCRIPTION=simple Mode S decoder for RTLSDR devices
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libu
 SLOT=0
 SRC_URI=https://github.com/flightaware/dump1090/archive/v5.0.tar.gz -> dump1090-5.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40c5bfa9fe4698767871668887f66f1a
+_md5_=99b3ccef9fb85d39131575178a4fbb80
diff --git a/metadata/md5-cache/net-wireless/dump1090-9999 b/metadata/md5-cache/net-wireless/dump1090-9999
index 625dc5c3d790..be686b2b4522 100644
--- a/metadata/md5-cache/net-wireless/dump1090-9999
+++ b/metadata/md5-cache/net-wireless/dump1090-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install postinst prepare unpack
 DEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )
 DESCRIPTION=simple Mode S decoder for RTLSDR devices
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) virtual/tmpfiles
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8b38d7e17b38ae33e6bd225c69690c1
+_md5_=2182729910fd7f098d9ac50e54fefe82
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.3.1 b/metadata/md5-cache/net-wireless/gnuradio-3.8.3.1
deleted file mode 100644
index 12dab0cec56a..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-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] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) !!<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=7
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm ~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_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
-RESTRICT=test
-SLOT=0/3.8.3.1
-SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.8.3.1.tar.gz -> gnuradio-3.8.3.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5ac01b49738c1e3a4c124a5def2178e3
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0 b/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
new file mode 100644
index 000000000000..96b6f4c699ee
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+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] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) !!<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=7
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm ~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_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=test
+SLOT=0/3.8.4.0
+SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.8.4.0.tar.gz -> gnuradio-3.8.4.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5ac01b49738c1e3a4c124a5def2178e3
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r6 b/metadata/md5-cache/net-wireless/hostapd-2.9-r6
index 632129f4e4bb..12bc9be04741 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r6
+++ b/metadata/md5-cache/net-wireless/hostapd-2.9-r6
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5bd28da7dc8c61d948a9919212c052e
diff --git a/metadata/md5-cache/net-wireless/hostapd-9999 b/metadata/md5-cache/net-wireless/hostapd-9999
index 76e0a3b9149c..556c22ac7a27 100644
--- a/metadata/md5-cache/net-wireless/hostapd-9999
+++ b/metadata/md5-cache/net-wireless/hostapd-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=415c03b094bc7310d531260e06bc46a8
diff --git a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1 b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
index af7f5fd30b9c..e11b59fc243f 100644
--- a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
+++ b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/tabulate[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/insecurityofthings/jackit/archive/1c057fad102af7daad537421d95e2695caeff2b7.tar.gz -> jackit-0.0_p20170918.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe59f3af0551347801a33e5fdcb50276
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02 b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
index 410f367dccb7..adaf7ad36f00 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
+++ b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-rest/archive/2019.05.02.tar.gz -> kismet-rest-2019.05.02.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a7c13e680c769313915f6f5716ed6fd
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-9999 b/metadata/md5-cache/net-wireless/kismet-rest-9999
index 0cddd2a721bb..a91665ee94fc 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-9999
+++ b/metadata/md5-cache/net-wireless/kismet-rest-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a7c13e680c769313915f6f5716ed6fd
diff --git a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05 b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
index d886961d9858..2d8e6b6431a6 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
+++ b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-db/archive/2019.05.05.tar.gz -> kismetdb-2019.05.05.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef7433c653a10964673237140430b1fc
diff --git a/metadata/md5-cache/net-wireless/kismetdb-9999 b/metadata/md5-cache/net-wireless/kismetdb-9999
index dc88b87f26c4..77cee9f10328 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-9999
+++ b/metadata/md5-cache/net-wireless/kismetdb-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplekml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=06e92ec938faec9b6e4491ebf015da42
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
index 4f62ef9b4dd9..473dcd56c5a3 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/7dbf24ee6f7c277240c0fbd988b6902850577772.tar.gz -> lorcon-0.0_p20200214.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=183018b13a71b46e479438bf6b0fde7c
diff --git a/metadata/md5-cache/net-wireless/lorcon-2020.06.06 b/metadata/md5-cache/net-wireless/lorcon-2020.06.06
index 9c29d9fbdc7d..cadf202a6fbe 100644
--- a/metadata/md5-cache/net-wireless/lorcon-2020.06.06
+++ b/metadata/md5-cache/net-wireless/lorcon-2020.06.06
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/2020.06.06.tar.gz -> lorcon-2020.06.06.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1a8a48249a8a4b918959c7b70245800
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 1988452e5157..ec0c73910804 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcd0eaa206ea6534782ad203540b206e
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-0.3.8 b/metadata/md5-cache/net-wireless/nanovna-saver-0.3.8
index f17530d9fe22..1c9ad8c2cba5 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-0.3.8
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[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/mihtjel/nanovna-saver/archive/v0.3.8.tar.gz -> nanovna-saver-0.3.8.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac0cab6173d2eb4423990c7e88fdba1f
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-9999 b/metadata/md5-cache/net-wireless/nanovna-saver-9999
index 16cb4ee527f7..6bb25c53a661 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-9999
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac0cab6173d2eb4423990c7e88fdba1f
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.8.0 b/metadata/md5-cache/net-wireless/qdmr-0.8.0
deleted file mode 100644
index a83668391e27..000000000000
--- a/metadata/md5-cache/net-wireless/qdmr-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
-DESCRIPTION=GUI application for configuring and programming cheap DMR radios
-EAPI=7
-HOMEPAGE=https://dm3mat.darc.de/qdmr/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.8.0.tar.gz -> qdmr-0.8.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d63d351d9e988be83522a38eafabd699
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.8.1 b/metadata/md5-cache/net-wireless/qdmr-0.8.1
new file mode 100644
index 000000000000..e0de330745e5
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/qdmr-0.8.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
+DESCRIPTION=GUI application for configuring and programming cheap DMR radios
+EAPI=7
+HOMEPAGE=https://dm3mat.darc.de/qdmr/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.8.1.tar.gz -> qdmr-0.8.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=aea801119b99b1d823b4c234215a4faa
diff --git a/metadata/md5-cache/net-wireless/qdmr-9999 b/metadata/md5-cache/net-wireless/qdmr-9999
index fadada725537..6796ef1a4fba 100644
--- a/metadata/md5-cache/net-wireless/qdmr-9999
+++ b/metadata/md5-cache/net-wireless/qdmr-9999
@@ -1,12 +1,13 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
 DESCRIPTION=GUI application for configuring and programming cheap DMR radios
 EAPI=7
 HOMEPAGE=https://dm3mat.darc.de/qdmr/
+IUSE=kernel_linux
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d63d351d9e988be83522a38eafabd699
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=aea801119b99b1d823b4c234215a4faa
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
deleted file mode 100644
index 1746eb162c7e..000000000000
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-EAPI=6
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.3_p20170919.tar.xz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d8412883fbb5bd695abb922aca1634f3
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
deleted file mode 100644
index db1f2ead00a7..000000000000
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-EAPI=6
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.4.tar.xz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5689ac630a6c78c4fb08ef94748f9270
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
deleted file mode 100644
index 1d63f0ea493f..000000000000
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-EAPI=6
-HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/steve-m/librtlsdr/archive/0.6.0.tar.gz -> rtl-sdr-0.6.0.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=79667c2d66e6be52c869e6f50c6ec726
diff --git a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1 b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
index 4d0183493627..1e6df0067cec 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
+++ b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[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/xmikos/soapy_power/archive/v1.6.1.tar.gz -> soapy_power-1.6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b41d3f92b427fd06e5baa117f68c6bc9
diff --git a/metadata/md5-cache/net-wireless/soapy_power-9999 b/metadata/md5-cache/net-wireless/soapy_power-9999
index 1627e88bfe76..3224b4ea53e7 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-9999
+++ b/metadata/md5-cache/net-wireless/soapy_power-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplespectral[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/simplesoapy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] faster? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) fastest? ( dev-python/pyFFTW[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b41d3f92b427fd06e5baa117f68c6bc9
diff --git a/metadata/md5-cache/net-wireless/urh-2.9.2 b/metadata/md5-cache/net-wireless/urh-2.9.2
index d9d51c3ed1c4..09c3c770f290 100644
--- a/metadata/md5-cache/net-wireless/urh-2.9.2
+++ b/metadata/md5-cache/net-wireless/urh-2.9.2
@@ -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 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v2.9.2.tar.gz -> urh-2.9.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=473595baf477470490bdec22f8e7cb1b
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index 644d7f04a746..573e54061881 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-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 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,testlib] net-wireless/gr-osmosdr python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=473595baf477470490bdec22f8e7cb1b
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index d3bb096661fc..73ee76c6f487 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/pyephem-3.7.7.1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
index 4b1c744e719c..50732ff4a11c 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.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/brandon-rhodes/pyephem/archive/v3.7.7.1.tar.gz -> pyephem-3.7.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ac3f86c6b3cd3c18e53c0a7ff08e83c
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.20.4 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.4
deleted file mode 100644
index 703a9bf275d9..000000000000
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen[dot] ) nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( sci-libs/indilib:= ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=3D photo-realistic skies in real time
-EAPI=7
-HOMEPAGE=https://stellarium.org/
-IUSE=debug deep-sky doc gps media nls stars telescope test test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ SGI-B-2.0
-RDEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( sci-libs/indilib:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium-0.20.4.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.12/catalog.dat -> stellarium-dso-catalog-3.12.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium_user_guide-0.20.4-1.pdf ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f42d82d7d176d65d75106416838915ea
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.21.0 b/metadata/md5-cache/sci-astronomy/stellarium-0.21.0
deleted file mode 100644
index fdd687283089..000000000000
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.21.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen[dot] ) nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 sci-geosciences/gpsd:=[cxx] ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( dev-qt/qtserialport:5 sci-libs/indilib:= ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=3D photo-realistic skies in real time
-EAPI=7
-HOMEPAGE=https://stellarium.org/
-IUSE=debug deep-sky doc gps media nls stars telescope test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+ SGI-B-2.0
-RDEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 sci-geosciences/gpsd:=[cxx] ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( dev-qt/qtserialport:5 sci-libs/indilib:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.21.0/stellarium-0.21.0.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.12/catalog.dat -> stellarium-dso-catalog-3.12.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v0.21.0/stellarium_user_guide-0.21.0-1.pdf ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12b8debf3acfe77a28152f21042c0506
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.21.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.21.2
new file mode 100644
index 000000000000..9cc880d668dc
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.21.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen[dot] ) nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 sci-geosciences/gpsd:=[cxx] ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( dev-qt/qtserialport:5 sci-libs/indilib:= ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 )
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=8
+HOMEPAGE=https://stellarium.org/
+IUSE=debug deep-sky doc gps media nls stars telescope test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ SGI-B-2.0
+RDEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 sci-geosciences/gpsd:=[cxx] ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( dev-qt/qtserialport:5 sci-libs/indilib:= )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.21.2/stellarium-0.21.2.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.13/catalog-3.13.dat -> stellarium-dso-catalog-3.13.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v0.21.2/stellarium_user_guide-0.21.2-1.pdf ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2c7f0a0ec565c7b1787cee2fa6ca2b29
diff --git a/metadata/md5-cache/sci-biology/HTSeq-0.12.4 b/metadata/md5-cache/sci-biology/HTSeq-0.12.4
index 898713aad3fc..be2c39068afc 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-0.12.4
+++ b/metadata/md5-cache/sci-biology/HTSeq-0.12.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[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/htseq/htseq/archive/release_0.12.4.tar.gz -> HTSeq-0.12.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae9941d3e3234244619fdcb2b46c8e90
diff --git a/metadata/md5-cache/sci-biology/HTSeq-9999 b/metadata/md5-cache/sci-biology/HTSeq-9999
index 1e8dc8971ca1..6bfbd8e63a9d 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-9999
+++ b/metadata/md5-cache/sci-biology/HTSeq-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-biology/pysam[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python: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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae9941d3e3234244619fdcb2b46c8e90
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 2d3a554847fc..00cd7583888d 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/biopandas-0.2.7 b/metadata/md5-cache/sci-biology/biopandas-0.2.7
index 457686ff0b57..6ded1212d148 100644
--- a/metadata/md5-cache/sci-biology/biopandas-0.2.7
+++ b/metadata/md5-cache/sci-biology/biopandas-0.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/BioPandas/biopandas-0.2.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e4b8600d4f3c3ac26b099a9c4577ca0
diff --git a/metadata/md5-cache/sci-biology/biopython-1.77 b/metadata/md5-cache/sci-biology/biopython-1.77
index 10a2ad9039e8..8eaba77da9c0 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f5250b5ff62ae5ff155616d0b65204b
diff --git a/metadata/md5-cache/sci-biology/mira-4.0.2-r1 b/metadata/md5-cache/sci-biology/mira-4.0.2-r1
deleted file mode 100644
index ad7c78160f80..000000000000
--- a/metadata/md5-cache/sci-biology/mira-4.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-util/google-perftools sys-devel/flex app-editors/vim-core dev-libs/expat sys-devel/gnuconfig >=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=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Illumina
-EAPI=6
-HOMEPAGE=http://www.chevreux.org/projects_mira.html
-IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-util/google-perftools
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/mira-assembler/files/MIRA/stable/mira-4.0.2.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d807f37f8dfc41b66f293797784f472
diff --git a/metadata/md5-cache/sci-biology/pysam-0.16.0.1 b/metadata/md5-cache/sci-biology/pysam-0.16.0.1
index 3189b922c80b..75642acd46a4 100644
--- a/metadata/md5-cache/sci-biology/pysam-0.16.0.1
+++ b/metadata/md5-cache/sci-biology/pysam-0.16.0.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/pysam-developers/pysam/archive/v0.16.0.1.tar.gz -> pysam-0.16.0.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24cbd77fb49bf7dfa36311bf5973256d
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index f49249350355..82cade91cb1a 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.17.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.17.0
deleted file mode 100644
index e9146ce016cb..000000000000
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/rarian dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.17.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modern multi-purpose calculator
-EAPI=7
-HOMEPAGE=https://qalculate.github.io/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.17.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.17.0/qalculate-gtk-3.17.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b8500414a30bb18bb30a93ab71dbbf4
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.18.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.18.0
deleted file mode 100644
index 5cc0cc132c72..000000000000
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/rarian dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modern multi-purpose calculator
-EAPI=7
-HOMEPAGE=https://qalculate.github.io/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.18.0/qalculate-gtk-3.18.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b147ef4adc30d5fb01165432761e8824
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
deleted file mode 100644
index a8b834f17be4..000000000000
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/rarian dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modern multi-purpose calculator
-EAPI=7
-HOMEPAGE=https://qalculate.github.io/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.19.0/qalculate-gtk-3.19.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b147ef4adc30d5fb01165432761e8824
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
index a97c0fb24719..85d488853afb 100644
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-r1
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0-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/Becksteinlab/GromacsWrapper/archive/release-0.8.0.tar.gz -> GromacsWrapper-0.8.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02ab15bd0be40f1104b82e10c946a29a
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0 b/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
index c320dcfead62..2b6ea8c494be 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MDAnalysis/MDAnalysis-1.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=173924a2840018a8cf103252a07a1c8d
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index b5858451525c..c4edec7c2cd5 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/chemex-2018.10.3 b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
index da04f74306ad..ee9d24c21c04 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
+++ b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
@@ -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/gbouvignies/chemex/archive/2018.10.3.tar.gz -> chemex-2018.10.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3275627c04cf126235173404b2fc026c
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p2 b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p2
new file mode 100644
index 000000000000..571e16735bd6
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_8(-)] >=dev-python/numpy-1.21.0[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_9(-)] >=dev-python/numpy-1.21.0[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.11[python_targets_python3_10(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_10(-)] >=dev-python/numpy-1.21.0[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_8(-)] >=dev-python/numpy-1.21.0[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_9(-)] >=dev-python/numpy-1.21.0[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.11[python_targets_python3_10(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_10(-)] >=dev-python/numpy-1.21.0[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_8(-)] >=dev-python/numpy-1.21.0[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_9(-)] >=dev-python/numpy-1.21.0[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.11[python_targets_python3_10(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.2[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.2[python_targets_python3_10(-)] >=dev-python/numpy-1.21.0[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[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] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/chemex/archive/2021.4.0-dev2.tar.gz -> chemex-2021.4.0_p2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1bbb8fece58aef5e8499f95b58cb94a1
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index b4e7e9825e1c..1fd84951cb22 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.4.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=01b04fb2ec28ac60b59ec5669f8f43e3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.6 b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
index 7eb46627b77f..332c9b385586 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2020.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.6.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.6.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6c5e2ad761870bdf868917d276f9c5e7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.2 b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
index 49fc03b1df0d..367c4108f9a2 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.2
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.2.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.2.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.2.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5e6d6bcda4b41887475cdba7e89c0a03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.3 b/metadata/md5-cache/sci-chemistry/gromacs-2021.3
index faf94c013eab..d8a206ab3971 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.3
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.3.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.3.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9361c477017a210f59e8056dd5f4abcd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 96155590629d..e2deb141a643 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=51ff5bfd02d9afe75f75c9e2345bbc03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 655afb580822..b356e532a305 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=51ff5bfd02d9afe75f75c9e2345bbc03
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
index 13f145884b11..6bf4594d6d94 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dbdcffa8a3d57c4db3c130a0096698ea
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.25 b/metadata/md5-cache/sci-chemistry/modeller-9.25
index d4d65bf55ffb..a324cd05738b 100644
--- a/metadata/md5-cache/sci-chemistry/modeller-9.25
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.25
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://salilab.org/modeller/9.25/modeller-9.25.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d9975b49fae85d859bbbbd318436f17
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.7 b/metadata/md5-cache/sci-chemistry/nmrglue-0.7
index 7de4cc6e63b2..33614d019bf9 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.7
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.7/nmrglue-0.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=197459a7eef5261de4cf3cb0315254ac
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.2.0 b/metadata/md5-cache/sci-chemistry/propka-3.2.0
index 387e9c13655a..3ebeadb44c03 100644
--- a/metadata/md5-cache/sci-chemistry/propka-3.2.0
+++ b/metadata/md5-cache/sci-chemistry/propka-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/propka/propka-3.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd048f5978b21207dd0a67d80964171d
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 40c73d8d21bb..5d9703667a1c 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	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 6b04b7248857..3fa185889ceb 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c7ffea6e164d1fd0a5649c6eb3a85da0
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 50ade12af75e..1df8c81ca2b8 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/magic-7.5.202-r1 b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
index db97c2f51af8..c3b5c3a1b1e5 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af7dc6435d65a5690a33917981eea531
+_md5_=de5458bb228ed1f0957d09b741240c75
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.52 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.52
index 9670ad497d05..962824de35a5 100644
--- a/metadata/md5-cache/sci-geosciences/GeographicLib-1.52
+++ b/metadata/md5-cache/sci-geosciences/GeographicLib-1.52
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( 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	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 0bb855623eb0..7545abe2ddc4 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 447f4081798c..6889067db37d 100644
--- a/metadata/md5-cache/sci-geosciences/folium-0.12.1
+++ b/metadata/md5-cache/sci-geosciences/folium-0.12.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/python-visualization/folium/archive/refs/tags/v0.12.1.tar.gz -> folium-0.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99cfe0ad9d0e9058bfede819e29aef79
diff --git a/metadata/md5-cache/sci-geosciences/geopy-2.2.0 b/metadata/md5-cache/sci-geosciences/geopy-2.2.0
index f06ce9407e7e..48a71462625f 100644
--- a/metadata/md5-cache/sci-geosciences/geopy-2.2.0
+++ b/metadata/md5-cache/sci-geosciences/geopy-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopy/geopy/archive/refs/tags/2.2.0.tar.gz -> geopy-2.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0aa5e40b621ef73bb461ef11c291af8d
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.21 b/metadata/md5-cache/sci-geosciences/gpsd-3.21
index 263d62dc8f12..c30873e548b5 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.21
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.21
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/27
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.21.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=5e94f07b724f9a7264d2287c6750e41b
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
index 1da110f3b768..0d6b571ed006 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.23-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=4561900b8a8b3587e4186f337a18c79b
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1 b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1
index 703cf5c2a4fc..9bdd59e0abf6 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=22f236933341bf1092c643f1b7232da6
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 04e042bcb2e7..9ab93e0e9b52 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 || (
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/29
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=22f236933341bf1092c643f1b7232da6
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3 b/metadata/md5-cache/sci-geosciences/routino-3.3.3
index f95badbff494..5e0a7cbb378d 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3
+++ b/metadata/md5-cache/sci-geosciences/routino-3.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://routino.org/download/routino-3.3.3.tgz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ae8eeb9c5f000097dfce1ff79364c25
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 156785edba2a..fcde0b727b54 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/bmrblib-1.0.4 b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
index a6ad2b653fab..682dd75d6e99 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.4
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bmrblib/bmrblib-1.0.4.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d062e5eabca6077450c44fb9e2e931a
diff --git a/metadata/md5-cache/sci-libs/branca-0.4.2-r1 b/metadata/md5-cache/sci-libs/branca-0.4.2-r1
index ea2b7ae02bec..e5e94985f978 100644
--- a/metadata/md5-cache/sci-libs/branca-0.4.2-r1
+++ b/metadata/md5-cache/sci-libs/branca-0.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a041c86dbc3155c7bae2338ad61ad05d
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.18.0 b/metadata/md5-cache/sci-libs/cartopy-0.18.0
index 345a61d5bf3a..4298233248d4 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.18.0
+++ b/metadata/md5-cache/sci-libs/cartopy-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( pytho
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.18.0.tar.gz -> cartopy-0.18.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=bb97d5e88e71a039a996e32339e8828c
diff --git a/metadata/md5-cache/sci-libs/dlib-19.22 b/metadata/md5-cache/sci-libs/dlib-19.22
index f4997e7ebe92..119612927bd9 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.22
+++ b/metadata/md5-cache/sci-libs/dlib-19.22
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( png || ( python_targets_python3_8 python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0/19.22
 SRC_URI=https://github.com/davisking/dlib/archive/v19.22.tar.gz -> dlib-19.22.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb8f6442c02887729dbe17313420074b
diff --git a/metadata/md5-cache/sci-libs/fplll-5.3.2 b/metadata/md5-cache/sci-libs/fplll-5.3.2
deleted file mode 100644
index eac92afb20b9..000000000000
--- a/metadata/md5-cache/sci-libs/fplll-5.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/gmp:0 dev-libs/mpfr:0
-DESCRIPTION=Implementations of the floating-point LLL reduction algorithm
-EAPI=7
-HOMEPAGE=https://github.com/fplll/fplll
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:0 dev-libs/mpfr:0
-SLOT=0/6
-SRC_URI=https://github.com/fplll/fplll/releases/download/5.3.2/fplll-5.3.2.tar.gz
-_md5_=648422d7575dcf30c3972987eaec6c34
diff --git a/metadata/md5-cache/sci-libs/fplll-5.4.0 b/metadata/md5-cache/sci-libs/fplll-5.4.0
index f9d6dc1a395c..7c56856712d3 100644
--- a/metadata/md5-cache/sci-libs/fplll-5.4.0
+++ b/metadata/md5-cache/sci-libs/fplll-5.4.0
@@ -5,9 +5,9 @@ DESCRIPTION=Implementations of the floating-point LLL reduction algorithm
 EAPI=7
 HOMEPAGE=https://github.com/fplll/fplll
 IUSE=static-libs qd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 qd? ( sci-libs/qd )
 SLOT=0/7
 SRC_URI=https://github.com/fplll/fplll/releases/download/5.4.0/fplll-5.4.0.tar.gz
-_md5_=4d3249865c0eca346684cf96563cac85
+_md5_=b7a2f82d20bd1ac0a89d6aa93732b7b0
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.1-r1 b/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
index 4d80dae4a7db..be282e48d79b 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.1/gdal-3.2.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fdc3e25c743c59f889e97cf1198f1d67
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.2 b/metadata/md5-cache/sci-libs/gdal-3.2.2
index f86cb06f0645..b2f1fa080826 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.2
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5eb853adfdbed418d23a7f2e38d2985d
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.3 b/metadata/md5-cache/sci-libs/gdal-3.2.3
index 5fea736c31b5..578e164a931e 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.3
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.3/gdal-3.2.3.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b8d1a7fdab9f7de7af83f402ddd5fde
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.0 b/metadata/md5-cache/sci-libs/gdal-3.3.0
index 3f9bf5edd241..6d667ff994e1 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.0/gdal-3.3.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0213bc8e890bafe630d76078552ecd2
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.1 b/metadata/md5-cache/sci-libs/gdal-3.3.1
index 2b3f4aee6299..d25b22850a18 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.1/gdal-3.3.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eccca1cdb547036668fe5660a0295ff4
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.2 b/metadata/md5-cache/sci-libs/gdal-3.3.2
index bcf7f073f215..a42eb2b053e4 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.2
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.2/gdal-3.3.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=050f7e1c7d081c6d6c9ecc47cc60f809
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.2 b/metadata/md5-cache/sci-libs/indilib-1.9.2
new file mode 100644
index 000000000000..9ce42e02ad35
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= ) kernel_linux? ( sys-kernel/linux-headers ) test? ( >=dev-cpp/gtest-1.8.0 ) websocket? ( dev-cpp/websocketpp )
+DESCRIPTION=INDI Astronomical Control Protocol library
+EAPI=7
+HOMEPAGE=https://www.indilib.org/
+IUSE=ogg rtlsdr test websocket
+KEYWORDS=~amd64 ~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.2.tar.gz -> indilib-1.9.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e3fed54920691b08aae3b20f7d4d223a
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
index 72ccdcbba2aa..970a971e4a1c 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[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/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7d3005a3aa29f72e2d19577fbda77fa2
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
index ec13b2459bf6..970cc09d82b8 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/K/Keras_Preprocessing/Keras_Preprocessing-1.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee096f546742a452b61f09641d37f1d3
diff --git a/metadata/md5-cache/sci-libs/libcifpp-1.1.1 b/metadata/md5-cache/sci-libs/libcifpp-1.1.1
index 859b10eea555..36fc77f19cbb 100644
--- a/metadata/md5-cache/sci-libs/libcifpp-1.1.1
+++ b/metadata/md5-cache/sci-libs/libcifpp-1.1.1
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-libs/boost-1.70.0:0=[threads(+)] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Code to work with mmCIF and PDB files
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/PDB-REDO/libcifpp
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=virtual/tmpfiles
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v1.1.1.tar.gz -> libcifpp-1.1.1.tar.gz ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-1.1.1.cif.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cee0f32cf6555d6a64e1f0f5bc72dd7c
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e23307910044901b796ae79300343f7c
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.17.0 b/metadata/md5-cache/sci-libs/libqalculate-3.17.0
deleted file mode 100644
index 9ab08d00fb9b..000000000000
--- a/metadata/md5-cache/sci-libs/libqalculate-3.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=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= )
-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
-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.17.0/libqalculate-3.17.0.tar.gz
-_md5_=b7b2cde126d092825f8929d7544433ca
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.18.0 b/metadata/md5-cache/sci-libs/libqalculate-3.18.0
deleted file mode 100644
index 6b1278ca91ea..000000000000
--- a/metadata/md5-cache/sci-libs/libqalculate-3.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=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= )
-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
-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.18.0/libqalculate-3.18.0.tar.gz
-_md5_=b7b2cde126d092825f8929d7544433ca
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.19.0 b/metadata/md5-cache/sci-libs/libqalculate-3.19.0
deleted file mode 100644
index 01f9527a2afa..000000000000
--- a/metadata/md5-cache/sci-libs/libqalculate-3.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=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= )
-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
-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	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b532f57616d138793dafa0cbeade61
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1 b/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
index 92312edfb1f5..386d739c73b3 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
@@ -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 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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/22
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.20.1/libqalculate-3.20.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e21146ada66a173225285bd292f1540e
+_md5_=9f869138c8b7556a8ad8869108c20140
diff --git a/metadata/md5-cache/sci-libs/numkit-1.1.2-r1 b/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
index 1307dc25c26b..5ddd48e2f3a3 100644
--- a/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/numkit-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[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/Becksteinlab/numkit/archive/release-1.1.2.tar.gz -> numkit-1.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1127befc0d2c6e733acd34d250d2956
diff --git a/metadata/md5-cache/sci-libs/pyshp-2.1.3 b/metadata/md5-cache/sci-libs/pyshp-2.1.3
index d2ae96ba7d7e..b39d6f8f7183 100644
--- a/metadata/md5-cache/sci-libs/pyshp-2.1.3
+++ b/metadata/md5-cache/sci-libs/pyshp-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-2.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=35fb338665dfde10526ed635c3d45a4b
diff --git a/metadata/md5-cache/sci-libs/rtree-0.9.7 b/metadata/md5-cache/sci-libs/rtree-0.9.7
index 2957d986710e..ff3b19c5cdf7 100644
--- a/metadata/md5-cache/sci-libs/rtree-0.9.7
+++ b/metadata/md5-cache/sci-libs/rtree-0.9.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/R/Rtree/Rtree-0.9.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f047b9647920d13925b05c05f198633
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 547f1db857ed..4463513e9148 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cf371493fd1a392e49a507625b33c58
diff --git a/metadata/md5-cache/sci-libs/scikit-learn-0.24.2 b/metadata/md5-cache/sci-libs/scikit-learn-0.24.2
index 2432b5bda206..13d9b9852758 100644
--- a/metadata/md5-cache/sci-libs/scikit-learn-0.24.2
+++ b/metadata/md5-cache/sci-libs/scikit-learn-0.24.2
@@ -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/scikit-learn/scikit-learn/archive/0.24.2.tar.gz -> scikit-learn-0.24.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4313cc92e55dc413151de98cd9db43dc
diff --git a/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1 b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
index 742560481e1a..8676e8dbf709 100644
--- a/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
+++ b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-optimize/scikit-optimize-0.8.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c3f9cce07009c736173fa59a75821a3
diff --git a/metadata/md5-cache/sci-libs/shapely-1.7.1-r1 b/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
index a4b62949342f..b56ec5164e81 100644
--- a/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
+++ b/metadata/md5-cache/sci-libs/shapely-1.7.1-r1
@@ -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/Toblerity/Shapely/archive/1.7.1.tar.gz -> shapely-1.7.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da64e5a6a4f7572ddb2b7c4470598b15
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 369d96a11ac5..3e20e9a52929 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	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06603640e28a18f6238df72aaedbe7f4
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
index d04ee35c2ff2..43f696717b0b 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?] python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.3.0.tar.gz -> tensorflow-estimator-2.3.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17ca6da1ad0c3c40d2a91479adb4ea05
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0
index a65382fac39a..57b8c78619c4 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?] python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.4.0.tar.gz -> tensorflow-estimator-2.4.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9b7a8dd7b7ba004de60c32790efdfce
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
index d603d147793f..95eab2f4cf93 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.5.0.tar.gz -> tensorflow-estimator-2.5.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a5bbe15a915fd1aa9937133b8e2dc2d
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 72ff3dee167b..aa5aea638e58 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/arb-2.21.0 b/metadata/md5-cache/sci-mathematics/arb-2.21.0
new file mode 100644
index 000000000000..60014067bd42
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/arb-2.21.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
+DESCRIPTION=C library for arbitrary-precision interval arithmetic
+EAPI=7
+HOMEPAGE=https://fredrikj.net/arb/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.21.0.tar.gz -> arb-2.21.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=45c2d31cdc7745d502606e611dd80f75
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
index 8d7a60c5a3f9..0e4be7714db4 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.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/d/dunshire/dunshire-0.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f5d8ae5651adf7ef9f4722e76e0e4e59
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.8.0 b/metadata/md5-cache/sci-mathematics/flint-2.8.0
new file mode 100644
index 000000000000..0ca41990f9de
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/flint-2.8.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-tex/latexmk ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
+DESCRIPTION=Fast Library for Number Theory
+EAPI=7
+HOMEPAGE=http://www.flintlib.org/
+IUSE=doc ntl test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=http://www.flintlib.org/flint-2.8.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0ecaf393ab748bb0f1701cf78c1f5def
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.3.0 b/metadata/md5-cache/sci-mathematics/octave-6.3.0
new file mode 100644
index 000000000000..5ef3d8ec305d
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-6.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) dev-util/gperf virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) gui? ( dev-qt/linguist-tools:5 ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=High-level interactive language for numerical computations
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/octave/
+IUSE=curl doc fftw +glpk gnuplot gui hdf5 java opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/6.3.0
+SRC_URI=mirror://gnu/octave/octave-6.3.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ba1f15c944b48b85ef696a11194de38d
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 1931aa4db8ab..244e8fedb17a 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
index 0c2f3dcfa871..485223785316 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/setuptools[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=05af45c171a8fdbaf1181d227509cfbe
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.2 b/metadata/md5-cache/sci-misc/vitables-3.0.2
index 800f55fc8c32..db06feafd585 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.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://pypi/V/ViTables/ViTables-3.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5623379801d5ef2328b77d4291c30747
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 27a8dad906d4..60b12c995849 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/espresso-4.1.3 b/metadata/md5-cache/sci-physics/espresso-4.1.3
index 4d421debc873..9a03974645fc 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.1.3
+++ b/metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.1.3/espresso-4.1.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c5984cc24b57a11a42ec7d191979b7a
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index e24df27c17fe..06a2a6855be5 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	portability	d1186f1e621de7b27ddcae82e6253259	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2d715f09454eb8c3e9971c50bcc4a018
diff --git a/metadata/md5-cache/sci-physics/lammps-20200303-r1 b/metadata/md5-cache/sci-physics/lammps-20200303-r1
index 7ce1d2905b14..b19f1fadc008 100644
--- a/metadata/md5-cache/sci-physics/lammps-20200303-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20200303-r1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 virtual/fortran
+DEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 virtual/fortran
 DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
 EAPI=7
 HOMEPAGE=https://lammps.sandia.gov/
-IUSE=cuda examples gzip kokkos lammps-memalign mpi netcdf python test python_targets_python3_8
+IUSE=cuda examples gzip kokkos lammps-memalign mpi netcdf python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 virtual/fortran
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
+RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_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/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 virtual/fortran
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/stable_3Mar2020.tar.gz -> lammps-stable_3Mar2020.tar.gz test? ( https://github.com/lammps/lammps-testing/archive/stable_3Mar2020.tar.gz -> lammps-testing-stable_3Mar2020.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f7ace5535e3becae37370fd2d2e57dd
+_md5_=b79510de2f6ec947ca68287d313e6f16
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.3.0 b/metadata/md5-cache/sci-physics/lhapdf-6.3.0
index 9d886164151b..dc6c7dea7cea 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.3.0
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:0= python? ( python_targets_python3_8? ( dev-lang/python:
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d1fafa4b8ae665a0ddb492a938fbdd5
diff --git a/metadata/md5-cache/sci-physics/qmeq-1.0_p202004 b/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
index db26b9507bb5..79d0c5fc83ba 100644
--- a/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
+++ b/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[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/gedaskir/qmeq/archive/d3949bf812e1648892959a169a7ff849cd7b69d5.tar.gz -> qmeq-1.0_p202004.tgz examples? ( https://github.com/gedaskir/qmeq-examples/archive/1.0.tar.gz -> qmeq-examples-1.0.tgz )
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2b3f5130ac2b00468c83be4207b530b
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 2398c0a74e11..270344bed130 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/dash-1.20.0-r1 b/metadata/md5-cache/sci-visualization/dash-1.20.0-r1
index 4d97230ecfc2..682d5539a5f0 100644
--- a/metadata/md5-cache/sci-visualization/dash-1.20.0-r1
+++ b/metadata/md5-cache/sci-visualization/dash-1.20.0-r1
@@ -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/plotly/dash/archive/refs/tags/v1.20.0.tar.gz -> dash-1.20.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f05eb7b42dac2369a49d2a52aa97d6bf
diff --git a/metadata/md5-cache/sci-visualization/dash-1.21.0 b/metadata/md5-cache/sci-visualization/dash-1.21.0
index a8ab6022b12e..01efbc96a8bc 100644
--- a/metadata/md5-cache/sci-visualization/dash-1.21.0
+++ b/metadata/md5-cache/sci-visualization/dash-1.21.0
@@ -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/plotly/dash/archive/refs/tags/v1.21.0.tar.gz -> dash-1.21.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a63411e82d71075ef702ab52be939996
diff --git a/metadata/md5-cache/sci-visualization/dash-core-components-1.16.0 b/metadata/md5-cache/sci-visualization/dash-core-components-1.16.0
index 6f32ca2b0ab1..b01f5712bd66 100644
--- a/metadata/md5-cache/sci-visualization/dash-core-components-1.16.0
+++ b/metadata/md5-cache/sci-visualization/dash-core-components-1.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/plotly/dash-core-components/archive/refs/tags/v1.16.0.tar.gz -> dash-core-components-1.16.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=076ab3fed6090b2dc4f53f0952d5a63f
diff --git a/metadata/md5-cache/sci-visualization/dash-core-components-1.17.1 b/metadata/md5-cache/sci-visualization/dash-core-components-1.17.1
index 03a452a488aa..7fe2c6d9b77d 100644
--- a/metadata/md5-cache/sci-visualization/dash-core-components-1.17.1
+++ b/metadata/md5-cache/sci-visualization/dash-core-components-1.17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/plotly/dash-core-components/archive/refs/tags/v1.17.1.tar.gz -> dash-core-components-1.17.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=076ab3fed6090b2dc4f53f0952d5a63f
diff --git a/metadata/md5-cache/sci-visualization/dash-html-components-1.1.3 b/metadata/md5-cache/sci-visualization/dash-html-components-1.1.3
index 6cd49ba939fc..edf0f865eae7 100644
--- a/metadata/md5-cache/sci-visualization/dash-html-components-1.1.3
+++ b/metadata/md5-cache/sci-visualization/dash-html-components-1.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/plotly/dash-html-components/archive/refs/tags/v1.1.3.tar.gz -> dash-html-components-1.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f58b7bd744e14437ee6dbf1eb9a4005
diff --git a/metadata/md5-cache/sci-visualization/dash-html-components-1.1.4 b/metadata/md5-cache/sci-visualization/dash-html-components-1.1.4
index 48ea1422aaf8..b02f932b1486 100644
--- a/metadata/md5-cache/sci-visualization/dash-html-components-1.1.4
+++ b/metadata/md5-cache/sci-visualization/dash-html-components-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/plotly/dash-html-components/archive/refs/tags/v1.1.4.tar.gz -> dash-html-components-1.1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f58b7bd744e14437ee6dbf1eb9a4005
diff --git a/metadata/md5-cache/sci-visualization/dash-table-4.11.3 b/metadata/md5-cache/sci-visualization/dash-table-4.11.3
index d2a680384c23..cf934790897e 100644
--- a/metadata/md5-cache/sci-visualization/dash-table-4.11.3
+++ b/metadata/md5-cache/sci-visualization/dash-table-4.11.3
@@ -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/plotly/dash-table/archive/refs/tags/v4.11.3.tar.gz -> dash-table-4.11.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab7ec3fd56250b51842e5ab7cd354dd5
diff --git a/metadata/md5-cache/sci-visualization/dash-table-4.12.1 b/metadata/md5-cache/sci-visualization/dash-table-4.12.1
index c3a5cc28edfa..6dc6808497ff 100644
--- a/metadata/md5-cache/sci-visualization/dash-table-4.12.1
+++ b/metadata/md5-cache/sci-visualization/dash-table-4.12.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/plotly/dash-table/archive/refs/tags/v4.12.1.tar.gz -> dash-table-4.12.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab7ec3fd56250b51842e5ab7cd354dd5
diff --git a/metadata/md5-cache/sci-visualization/jupyter-dash-0.4.0 b/metadata/md5-cache/sci-visualization/jupyter-dash-0.4.0
index c51019c157c3..9120acfa5e14 100644
--- a/metadata/md5-cache/sci-visualization/jupyter-dash-0.4.0
+++ b/metadata/md5-cache/sci-visualization/jupyter-dash-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ansi2html[python_targets_python3_8(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/plotly/jupyter-dash/archive/refs/tags/v0.4.0.tar.gz -> jupyter-dash-0.4.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=120949b97e1ed983c2e497025f9bd33e
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.2 b/metadata/md5-cache/sci-visualization/veusz-3.2
index 1944fb7213bd..44b6dddf4c5a 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.2
+++ b/metadata/md5-cache/sci-visualization/veusz-3.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/veusz/veusz/releases/download/veusz-3.2/veusz-3.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=28c37040c6e6164d4339bd1f53adc6cc
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.3.1 b/metadata/md5-cache/sci-visualization/veusz-3.3.1
index 732c047f40e1..05cde4150ed5 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.3.1
+++ b/metadata/md5-cache/sci-visualization/veusz-3.3.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/veusz/veusz/releases/download/veusz-3.3.1/veusz-3.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=28c37040c6e6164d4339bd1f53adc6cc
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6c3ddefa117a..3d87dd0079e8 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/baselayout-2.8 b/metadata/md5-cache/sys-apps/baselayout-2.8
new file mode 100644
index 000000000000..28e662950718
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=build kernel_FreeBSD kernel_linux +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.8.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8695eaa7d31ab485706d894743e17ce4
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index 114bab47c3f4..fdfc6278ece1 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b374272f65d7532f2d7ee77b009f0ba4
+_md5_=8695eaa7d31ab485706d894743e17ce4
diff --git a/metadata/md5-cache/sys-apps/bleachbit-4.2.0 b/metadata/md5-cache/sys-apps/bleachbit-4.2.0
index 6420171c4b7a..ddc8cabeaaf3 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-4.2.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.bleachbit.org/bleachbit-4.2.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d4fc31ad5ec3c819a06df30dcb1cbdb3
diff --git a/metadata/md5-cache/sys-apps/bleachbit-4.4.0 b/metadata/md5-cache/sys-apps/bleachbit-4.4.0
index 49373a638e2b..49bcf3276870 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-4.4.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.bleachbit.org/bleachbit-4.4.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=bc1e147a93724d10bf9f55b6903c074e
diff --git a/metadata/md5-cache/sys-apps/busybox-1.32.1-r1 b/metadata/md5-cache/sys-apps/busybox-1.32.1-r1
index 049124d7ec23..1cce2e1a4242 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.32.1-r1
+++ b/metadata/md5-cache/sys-apps/busybox-1.32.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae4eec8ac028332f5ee21e9d05b13e70
diff --git a/metadata/md5-cache/sys-apps/busybox-1.33.1 b/metadata/md5-cache/sys-apps/busybox-1.33.1
index 9b7785f0ce41..c1fdbca1cc57 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.33.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.33.1
@@ -12,5 +12,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a5b27cd004d316ebb9b0d45bc4f444b
diff --git a/metadata/md5-cache/sys-apps/busybox-1.33.1-r2 b/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
index 643cbf2c0703..43cc8279fc49 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
+++ b/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=13920fc9743cf47d01c1e95365696c2c
diff --git a/metadata/md5-cache/sys-apps/busybox-1.34.0-r1 b/metadata/md5-cache/sys-apps/busybox-1.34.0-r1
index 379012132b76..09983c830f03 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.34.0-r1
+++ b/metadata/md5-cache/sys-apps/busybox-1.34.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.34.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fab3f12e622df59fae701e3adcdb1fd0
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 2d27a0b30038..68a019bd6418 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -11,5 +11,5 @@ RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virt
 REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05a8790b42145426359f0a5f245b623e
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.32-r1 b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
index ea6a497789b4..a259a9bcbaea 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.32-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
+BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DEFINED_PHASES=configure install postinst prepare setup test
 DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.32.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2157b3ed9933ecc009240cffea80f9c
+_md5_=668380274bbabad069f022214c5f918f
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.0 b/metadata/md5-cache/sys-apps/coreutils-9.0
index 23943649726f..73ff1564cc42 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.0
+++ b/metadata/md5-cache/sys-apps/coreutils-9.0
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
+BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DEFINED_PHASES=configure install postinst prepare setup test
 DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.0.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f2933ff897a1ca1637dcb1375f58f4f
+_md5_=bc7457ac829ae6a6e520c9ee82a622b3
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.0-r1 b/metadata/md5-cache/sys-apps/coreutils-9.0-r1
new file mode 100644
index 000000000000..5012f07a5e54
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/coreutils-9.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/coreutils/
+IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/coreutils/coreutils-9.0.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=558450e4908b9fb84f009194518717e7
diff --git a/metadata/md5-cache/sys-apps/file-5.40-r2 b/metadata/md5-cache/sys-apps/file-5.40-r2
index 637616e58b9e..799c9697ee21 100644
--- a/metadata/md5-cache/sys-apps/file-5.40-r2
+++ b/metadata/md5-cache/sys-apps/file-5.40-r2
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.40.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd5b8be1774a3637e4203831db68147e
diff --git a/metadata/md5-cache/sys-apps/file-5.40-r3 b/metadata/md5-cache/sys-apps/file-5.40-r3
index 19c39ce15d06..44241a5a3a31 100644
--- a/metadata/md5-cache/sys-apps/file-5.40-r3
+++ b/metadata/md5-cache/sys-apps/file-5.40-r3
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.40.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd2cfda6326ee18ab2098dc31828a89b
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 4b25f980d236..e53f19474b72 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a88bbeda4ff8aa23e16598b648fbc6d5
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1 b/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
new file mode 100644
index 000000000000..0d0b8c809ffc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
@@ -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.58.2-r1 >=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:=[introspection?] 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 ~riscv ~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:=[introspection?] 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.4.tar.gz -> fwupd-1.6.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=747f3837f6d0804056f0ce83e11bc3a7
diff --git a/metadata/md5-cache/sys-apps/gcp-0.2.1 b/metadata/md5-cache/sys-apps/gcp-0.2.1
index d785a36748b8..ac4c2fe00d72 100644
--- a/metadata/md5-cache/sys-apps/gcp-0.2.1
+++ b/metadata/md5-cache/sys-apps/gcp-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcp/gcp-0.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=105ce1084d446227f97cfcb68b567688
diff --git a/metadata/md5-cache/sys-apps/gpet-0.4 b/metadata/md5-cache/sys-apps/gpet-0.4
deleted file mode 100644
index 2006c07629fe..000000000000
--- a/metadata/md5-cache/sys-apps/gpet-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-DESCRIPTION=GTK+ based TOMOYO policy editor
-EAPI=7
-HOMEPAGE=http://en.sourceforge.jp/projects/gpet/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/gpet/53178/gpet-0.4.tar.bz2
-_md5_=ab348ab7529deff00ad0671832fb2092
diff --git a/metadata/md5-cache/sys-apps/gpet-0.4-r1 b/metadata/md5-cache/sys-apps/gpet-0.4-r1
new file mode 100644
index 000000000000..a27417a61166
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gpet-0.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
+DESCRIPTION=GTK+ based TOMOYO policy editor
+EAPI=7
+HOMEPAGE=http://en.sourceforge.jp/projects/gpet/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/gpet/53178/gpet-0.4.tar.bz2
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=381f17fe7a12cfa0b82a33286d539969
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.74 b/metadata/md5-cache/sys-apps/hwinfo-21.74
deleted file mode 100644
index bfe0e76fc1f1..000000000000
--- a/metadata/md5-cache/sys-apps/hwinfo-21.74
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu ) sys-devel/flex >=sys-kernel/linux-headers-2.6.17
-DESCRIPTION=Hardware detection tool used in SuSE Linux
-EAPI=7
-HOMEPAGE=https://www.opensuse.org/
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
-SLOT=0
-SRC_URI=http://download.opensuse.org/tumbleweed/repo/src-oss/src/hwinfo-21.74-1.1.src.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d73bedb6f9ceb5fc85724304dee887ab
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.76 b/metadata/md5-cache/sys-apps/hwinfo-21.76
index c19c5290baa7..278af919927e 100644
--- a/metadata/md5-cache/sys-apps/hwinfo-21.76
+++ b/metadata/md5-cache/sys-apps/hwinfo-21.76
@@ -3,11 +3,11 @@ 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/
+HOMEPAGE=https://github.com/openSUSE/hwinfo/
 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	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d73bedb6f9ceb5fc85724304dee887ab
+_md5_=912eb58dc74302aa88f2ab0baf58e4ae
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
index e328b3e8b6bd..e5bae57569ee 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/p
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=768a7c938e2f1a3bd7744ed7dfd6d55a
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.2 b/metadata/md5-cache/sys-apps/i2c-tools-4.2
index c2a6ea874811..f57d52f78dc9 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.2
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.2
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.2.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e7ed95c090cf1dc4b783d15f4bff024
diff --git a/metadata/md5-cache/sys-apps/input-utils-1.3 b/metadata/md5-cache/sys-apps/input-utils-1.3
index 32d6d5290307..49e617c0f53e 100644
--- a/metadata/md5-cache/sys-apps/input-utils-1.3
+++ b/metadata/md5-cache/sys-apps/input-utils-1.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Small collection of linux input layer utils
 EAPI=6
 HOMEPAGE=https://www.kraxel.org/blog/linux/input/
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kraxel.org/releases/input/input-1.3.tar.gz
-_md5_=6236c233506eb3efbd087d042010b558
+_md5_=0228e96ec17b83cbffe68393c4350cf1
diff --git a/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1 b/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
index 3d4834807953..50d1b8f876aa 100644
--- a/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
+++ b/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configargparse[python_targets_python3_8(-)?] sys-apps/portage
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/wraeth/kcheck/archive/0.0.2.tar.gz -> kcheck-0.0.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53e08d522bb8f93ac01bc1b793ec1ef1
diff --git a/metadata/md5-cache/sys-apps/kcheck-9999 b/metadata/md5-cache/sys-apps/kcheck-9999
index db067a4a0ed4..04dbfe3bcf1b 100644
--- a/metadata/md5-cache/sys-apps/kcheck-9999
+++ b/metadata/md5-cache/sys-apps/kcheck-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/configargparse[python_targets_python3_8(-)?] sys-apps/portage[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 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53e08d522bb8f93ac01bc1b793ec1ef1
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.4 b/metadata/md5-cache/sys-apps/pkgcore-0.12.4
index 27414fdcf0fb..6a321fe58013 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.4
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.4
@@ -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/pkgcore/pkgcore-0.12.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=950b68dd30640c1b013244cbf91631d3
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.6 b/metadata/md5-cache/sys-apps/pkgcore-0.12.6
index 8e115d9b64ab..aa092433af25 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.6
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.6
@@ -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/pkgcore/pkgcore-0.12.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.7 b/metadata/md5-cache/sys-apps/pkgcore-0.12.7
index dfdd4795af40..6caaa3d8f8e4 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.7
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.7
@@ -4,12 +4,12 @@ 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
+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.7.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16d7ef27c98d233bf38a22d760f9747f
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=950b68dd30640c1b013244cbf91631d3
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.8 b/metadata/md5-cache/sys-apps/pkgcore-0.12.8
new file mode 100644
index 000000000000..b50682efd151
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.8
@@ -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 ~m68k ~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.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ab1a479d04912853476ab21fbcba5a22
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index e59cff0b1037..1170e9023422 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.10 b/metadata/md5-cache/sys-apps/plocate-1.1.10
index 7ecb9122c91a..efe8630213d2 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.10
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.10
@@ -5,10 +5,10 @@ DESCRIPTION=Posting locate is a much faster locate
 EAPI=7
 HOMEPAGE=https://plocate.sesse.net/
 IUSE=+io-uring kernel_linux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7950ca49ebec360b72cc1f15d51d080f
+_md5_=54266cc0bb235f6cccf65c5eb5106857
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.18 b/metadata/md5-cache/sys-apps/portage-3.0.18
index 9c45d64f823c..5309fd8c231d 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.18
+++ b/metadata/md5-cache/sys-apps/portage-3.0.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.18.tar.xz https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.18.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=951c72dfff8a555eaf45b4e435552946
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.19 b/metadata/md5-cache/sys-apps/portage-3.0.19
index 4aa85ac4fa2e..b5103db82424 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.19
+++ b/metadata/md5-cache/sys-apps/portage-3.0.19
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portage/portage-3.0.19.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8c89ace7c834acafa9b29a7ebc72a08
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.20-r6 b/metadata/md5-cache/sys-apps/portage-3.0.20-r6
index 3a1c7a09712c..092feeeac6dc 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.20-r6
+++ b/metadata/md5-cache/sys-apps/portage-3.0.20-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portage/portage-3.0.20.tar.gz https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=320ee64c1cd0a586b3b2495de888edfc
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.22 b/metadata/md5-cache/sys-apps/portage-3.0.22
index f68198a3b406..9428d2f64299 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.22
+++ b/metadata/md5-cache/sys-apps/portage-3.0.22
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.22.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1cba7bd5035f91a645891d176c9917c
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.23 b/metadata/md5-cache/sys-apps/portage-3.0.23
index 6e0cb33e0886..e9ec1a63841a 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.23
+++ b/metadata/md5-cache/sys-apps/portage-3.0.23
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.23.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1cba7bd5035f91a645891d176c9917c
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.24 b/metadata/md5-cache/sys-apps/portage-3.0.24
new file mode 100644
index 000000000000..fc4df97aed21
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.24
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),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 preinst prepare pretend setup test
+DEPEND=!build? ( 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(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),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://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.24.tar.bz2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9cfaac300efce8c968a516cc1e649176
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.26 b/metadata/md5-cache/sys-apps/portage-3.0.26
new file mode 100644
index 000000000000..026eac55f1e0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.26
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),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 preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.26.tar.bz2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0625a39282d672983587fcf546ce32e5
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 81c2d394bd2b..b5da237af99c 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -12,5 +12,5 @@ RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac6592a169f429af03e1a3c867970f23
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a77bd9c8b03e61729f279e584a2a365
diff --git a/metadata/md5-cache/sys-apps/qdirstat-1.7.1 b/metadata/md5-cache/sys-apps/qdirstat-1.7.1
deleted file mode 100644
index 85a725d8ec7c..000000000000
--- a/metadata/md5-cache/sys-apps/qdirstat-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib
-DESCRIPTION=Qt-based directory statistics
-EAPI=7
-HOMEPAGE=https://github.com/shundhammer/qdirstat
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-lang/perl dev-perl/URI
-SLOT=0
-SRC_URI=https://github.com/shundhammer/qdirstat/archive/1.7.1.tar.gz -> qdirstat-1.7.1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7793ed506ca8c43d7e36411e200bf3de
diff --git a/metadata/md5-cache/sys-apps/qdirstat-1.8 b/metadata/md5-cache/sys-apps/qdirstat-1.8
index 8416327515d6..f0c491ac004d 100644
--- a/metadata/md5-cache/sys-apps/qdirstat-1.8
+++ b/metadata/md5-cache/sys-apps/qdirstat-1.8
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib
 DESCRIPTION=Qt-based directory statistics
 EAPI=8
 HOMEPAGE=https://github.com/shundhammer/qdirstat
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-lang/perl dev-perl/URI
 SLOT=0
 SRC_URI=https://github.com/shundhammer/qdirstat/archive/refs/tags/1.8.tar.gz -> qdirstat-1.8.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0ff3f267f52c289ebf42781fde934545
+_md5_=f5267eaef553fa86a6d5de0920b4c921
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13-r1 b/metadata/md5-cache/sys-apps/rng-tools-6.13-r1
deleted file mode 100644
index ddbbeedae3ff..000000000000
--- a/metadata/md5-cache/sys-apps/rng-tools-6.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=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	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f39909e70f54146250909fa042e5186a
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13-r2 b/metadata/md5-cache/sys-apps/rng-tools-6.13-r2
new file mode 100644
index 000000000000..d666d3fd6da3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.13-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=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	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b08211faaa3d5f43a88b8881ac172ce0
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.14-r1 b/metadata/md5-cache/sys-apps/rng-tools-6.14-r1
deleted file mode 100644
index 765bddc2e7a7..000000000000
--- a/metadata/md5-cache/sys-apps/rng-tools-6.14-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=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:= ) rtlsdr? ( net-wireless/rtl-sdr ) 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 rtlsdr 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:= ) rtlsdr? ( net-wireless/rtl-sdr ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
-SLOT=0
-SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.14.tar.gz -> rng-tools-6.14.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=949cfe951507b6666dd563bfd508e575
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.14-r2 b/metadata/md5-cache/sys-apps/rng-tools-6.14-r2
new file mode 100644
index 000000000000..3cc1bb1a3b58
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.14-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=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:= ) rtlsdr? ( net-wireless/rtl-sdr ) 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 rtlsdr 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:= ) rtlsdr? ( net-wireless/rtl-sdr ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.14.tar.gz -> rng-tools-6.14.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f87df301e61278b1c89b851fc2063cf
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.24 b/metadata/md5-cache/sys-apps/sandbox-2.24
index b5bab8163e74..820cc760d9aa 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.24
+++ b/metadata/md5-cache/sys-apps/sandbox-2.24
@@ -7,6 +7,6 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/sandbox-2.24.tar.xz
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sandbox-2.24.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a433ca4285d0df10f4d016540f9d22fc
+_md5_=152f667a0256614c3aeccbcb17db1dde
diff --git a/metadata/md5-cache/sys-apps/smartmontools-7.2 b/metadata/md5-cache/sys-apps/smartmontools-7.2-r1
index 270e7b71fd97..270e7b71fd97 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-7.2
+++ b/metadata/md5-cache/sys-apps/smartmontools-7.2-r1
diff --git a/metadata/md5-cache/sys-apps/toybox-0.8.4-r1 b/metadata/md5-cache/sys-apps/toybox-0.8.4-r1
index 71f4f2d12973..a6b1421384c9 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.8.4-r1
+++ b/metadata/md5-cache/sys-apps/toybox-0.8.4-r1
@@ -9,5 +9,5 @@ LICENSE=0BSD
 RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://landley.net/code/toybox/downloads/toybox-0.8.4.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16c5811f984ae68f736e55271c97c9d6
diff --git a/metadata/md5-cache/sys-apps/toybox-0.8.5-r1 b/metadata/md5-cache/sys-apps/toybox-0.8.5-r1
index bb4272810cd8..593b0aeaa488 100644
--- a/metadata/md5-cache/sys-apps/toybox-0.8.5-r1
+++ b/metadata/md5-cache/sys-apps/toybox-0.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=0BSD
 RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://landley.net/code/toybox/downloads/toybox-0.8.5.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16c5811f984ae68f736e55271c97c9d6
diff --git a/metadata/md5-cache/sys-apps/toybox-9999 b/metadata/md5-cache/sys-apps/toybox-9999
index 70e75caa67c6..4755d73ec1ec 100644
--- a/metadata/md5-cache/sys-apps/toybox-9999
+++ b/metadata/md5-cache/sys-apps/toybox-9999
@@ -9,5 +9,5 @@ LICENSE=0BSD
 PROPERTIES=live
 RDEPEND=virtual/libcrypt:=
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16c5811f984ae68f736e55271c97c9d6
diff --git a/metadata/md5-cache/sys-apps/tuned-2.15.0-r1 b/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
index c39aeaa8136d..34b8bf9be964 100644
--- a/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
+++ b/metadata/md5-cache/sys-apps/tuned-2.15.0-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/redhat-performance/tuned
 IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 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/configobj[python_targets_python3_8(-)] dev-python/decorator[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-linux-procfs[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/configobj[python_targets_python3_9(-)] dev-python/decorator[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-linux-procfs[python_targets_python3_9(-)] ) sys-apps/dbus sys-apps/ethtool sys-power/powertop dev-util/systemtap
+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/configobj[python_targets_python3_8(-)] dev-python/decorator[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-linux-procfs[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/configobj[python_targets_python3_9(-)] dev-python/decorator[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-linux-procfs[python_targets_python3_9(-)] ) sys-apps/dbus sys-apps/ethtool sys-power/powertop dev-util/systemtap virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.15.0.tar.gz -> tuned-2.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5a8441c538f367c5ca111321bf20d78
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=734cb26990be6ea24ac4d3b2fdfd319f
diff --git a/metadata/md5-cache/sys-apps/tuned-2.16.0 b/metadata/md5-cache/sys-apps/tuned-2.16.0
index 300adeeaeb38..934b2e14fa3e 100644
--- a/metadata/md5-cache/sys-apps/tuned-2.16.0
+++ b/metadata/md5-cache/sys-apps/tuned-2.16.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.16.0.tar.gz -> tuned-2.16.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2da6e4b25c26fe44af11c5fed85ef75b
+_md5_=734cb26990be6ea24ac4d3b2fdfd319f
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 61062ae2bc71..e272c4b850df 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/munge-0.5.13-r2 b/metadata/md5-cache/sys-auth/munge-0.5.13-r2
index 870612d48115..a44d3b4525ed 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r2
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r2
@@ -1,5 +1,5 @@
 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
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 DESCRIPTION=An authentication service for creating and validating credentials
 EAPI=7
@@ -7,8 +7,8 @@ HOMEPAGE=https://github.com/dun/munge
 IUSE=debug gcrypt static-libs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) acct-group/munge acct-user/munge
+RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) acct-group/munge acct-user/munge virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6dd1f962282deb095e0ed2a07aa1b33f
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2ef7c20a92ea604bf2ccc1a823184f5
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 cb0a3d99567e..881f81075a12 100644
--- a/metadata/md5-cache/sys-auth/solo-python-0.0.30
+++ b/metadata/md5-cache/sys-auth/solo-python-0.0.30
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-7.1.0[python_targets_python3_8(-)?,python_targets_pyt
 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	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68796b69fced905eeea80600df6883f0
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.3 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.3
index 2d3ae25b2e23..498f08d3b433 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.3
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.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/jirutka/ssh-ldap-pubkey/archive/v1.3.3.tar.gz -> ssh-ldap-pubkey-1.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f97a33c7eba5648c5925f98c9c538b2e
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 124927bfee8f..ea5b5077047f 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/seekwatcher-0.13 b/metadata/md5-cache/sys-block/seekwatcher-0.13
index 76c4bcc2e10e..904ae2c798fa 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.13
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.13
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/matplotlib[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/trofi/seekwatcher/archive/v0.13.tar.gz -> seekwatcher-0.13.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e331c689960b24dd3f1e79787b71844
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
index 4da5ba946e76..ee85f47bcace 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python3_8(-)?] dev-python/pygob
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53.tar.gz -> targetcli-fb-2.1.53.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=816cab89c8348b7d67c5afefe6228c42
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 1c0aa9151f63..f76d527db641 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/os-prober-1.78 b/metadata/md5-cache/sys-boot/os-prober-1.78
index b22f81b33868..bdf895810802 100644
--- a/metadata/md5-cache/sys-boot/os-prober-1.78
+++ b/metadata/md5-cache/sys-boot/os-prober-1.78
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Utility to detect other OSs on a set of drives
 EAPI=7
-HOMEPAGE=https://packages.debian.org/source/sid/os-prober
+HOMEPAGE=https://salsa.debian.org/installer-team/os-prober
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=sys-boot/grub:2[mount]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.78.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aef802a053b024c37399f57965b21e00
+_md5_=af7536bd2be6bea69efac8b6625508a1
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 26d0ec1176ba..d9af5931b3ff 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 3f693755c70a..cc7d467210f2 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	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 0b9f58d21fb1..8f376de39a88 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	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 32876f9b069e..8870bcb31edb 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	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 fb8f5245e17f..c749d20aa682 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e37a0c58e20df78195dc19260f090fb1
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.14 b/metadata/md5-cache/sys-cluster/ceph-15.2.14
index c0650558135b..e97addbd712f 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.14
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.14
@@ -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.14.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	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 48e8aeca1c23..ed0e55ee3f1f 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	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 87afbd08d90d..ab9f12e6dd0c 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	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6354c0f7d59d36c1d80f283f9cda79b6
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.6 b/metadata/md5-cache/sys-cluster/ceph-16.2.6
index 110d06258303..52b67717dfef 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.6
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.6
@@ -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.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=15877ee0f92a3bb544235b7135475211
diff --git a/metadata/md5-cache/sys-cluster/ploop-1.14.1 b/metadata/md5-cache/sys-cluster/ploop-1.14.1
index 9d3bae445a4b..82a2dcceb63f 100644
--- a/metadata/md5-cache/sys-cluster/ploop-1.14.1
+++ b/metadata/md5-cache/sys-cluster/ploop-1.14.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install postinst prepare
 DEPEND=dev-libs/libxml2 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=openvz tool and a library to control ploop block devices
 EAPI=5
@@ -6,8 +6,8 @@ HOMEPAGE=https://wiki.openvz.org/Download/ploop
 IUSE=debug static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 !<sys-cluster/vzctl-4.8 sys-block/parted sys-fs/e2fsprogs sys-process/lsof sys-apps/findutils
+RDEPEND=dev-libs/libxml2 !<sys-cluster/vzctl-4.8 sys-block/parted sys-fs/e2fsprogs sys-process/lsof sys-apps/findutils virtual/tmpfiles
 SLOT=0
 SRC_URI=https://download.openvz.org/utils/ploop/1.14.1/src/ploop-1.14.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0fd4d1e99540d8a840fd55a5a95a8a4b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=66677b3b2ac575c2e8eb3bc62ddf358e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index adb9fb7f9011..e89d3cdcb9e3 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/automake-1.16.4 b/metadata/md5-cache/sys-devel/automake-1.16.4
index 091ad978b50a..4738ad58fab2 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.4
+++ b/metadata/md5-cache/sys-devel/automake-1.16.4
@@ -5,11 +5,11 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 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=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.4.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0ad30f003ac0f526c6edccdf9743bed
+_md5_=a6fcd551d473e5be47ece362ef6c0324
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.4 b/metadata/md5-cache/sys-devel/binutils-config-5.4
index bdcd52b498d2..6cddad177455 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.4
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.4
@@ -7,6 +7,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.4.tar.xz
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/binutils-config-5.4.tar.xz
 _eclasses_=prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=adc6ca7cc3f2384f8c97e34b898091fd
+_md5_=0ea389e4b4b4128ae5d01edc33fa4926
diff --git a/metadata/md5-cache/sys-devel/binutils-config-9999 b/metadata/md5-cache/sys-devel/binutils-config-9999
index d1a5c6529bb0..b121c003b3d4 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-9999
+++ b/metadata/md5-cache/sys-devel/binutils-config-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=08cac5af91fc5987df6d52ef82185c00
+_md5_=2a6e5afdbcc8585f46f02045f2d6156b
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0 b/metadata/md5-cache/sys-devel/clang-13.0.0
new file mode 100644
index 000000000000..1692289cccdc
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-13.0.0
@@ -0,0 +1,17 @@
+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-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-13.0.0: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[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[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 test doc 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 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
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-13.0.0 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 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-13.0.0: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[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[llvm_targets_VE] )
+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.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-13.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5fd9b1e8a5d71f125e9e629e09c5bab2
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-13.0.0_rc2
deleted file mode 100644
index 330a08739e91..000000000000
--- a/metadata/md5-cache/sys-devel/clang-13.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc2: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_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[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 test doc 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 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_rc2 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_rc2 ) default-lld? ( sys-devel/lld )
-RDEPEND=~sys-devel/llvm-13.0.0_rc2: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_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_VE] )
-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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f818a90597710c85492d03a4fdf9f8c5
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-13.0.0_rc3
deleted file mode 100644
index 4c9d60930408..000000000000
--- a/metadata/md5-cache/sys-devel/clang-13.0.0_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc3: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_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[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 test doc 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 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_rc3 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_rc3 ) default-lld? ( sys-devel/lld )
-RDEPEND=~sys-devel/llvm-13.0.0_rc3: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_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_VE] )
-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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5d929e0b183045430f02197b58d9d5a
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-13.0.0_rc4
deleted file mode 100644
index 5ab730b7ebf1..000000000000
--- a/metadata/md5-cache/sys-devel/clang-13.0.0_rc4
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc4: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_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[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 test doc 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 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_rc4 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_rc4 ) default-lld? ( sys-devel/lld )
-RDEPEND=~sys-devel/llvm-13.0.0_rc4: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_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_VE] )
-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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3384491e1b31ce9caa0ef7ef4e52136
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0 b/metadata/md5-cache/sys-devel/clang-common-13.0.0
new file mode 100644
index 000000000000..42ea7103aa72
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-13.0.0
@@ -0,0 +1,11 @@
+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
+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.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a595ff2d43181fa2e05cd4b7e10ca6a2
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc2
deleted file mode 100644
index cf4e31ccd447..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc2
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc3
deleted file mode 100644
index be9089631647..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc3
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc4
deleted file mode 100644
index cb655df80a2c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc4
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0
new file mode 100644
index 000000000000..ef0c1756b216
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0
@@ -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
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-13.0.0:13.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-13.0.0:13.0.0 ) ) libcxx? ( >=sys-libs/libcxx-13.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-13.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=13.0.0
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8551111cb5bcf802232b4b97c1129439
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc2
deleted file mode 100644
index a4062841dc0b..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=7
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-13.0.0_rc2:13.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-13.0.0_rc2:13.0.0 ) ) libcxx? ( >=sys-libs/libcxx-13.0.0_rc2[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_rc2[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	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc3
deleted file mode 100644
index 1837c35cf7fc..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=7
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-13.0.0_rc3:13.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-13.0.0_rc3:13.0.0 ) ) libcxx? ( >=sys-libs/libcxx-13.0.0_rc3[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_rc3[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	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc4
deleted file mode 100644
index 431e1006c00c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=7
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-13.0.0_rc4:13.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-13.0.0_rc4:13.0.0 ) ) libcxx? ( >=sys-libs/libcxx-13.0.0_rc4[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_rc4[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	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/crossdev-20210621 b/metadata/md5-cache/sys-devel/crossdev-20210621
index d4942c24edd5..153fc77d4eb1 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20210621
+++ b/metadata/md5-cache/sys-devel/crossdev-20210621
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20210621.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20210621.tar.xz
-_md5_=ea9b53d226acd708bc1769f8ca997c4e
+SRC_URI=mirror://gentoo/crossdev-20210621.tar.xz https://dev.gentoo.org/~sam/distfiles/crossdev-20210621.tar.xz
+_md5_=113788af0df64a3939b481bdabc36001
diff --git a/metadata/md5-cache/sys-devel/crossdev-20210718 b/metadata/md5-cache/sys-devel/crossdev-20210718
index fc678dbf496e..4142bc9c1a3c 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20210718
+++ b/metadata/md5-cache/sys-devel/crossdev-20210718
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20210718.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20210718.tar.xz
-_md5_=4c9fa4afed36e462a3ee35b87fc6f9f1
+SRC_URI=mirror://gentoo/crossdev-20210718.tar.xz https://dev.gentoo.org/~sam/distfiles/crossdev-20210718.tar.xz
+_md5_=104964d7716c1562712b2db6fd730a68
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index 272cbd54c245..f45be8034944 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=b082bfb62d557a19b993b33015c5083b
+_md5_=f1662a61a50b36045fb81e0773f04bc8
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.4 b/metadata/md5-cache/sys-devel/gcc-config-2.4
index ca840039fb75..696e307b40d3 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.4
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.4
@@ -7,6 +7,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.4.tar.xz
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/gcc-config-2.4.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b35aa264f80d195831847202ec593774
+_md5_=d1dc339405c58bab49f66b96ec91d41a
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index af1fdab85cfa..114d85e5582a 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9282dffcdcf33bb45186aad488afbeae
+_md5_=9d927725f2000f0c74b387ca2d8be573
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0 b/metadata/md5-cache/sys-devel/lld-13.0.0
new file mode 100644
index 000000000000..06bda61ad36d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-13.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-13.0.0[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-13.0.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-13.0.0[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-13.0.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-13.0.0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=49e08269babaf1f564d0bf61f8e291dd
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0_rc2 b/metadata/md5-cache/sys-devel/lld-13.0.0_rc2
deleted file mode 100644
index 91f6357860a8..000000000000
--- a/metadata/md5-cache/sys-devel/lld-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-13.0.0_rc2[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-13.0.0_rc2[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-13.0.0_rc2[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc2 !!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_rc2
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0_rc3 b/metadata/md5-cache/sys-devel/lld-13.0.0_rc3
deleted file mode 100644
index 7791f5cc5ee3..000000000000
--- a/metadata/md5-cache/sys-devel/lld-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-13.0.0_rc3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-13.0.0_rc3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-13.0.0_rc3[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc3 !!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_rc3
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0_rc4 b/metadata/md5-cache/sys-devel/lld-13.0.0_rc4
deleted file mode 100644
index 37b6d9dae788..000000000000
--- a/metadata/md5-cache/sys-devel/lld-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-13.0.0_rc4[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-13.0.0_rc4[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-13.0.0_rc4[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-13.0.0_rc4 !!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_rc4
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0 b/metadata/md5-cache/sys-devel/llvm-13.0.0
new file mode 100644
index 000000000000..fdd33c2e4a09
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-13.0.0
@@ -0,0 +1,17 @@
+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-util/ninja >=dev-util/cmake-3.20.5
+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 doc 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 abi_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
+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.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-13.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=398166216a95661b6177e47ceebe2566
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-13.0.0_rc2
deleted file mode 100644
index 08b424f27d70..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-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 doc 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 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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5a0c7602547d6fc5755d116272dc4ca8
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-13.0.0_rc3
deleted file mode 100644
index 1797f6f5848e..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-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 doc 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 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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a0cff5eba07be48c24289a52b264eb36
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-13.0.0_rc4
deleted file mode 100644
index 0f8a364f30d7..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc4
+++ /dev/null
@@ -1,16 +0,0 @@
-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-3.20.5
-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 doc 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 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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f23e31dabe93dd8c02729cf26de04387
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0
new file mode 100644
index 000000000000..6f705b99b7a1
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-13.0.0
@@ -0,0 +1,11 @@
+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
+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.tar.gz
+_eclasses_=llvm.org	21b9255c65ab2859fc1af2242a432103	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=a8b59d835aeee72041f3863f0ede30ba
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc2
deleted file mode 100644
index 09508d1049d3..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc2
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc2.tar.gz
-_eclasses_=llvm.org	21b9255c65ab2859fc1af2242a432103	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc3
deleted file mode 100644
index f2cc368716d7..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc3
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc3.tar.gz
-_eclasses_=llvm.org	21b9255c65ab2859fc1af2242a432103	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc4
deleted file mode 100644
index bd5c5ab596d2..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc4
+++ /dev/null
@@ -1,10 +0,0 @@
-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-rc4.tar.gz
-_eclasses_=llvm.org	21b9255c65ab2859fc1af2242a432103	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvmgold-13 b/metadata/md5-cache/sys-devel/llvmgold-13
index 7d8e646e0f88..1c088e68150d 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-13
+++ b/metadata/md5-cache/sys-devel/llvmgold-13
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=public-domain
-PROPERTIES=live
 RDEPEND=sys-devel/llvm:13[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=b385d4332633bbd59f89a6c65acef4b7
+_md5_=05dd4530b8ea9f9873c5ae9c6a0176ba
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 1f9e4f063d6f..9e1bf03e270f 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 84a16f224f1f..9655bdd2f010 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29963ebe5065538d2d33c2d4e2c8f8aa
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index 2fbd95586d93..4a75247dedb3 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=571f202510b0ed2a6beaa62eba755f94
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.21.1 b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
index c2c4ea40de3d..1bdfb6214f3c 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.21.1
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/ipxe/ipxe/archive/refs/tags/v1.21.1.tar.gz -> ipxe-1.21.1.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.21.1-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=332d436052c41289e22b438d59fc23df
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
index 3d7418746ce4..80e3a091a61c 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc
 LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
-SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~slyfox/distfiles/seabios-1.14.0-r2-bin.tar.xz )
+SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~sam/distfiles/seabios-1.14.0-r2-bin.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4df9dd623b67085197c475cfd3766ade
+_md5_=7090ade5b63a97a4fd051201338fba47
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 847a136511d1..0ca66549a852 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/cachefilesd-0.10.10-r1 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
index 1e2417c38c47..cc979b1e3130 100644
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a caching directory on an already mounted filesystem
 EAPI=6
 HOMEPAGE=https://people.redhat.com/~dhowells/fscache/
 IUSE=doc selinux
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=selinux? ( sec-policy/selinux-cachefilesd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.10.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d5c8c3f39b8b4ef0a96667694e9d549d
+_md5_=663eaa969b1a57010e3622ba1e03f0f0
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.11.2 b/metadata/md5-cache/sys-fs/duperemove-0.11.2
deleted file mode 100644
index b7a64ac216b6..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.11.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2
-DESCRIPTION=Btrfs and xfs deduplication utility
-EAPI=7
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.11.2.tar.gz -> duperemove-0.11.2.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bae120e665aa2cd76b90999f0d8af75e
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.11.3 b/metadata/md5-cache/sys-fs/duperemove-0.11.3
index 654d05345536..0aa64474a8ea 100644
--- a/metadata/md5-cache/sys-fs/duperemove-0.11.3
+++ b/metadata/md5-cache/sys-fs/duperemove-0.11.3
@@ -3,10 +3,10 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2
 DESCRIPTION=Btrfs and xfs deduplication utility
 EAPI=8
 HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.11.3.tar.gz -> duperemove-0.11.3.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3fb33b740957bfc3cdffe39adc9cba9
+_md5_=2d7f2beefb0e56f8e177e0dada27894b
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4
index aba0b0b189ee..0393f2007f62 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4
@@ -5,10 +5,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=cron fuse lto nls static-libs +threads elibc_FreeBSD split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.46.4 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab465e5081d9d78a817a04d12bf99b53
+_md5_=4a4f05f05915fadb44eb4c1afd4cdfd1
diff --git a/metadata/md5-cache/sys-fs/exfatprogs-1.1.2 b/metadata/md5-cache/sys-fs/exfatprogs-1.1.2
index 8d3f780423b8..112641ad5345 100644
--- a/metadata/md5-cache/sys-fs/exfatprogs-1.1.2
+++ b/metadata/md5-cache/sys-fs/exfatprogs-1.1.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Userspace utilities for new exfat filesystem (kernel 5.7+)
 EAPI=7
 HOMEPAGE=https://github.com/exfatprogs/exfatprogs
-KEYWORDS=amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/exfat-utils
 SLOT=0
 SRC_URI=https://github.com/exfatprogs/exfatprogs/releases/download/1.1.2/exfatprogs-1.1.2.tar.xz
-_md5_=5770c7e8949388bb197f9146a1177cfa
+_md5_=586034af44b119d53000689d6c51398d
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0 b/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
index 28fe665d3b23..e800faaf727e 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
 EAPI=7
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
 IUSE=selinux
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
 SLOT=0/8
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/sys-fs/f2fs-tools/f2fs-tools-1.14.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88d41f9873ddc1b58e5a0bf6e70fd103
+_md5_=a7bdd59ff7347fe5c198009c4c0c825b
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.6.4.625 b/metadata/md5-cache/sys-fs/fatsort-1.6.4.625
new file mode 100644
index 000000000000..07cdee79995e
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-1.6.4.625
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile prepare test
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
+EAPI=7
+HOMEPAGE=http://fatsort.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-1.6.4.625.tar.xz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a874c02b079b9e72a477e9a17d52ede3
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.1 b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.1
deleted file mode 100644
index 4ddd9b3b88ca..000000000000
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=a set of command-line programs providing a simple interface to inotify
-EAPI=8
-HOMEPAGE=https://github.com/inotify-tools/inotify-tools
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.21.9.1.tar.gz -> inotify-tools-3.21.9.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c3143bdf764724439eb3f94e79fe811
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.5 b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.5
index 1f4f6754274c..6e503dc10c85 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.5
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.5
@@ -4,9 +4,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=8
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.21.9.5.tar.gz -> inotify-tools-3.21.9.5.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c3143bdf764724439eb3f94e79fe811
+_md5_=f319f185ed42177e5d08db4372cc3a64
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6 b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
new file mode 100644
index 000000000000..3ba9a46f18e9
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=a set of command-line programs providing a simple interface to inotify
+EAPI=8
+HOMEPAGE=https://github.com/inotify-tools/inotify-tools
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.21.9.6.tar.gz -> inotify-tools-3.21.9.6.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f319f185ed42177e5d08db4372cc3a64
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7s b/metadata/md5-cache/sys-fs/loop-aes-3.7s
deleted file mode 100644
index 04bf21a1bae8..000000000000
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7s
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
-EAPI=7
-HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
-IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7s.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a06e04b520e3eb79bd9c9b708a76648
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7v b/metadata/md5-cache/sys-fs/loop-aes-3.7v
new file mode 100644
index 000000000000..0e755a0b32ab
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7v
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
+EAPI=7
+HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
+IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7v.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0d9238287c0f192e554ae2fd4cd2bd17
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.2 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.2
deleted file mode 100644
index 4abd3d37487d..000000000000
--- a/metadata/md5-cache/sys-fs/mtd-utils-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/libtool
-DEFINED_PHASES=configure install prepare
-DEPEND=!sys-fs/mtd >=sys-apps/util-linux-2.16 sys-libs/zlib lzo? ( dev-libs/lzo ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd )
-DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
-EAPI=7
-HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary
-IUSE=+lzo xattr +zstd
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!sys-fs/mtd >=sys-apps/util-linux-2.16 sys-libs/zlib lzo? ( dev-libs/lzo ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd )
-SLOT=0
-SRC_URI=https://github.com/sigma-star/mtd-utils/archive/v2.1.2.tar.gz -> mtd-utils-2.1.2.tar.gz
-_md5_=40ca566cc26ccfebe206a42353dbee1a
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.3 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.3
index f60029845b5e..e3125d05c2fc 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-2.1.3
+++ b/metadata/md5-cache/sys-fs/mtd-utils-2.1.3
@@ -5,10 +5,10 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=8
 HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=+lzo xattr +zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux sys-libs/zlib lzo? ( dev-libs/lzo ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://github.com/sigma-star/mtd-utils/archive/v2.1.3.tar.gz -> mtd-utils-2.1.3.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=97f5eb3eaa969ee1dc954753a8031160
+_md5_=747eec57e0a7eb061473c6d8d41c0e61
diff --git a/metadata/md5-cache/sys-fs/mtpfs-1.1-r6 b/metadata/md5-cache/sys-fs/mtpfs-1.1-r6
index f03fe0efc11d..6982dd18ed40 100644
--- a/metadata/md5-cache/sys-fs/mtpfs-1.1-r6
+++ b/metadata/md5-cache/sys-fs/mtpfs-1.1-r6
@@ -10,4 +10,4 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=media-libs/libmtp-1.1.2:= <sys-fs/fuse-3:0= mad? ( media-libs/libid3tag:= media-libs/libmad )
 SLOT=0
 SRC_URI=https://www.adebenham.com/files/mtp/mtpfs-1.1.tar.gz
-_md5_=17b069d4e466787defa33707ac0452c3
+_md5_=8bade957975167f2c035b610ce687956
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22 b/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
index b8f65b959fbb..d01d44c6bc1b 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
@@ -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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= sys-fs/fuse:0 ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/89
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2021.8.22.tgz
 _eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d567ca7cf19f3f12be1fe4ecbbf2ea6
+_md5_=90a097f96e554eda155c7898813939ad
diff --git a/metadata/md5-cache/sys-fs/ubi_reader-0.7.0 b/metadata/md5-cache/sys-fs/ubi_reader-0.7.0
index 5997a2fea2a5..a04ff21dbdc4 100644
--- a/metadata/md5-cache/sys-fs/ubi_reader-0.7.0
+++ b/metadata/md5-cache/sys-fs/ubi_reader-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-lzo[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/ubi-reader/ubi_reader-0.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=083a1dbb6c54fe29588f158282a65a57
diff --git a/metadata/md5-cache/sys-fs/udftools-2.3 b/metadata/md5-cache/sys-fs/udftools-2.3
index 304441ef3fdb..e8236c8ebf53 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.3
+++ b/metadata/md5-cache/sys-fs/udftools-2.3
@@ -4,9 +4,9 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=7
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.3/udftools-2.3.tar.gz
-_md5_=935705cf47f46cf59131fff2ec46c7d0
+_md5_=6138a0fbb28143f4bd7c79dc9eaf4179
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.3.3 b/metadata/md5-cache/sys-fs/udiskie-2.3.3
index bec21ee67038..969181e211e8 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.3.3
+++ b/metadata/md5-cache/sys-fs/udiskie-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8aacaecb4c70be5f74fd5a441779ae9a
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1 b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
index 1af77975b1e3..509c32c18ead 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
+++ b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
@@ -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/u/udiskie/udiskie-2.3.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8ad2917589c0e03f8f6718033d141e46
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1-r2 b/metadata/md5-cache/sys-fs/udisks-2.9.1-r2
deleted file mode 100644
index 98f9b72896d0..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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.24[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.24[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 sparc x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[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.24[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.1/udisks-2.9.1.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f155bf9ecc057788fb2f46c0fcf0e390
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.2-r2 b/metadata/md5-cache/sys-fs/udisks-2.9.2-r2
deleted file mode 100644
index c46b39c7a7b2..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.9.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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.2/udisks-2.9.2.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f24be4f5780061f9622ca3c3436239c6
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.4 b/metadata/md5-cache/sys-fs/udisks-2.9.4
new file mode 100644
index 000000000000..534635f410f4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.4
@@ -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.114 >=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.114 >=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.4/udisks-2.9.4.tar.bz2
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2a7b7c66b7b0d0eafd22103ccbce7059
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.6-r1 b/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
index cd25cba1b00b..9d08c7b974c3 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9482f3ec38dd665ddcac3b0d51229bf
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.5-r1 b/metadata/md5-cache/sys-fs/zfs-2.0.5-r1
deleted file mode 100644
index ee0ece5ed981..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.5:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20b8634a9ac4f3f0278300d42765986d
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.6 b/metadata/md5-cache/sys-fs/zfs-2.0.6
deleted file mode 100644
index c7de43607652..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.6:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ed719b9f1a0ca134f2897f749a2ae16
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.6-r1 b/metadata/md5-cache/sys-fs/zfs-2.0.6-r1
new file mode 100644
index 000000000000..a8cb59981762
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://github.com/openzfs/zfs
+IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
+KEYWORDS=amd64 arm64 ppc64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.6:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) <sys-apps/coreutils-9
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RESTRICT=test
+SLOT=0/4
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz.asc )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7e59626d1d422a54d9afe353791292b0
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.0-r1 b/metadata/md5-cache/sys-fs/zfs-2.1.0-r1
deleted file mode 100644
index 48dc16c3fcca..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.0:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/5
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=667baf535478f9240e0a69e445f628cd
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.1-r1 b/metadata/md5-cache/sys-fs/zfs-2.1.1-r1
deleted file mode 100644
index 88d40bc8c44b..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.1.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux split-usr verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.1:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/5
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=759207b35d5a8fc6795f67032da86332
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.1-r2 b/metadata/md5-cache/sys-fs/zfs-2.1.1-r2
new file mode 100644
index 000000000000..1c68f6528d0f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://github.com/openzfs/zfs
+IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux split-usr verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.1:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) <sys-apps/coreutils-9
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RESTRICT=test
+SLOT=0/5
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc )
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=09cf0c6c3c6cc73713b1d3647786f79a
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 37e723b4f1e2..09a97549a302 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/openzfs/zfs
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux split-usr kernel_linux kernel_linux dist-kernel
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
-RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999:=[dist-kernel?] ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) <sys-apps/coreutils-9 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=819635624f66eb13ddaa2b9ebf121315
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91f3a397379f39b4e2a485ec12b449d3
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
deleted file mode 100644
index 74ed8573214e..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=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 postrm preinst prepare pretend setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux dist-kernel verify-sig
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=CDDL MIT debug? ( GPL-2+ )
-PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.0.5[dist-kernel] )
-RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-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	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17c7accb97615a293b4a0d050880c7ec
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
index ecae2ea60fa9..4755ef8afe43 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
@@ -5,7 +5,7 @@ DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
 IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux dist-kernel verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=CDDL MIT debug? ( GPL-2+ )
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.0.6[dist-kernel] )
 RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
@@ -13,4 +13,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0/2.0.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz.asc )
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0f254b744eacd9ddb76488e5aeb6ccf
+_md5_=0b847cabad7c4e331091bc642e4a7cf6
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
deleted file mode 100644
index f6c0835f5051..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk verify-sig? ( app-crypt/openpgp-keys-openzfs ) sys-devel/gnuconfig >=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 postrm preinst prepare pretend setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux dist-kernel verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=CDDL MIT debug? ( GPL-2+ )
-PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.1.0[dist-kernel] )
-RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=debug? ( strip ) test
-SLOT=0/2.1.0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=461bb21bbfe72fcb7d514fa3dcfd91cb
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1a51a2889f49..8704698e21d0 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.4-r2 b/metadata/md5-cache/sys-kernel/genkernel-4.2.4-r2
new file mode 100644
index 000000000000..bed51d39af66
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
+IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.4.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://dl.bintray.com/boostorg/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.3.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.23.tar.gz -> libxcrypt-4.4.23.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.12.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30fc76e34d8915ea01e8073e71f81569
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68
index 91f23e09efe8..78627de659b3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.68
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.68
 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-74.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-74.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d9e59e4e2d4687aad466a02d5e55a887
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.69 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.69
new file mode 100644
index 000000000000..b53f6e01ec30
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.69
@@ -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.69
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.69 || ( 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.69
+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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce444a5985b1e8fdbe9bd011db5f9d1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.70 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.70
new file mode 100644
index 000000000000..54d24021d41e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.70
@@ -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.70
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.70 || ( 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.70
+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-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-76.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce444a5985b1e8fdbe9bd011db5f9d1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.19
index 77989114ba3c..8a3b8f4b7e6e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.19
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.13.19
 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-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-21.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/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.9 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.9 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.9 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.9 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e612151a8d05075a81c4cb15fff82109
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.7
index 9e574991de50..964cf30d16e8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.7
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.14.7
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-8.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/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.8
new file mode 100644
index 000000000000..888b78f839c0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.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.14.8
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.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.14.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.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/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.9
new file mode 100644
index 000000000000..82f3c9c5c04b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.9
@@ -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.14.9
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.9 || ( 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.14.9
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-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/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148
index 67756f569690..180d504ac15c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.148
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.148 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.148
 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-152.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-152.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5b186dfc4c1585348ee7ca5f08b1d988
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.149
new file mode 100644
index 000000000000..771dd1bc8055
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.149
@@ -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.149
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.149 || ( 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.149
+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-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.150 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.150
new file mode 100644
index 000000000000..9de9983b044a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.150
@@ -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.150
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.150 || ( 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.150
+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-154.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-154.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69
new file mode 100644
index 000000000000..7c8fa86f4b9d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69
@@ -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.69
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.69 || ( 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.69
+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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69-1.xpak -> gentoo-kernel-5.10.69-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69-1.xpak -> gentoo-kernel-5.10.69-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69-r1
new file mode 100644
index 000000000000..903f0d1df3eb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.69-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.69
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.69 || ( 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.69
+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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69-1.xpak -> gentoo-kernel-5.10.69-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.70 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.70
new file mode 100644
index 000000000000..df2c8ef0ede5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.70
@@ -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.70
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.70 || ( 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.70
+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-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-76.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70-1.xpak -> gentoo-kernel-5.10.70-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70-1.xpak -> gentoo-kernel-5.10.70-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.8
new file mode 100644
index 000000000000..dad5ce3b645f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.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.14.8
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.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.14.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8-1.xpak -> gentoo-kernel-5.14.8-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8-1.xpak -> gentoo-kernel-5.14.8-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.8-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.8-r1
new file mode 100644
index 000000000000..eb41cb3c2407
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.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.14.8
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.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.14.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8-1.xpak -> gentoo-kernel-5.14.8-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f1818b14a55cf755fbde13fe1c88a9ee
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.9
new file mode 100644
index 000000000000..6f7ada138643
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.9
@@ -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.14.9
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.9 || ( 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.14.9
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.9-1.xpak -> gentoo-kernel-5.14.9-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.9-1.xpak -> gentoo-kernel-5.14.9-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149
new file mode 100644
index 000000000000..8ea1ca41fca2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149
@@ -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.149
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.149 || ( 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.149
+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-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.149-1.xpak -> gentoo-kernel-5.4.149-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.149-1.xpak -> gentoo-kernel-5.4.149-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149-r1
new file mode 100644
index 000000000000..0fa0845328c4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.149-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.149
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.149 || ( 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.149
+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-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.149-1.xpak -> gentoo-kernel-5.4.149-1.arm64-r1.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=588b9a16742c74e96021338561c7a300
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.150 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.150
new file mode 100644
index 000000000000..3068bdc5d585
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.150
@@ -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.150
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.150 || ( 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.150
+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-154.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-154.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150-1.xpak -> gentoo-kernel-5.4.150-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150-1.xpak -> gentoo-kernel-5.4.150-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.248 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.248
new file mode 100644
index 000000000000..b487f50dbc90
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.248
@@ -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? ( app-arch/cpio 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.248
+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-258.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-258.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-258.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-258.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-258.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-258.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-258.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-258.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-258.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4afedadbd3b8202e7a849505c1da6a90
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.208 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.208
new file mode 100644
index 000000000000..dd5342184bdd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.208
@@ -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? ( app-arch/cpio 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.208
+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-207.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-207.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-207.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-207.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-207.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-207.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-207.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-207.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-207.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef160fc81e61e5405f4d8084d826c0cc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.285 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.285
new file mode 100644
index 000000000000..cd7a9c9d03a2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.285
@@ -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? ( app-arch/cpio 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.285
+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-287.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-287.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-287.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-287.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-287.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-287.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-287.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-287.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-287.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e3bb75221877955db165fca22152924
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.284 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.284
new file mode 100644
index 000000000000..01e699d9c448
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.284
@@ -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? ( app-arch/cpio 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.284
+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-288.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-288.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-288.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-288.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-288.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-288.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-288.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-288.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-288.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=89bd1a0817a3ad79cd43751196aecfd1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.69 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.69
new file mode 100644
index 000000000000..ed66f2eadce3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.69
@@ -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? ( app-arch/cpio 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.69
+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-75.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-75.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-75.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-75.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-75.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-75.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-75.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c54acc91a05d04564e3d41a12a88656f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.70 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.70
new file mode 100644
index 000000000000..edf5258a3490
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.70
@@ -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? ( app-arch/cpio 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.70
+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-76.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-76.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-76.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-76.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-76.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-76.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-76.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-76.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-76.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7faf46ca0625ade984a181f54fac31a2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.8
new file mode 100644
index 000000000000..18a04afccbd6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.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.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 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-9.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=99654db4a8cdbd00204ea3a8012a744e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.9
new file mode 100644
index 000000000000..05d725f1855f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.9
@@ -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.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 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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.9
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-10.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=155e5615c4ce15f887d92a8aeadd56fc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.149 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.149
new file mode 100644
index 000000000000..5778aafbef64
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.149
@@ -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? ( app-arch/cpio 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.149
+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-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-153.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-153.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-153.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-153.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-153.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-153.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=23c5d1e822493df83d0e6786494d6047
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.150 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.150
new file mode 100644
index 000000000000..422aa7849320
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.150
@@ -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? ( app-arch/cpio 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.150
+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-154.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-154.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-154.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-154.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-154.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-154.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-154.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-154.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-154.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54be54df20c4fe7dd85fa9867ba0e619
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.15_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc3
new file mode 100644
index 000000000000..0501277fd6a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc3
@@ -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? ( app-arch/cpio 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.15_rc3
+SRC_URI=https://git.kernel.org/torvalds/p/v5.15-rc3/v5.14 -> patch-5.15-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ad86d5d7ebcf1e44d5a3549e457e2b
diff --git a/metadata/md5-cache/sys-kernel/kergen-0.1.5 b/metadata/md5-cache/sys-kernel/kergen-0.1.5
index e690fe819ea7..13251882be4d 100644
--- a/metadata/md5-cache/sys-kernel/kergen-0.1.5
+++ b/metadata/md5-cache/sys-kernel/kergen-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/nichoski/kergen/archive/0.1.5.tar.gz -> kergen-0.1.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2325c2f5694afd487b922efffd7ea17a
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20201218 b/metadata/md5-cache/sys-kernel/linux-firmware-20201218
index 07d2afc7fdac..db13fc0be669 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20201218
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20201218
@@ -11,5 +11,5 @@ REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20201218.tar.xz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=19a4611872c7eaea46c4d96aeeb22292
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210208 b/metadata/md5-cache/sys-kernel/linux-firmware-20210208
index cbc4ef4cc88b..8d95762eebcc 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210208
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210208
@@ -11,5 +11,5 @@ REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20210208.tar.xz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=19a4611872c7eaea46c4d96aeeb22292
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210315 b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
index 8b8b7ddd096a..b701448bf59d 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210315
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
@@ -11,5 +11,5 @@ REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20210315.tar.xz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=d865b9e45eb6e4e9f9ba82f3e00bddf3
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210518 b/metadata/md5-cache/sys-kernel/linux-firmware-20210518
index aff670b63461..1a37323621ac 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210518
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210518
@@ -11,5 +11,5 @@ 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/f8462923ed8fc874f770b8c6dfad49d39b381f14.tar.gz -> linux-firmware-20210518.tar.gz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=360cf9b0125a47be328e9c7c7e1f820e
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210629 b/metadata/md5-cache/sys-kernel/linux-firmware-20210629
index bb6258969a4e..9c40924dc59d 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210629
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210629
@@ -11,5 +11,5 @@ 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-20210629.tar.gz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=e70bf1573de7580c883d601b211b9e1c
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210716 b/metadata/md5-cache/sys-kernel/linux-firmware-20210716
index 8f92a074134d..d018f6ebc21c 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210716
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210716
@@ -11,5 +11,5 @@ 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
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=e70bf1573de7580c883d601b211b9e1c
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210818 b/metadata/md5-cache/sys-kernel/linux-firmware-20210818
index 648983cf77d6..8175ca5e0fe3 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210818
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210818
@@ -11,5 +11,5 @@ REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20210818.tar.xz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=833298d235ae007318e29c513b776ca3
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 637cd32a801a..99ba43c7cb1b 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -10,5 +10,5 @@ RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_card
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651
 _md5_=d865b9e45eb6e4e9f9ba82f3e00bddf3
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index 6e1c1b8e92b6..09f5b71b38e1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-4.19-1.tar.xz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6aedfc99261e456d95203664d57bf4e
+_md5_=1fb5740f1e847ab37a4946f1e564364f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.10 b/metadata/md5-cache/sys-kernel/linux-headers-5.10
index ed2f7ac59526..f5e0f1c52c0a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.10
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz mirror://gentoo/gentoo-headers-5.10-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.10-1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz mirror://gentoo/gentoo-headers-5.10-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-5.10-1.tar.xz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75de64c4e52cad3162d03d099bf6fb2d
+_md5_=3ceee025fdd840826e9462caf6c677b2
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.11 b/metadata/md5-cache/sys-kernel/linux-headers-5.11
index 3553db9f21b3..8908b5ef3495 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.11
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz mirror://gentoo/gentoo-headers-5.11-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.11-1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz mirror://gentoo/gentoo-headers-5.11-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-5.11-1.tar.xz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61057edf5844c34d7d0c699f479f1021
+_md5_=8c7e15df8f7e2033d2b7122afb81ba74
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.12 b/metadata/md5-cache/sys-kernel/linux-headers-5.12
index 904d8bb3b61c..2466640bfab8 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.12
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.12
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz mirror://gentoo/gentoo-headers-5.12-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.12-1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz mirror://gentoo/gentoo-headers-5.12-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-5.12-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b647f7212dc2b6d20004501a5c0ecbb
+_md5_=b9e492e401786cea6f987612bcc24da4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.14 b/metadata/md5-cache/sys-kernel/linux-headers-5.14
index ec1cfeb98ef5..83d846de8f39 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.14
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.14
@@ -10,4 +10,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-kernel/linux-headers/gentoo-headers-5.14-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e6ab8fea6126e40d7eabd6f4e2837af
+_md5_=3e83a333142151537e5c1600873676cc
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index fc47a5f4cd06..40fdd73de800 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-5.4-2.tar.xz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=935d5a96ab564bc6a26623a4ee3666d0
+_md5_=f718f4179e24404b94168eaafb1b66db
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.9 b/metadata/md5-cache/sys-kernel/linux-headers-5.9
index a38258acceb9..3ff939da0ab1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.9
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz mirror://gentoo/gentoo-headers-5.9-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.9-1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz mirror://gentoo/gentoo-headers-5.9-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gentoo-headers-5.9-1.tar.xz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61057edf5844c34d7d0c699f479f1021
+_md5_=8c7e15df8f7e2033d2b7122afb81ba74
diff --git a/metadata/md5-cache/sys-kernel/linux-next-9999 b/metadata/md5-cache/sys-kernel/linux-next-9999
new file mode 100644
index 000000000000..f960c74d287c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-next-9999
@@ -0,0 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Linux kernel and patches aimed at the next kernel merge window
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+LICENSE=GPL-2+
+PROPERTIES=live
+SLOT=0
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=400533bcac35149868c4e9d1d40600c9
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.14_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.14_p3
deleted file mode 100644
index 8c347f5c9d19..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.14_p3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=7
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio 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_p3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.14...v5.14-pf3.diff -> pf-sources-5.14_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.14/prjc_v5.14-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.14/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-5.14.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cee7c41e8f681936e96596bb49c57842
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.14_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.14_p4
new file mode 100644
index 000000000000..f5fb0732d222
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.14_p4
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=7
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio 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_p4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.14...v5.14-pf4.diff -> pf-sources-5.14_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.14/prjc_v5.14-r3.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.14/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-5.14.patch
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c68d5dd5807d79e8cae2fc070cd21fee
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68
index 58ae21fe210a..07d61a568112 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.68
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.68
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.68.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.68.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.69 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.69
new file mode 100644
index 000000000000..3e1379304cd3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.69
@@ -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.69
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.69 || ( 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.69
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.69.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.69.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.70 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.70
new file mode 100644
index 000000000000..3f551d8ed8d2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.70
@@ -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.70
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.70 || ( 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.70
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.70.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.70.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.19
index 12aa9fc6e210..c47c9274febb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.19
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.13.19
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.19.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.19.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.9 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.9 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.9 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/eb52b35e8cb097413357b578903bd18eb76051c0/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.9 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=7a635ecd9964d01bff3bd9378b6b378d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.7
index b5d1f1a434b3..68e851da7aee 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.7
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.7
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.14.7
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.7.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.14.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.8 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.8
new file mode 100644
index 000000000000..f3ec6c7cb07a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.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.14.8
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.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.14.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.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.14.8.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.9
new file mode 100644
index 000000000000..d2c88f40417d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.9
@@ -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.14.9
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.9 || ( 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.14.9
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.9.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.14.9.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148
index ba1762a3abc0..1bd915f85e81 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.148
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.148 || ( sys-kernel/installkernel-gen
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.148
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.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.148.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.149 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.149
new file mode 100644
index 000000000000..4aced721b5fa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.149
@@ -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.149
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.149 || ( 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.149
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.149.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.149.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.150 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.150
new file mode 100644
index 000000000000..63b215c65bc4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.150
@@ -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.150
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.150 || ( 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.150
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.150.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.150.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	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.247 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.247
deleted file mode 100644
index 558a713a9276..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.247
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.247
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.247.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.248 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.248
new file mode 100644
index 000000000000..db1333917922
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.248
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.248
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.248.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.207 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.207
deleted file mode 100644
index 665ca889a6c0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.207
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.207
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.207.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.208 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.208
new file mode 100644
index 000000000000..419eb9915a61
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.208
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.208
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.208.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.284 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.284
deleted file mode 100644
index c624d4266471..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.284
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.284
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.284.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.285 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.285
new file mode 100644
index 000000000000..375561f09f04
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.285
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.285
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.285.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.283 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.283
deleted file mode 100644
index ebda204a34ed..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.283
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.283
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.283.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.284 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.284
new file mode 100644
index 000000000000..bccc5f88b6ef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.284
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.284
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.284.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.68 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.68
deleted file mode 100644
index 5630cf14600b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.68
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.68
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.68.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.70 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.70
new file mode 100644
index 000000000000..547a86038593
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.70
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.70
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.70.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.18
deleted file mode 100644
index be445869a3f0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.18
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.18.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19
new file mode 100644
index 000000000000..40329e7ba6f6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.19
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.7
deleted file mode 100644
index aaed11d7c65d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.7.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.9 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.9
new file mode 100644
index 000000000000..bf45e99a6ed8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.9
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.9
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.148 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.148
deleted file mode 100644
index 90aa0633c363..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.148
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-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? ( app-arch/cpio 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.148
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.148.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.150 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.150
new file mode 100644
index 000000000000..0a908de5da12
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.150
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+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? ( app-arch/cpio 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.150
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.150.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a4a8d677873e..97e6fffb12d0 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-13.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0
new file mode 100644
index 000000000000..025a6d1e16c2
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0
@@ -0,0 +1,14 @@
+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-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+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.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=582e01ad29c84b7cecd780667d5e8460
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc2
deleted file mode 100644
index 7560e80430fd..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-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-3.20.5
-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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6102d7c1dbf389def998f3a32344a3d3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc3
deleted file mode 100644
index d2ea1e17c454..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc3
+++ /dev/null
@@ -1,13 +0,0 @@
-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-3.20.5
-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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e35057c476caff2813afd2439604c650
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc4
deleted file mode 100644
index 888efd5c4869..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc4
+++ /dev/null
@@ -1,13 +0,0 @@
-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-3.20.5
-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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f69fe38ec4c4eb8d57d2077aa4b13303
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0
new file mode 100644
index 000000000000..4f691fd2e00d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0
@@ -0,0 +1,15 @@
+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-3.20.5
+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
+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 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.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6fd6d9b06c62d49f11de2cd9d4ee3a88
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc2
deleted file mode 100644
index db97e33f8b8d..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=69cc9bae4021a77e87e14dccdc7f6e70
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc3
deleted file mode 100644
index 814916b520fa..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad98993dcdad98b3683c95b3e7c826ae
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc4
deleted file mode 100644
index e109607e5461..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eadd3f02c5716257a0f16f722d981c6b
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.7 b/metadata/md5-cache/sys-libs/cracklib-2.9.7
index ddc1ad33e6dc..16e1104ba13c 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.7
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.7
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-2.9.7.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=46acf6bd07b59479f33de70ad1cfd4fd
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.4 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.4
index 0a96309d7e77..7593adebebb0 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.4
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.4
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=82b5404928122f999685284e302e3751
+_md5_=d5db539e0b485ec24633a48d44fa972c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r9 b/metadata/md5-cache/sys-libs/glibc-2.30-r9
index 290ca13fa026..ad58077e5038 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30-r9
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r9
@@ -11,6 +11,6 @@ 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 ) sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-10.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch
+SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-10.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) https://dev.gentoo.org/~sam/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fe7e0b3d37d14d7d3ad5eeaf8bfa14a
+_md5_=196192097dff77a9d7deb2a32c82460c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.34 b/metadata/md5-cache/sys-libs/glibc-2.34
index 99d706396041..aae27066ba28 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.34
+++ b/metadata/md5-cache/sys-libs/glibc-2.34
@@ -10,6 +10,6 @@ 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-2.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 )
+SRC_URI=mirror://gnu/glibc/glibc-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.34-patches-3.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	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=33c3f0507bc8da763a87835711974b21
+_md5_=1ee088f18586de698d63a81043e9b94a
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.1 b/metadata/md5-cache/sys-libs/libapparmor-3.0.1
index c4aad443f0a1..1ae9c0539c58 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.1
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f322559d566d3992d8a683f40ddfe3aa
diff --git a/metadata/md5-cache/sys-libs/libcap-2.59 b/metadata/md5-cache/sys-libs/libcap-2.59
new file mode 100644
index 000000000000..78fb6694fe89
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.59
@@ -0,0 +1,14 @@
+BDEPEND=tools? ( dev-lang/go )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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 tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 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(-)?] )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.59.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c7ca2ae488dd60a95ec4a5386d34c9f5
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0 b/metadata/md5-cache/sys-libs/libcxx-13.0.0
new file mode 100644
index 000000000000..951c2025c74c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.0
@@ -0,0 +1,16 @@
+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-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=019410e561e7e81839803444872f9e0a
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc2
deleted file mode 100644
index 5451a78e67eb..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0_rc2[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_rc2[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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=82bd6b56f948e155c8977514f8e20d25
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc3
deleted file mode 100644
index 70e2cfe04f28..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0_rc3[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_rc3[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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc9e91ba655baa196244c5db85f73890
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc4
deleted file mode 100644
index 8430a233ff62..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0_rc4[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_rc4[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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=57f8a73cc56c335e221d2871937bd576
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0
new file mode 100644
index 000000000000..43356ef60491
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0
@@ -0,0 +1,15 @@
+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-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~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-13.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=048cb99fbdc680439332cc2ff1acaba0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc2
deleted file mode 100644
index 944b12b7cfff..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc3
deleted file mode 100644
index efea0273c078..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc4
deleted file mode 100644
index 2f45b4c09ca9..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0 b/metadata/md5-cache/sys-libs/libomp-13.0.0
new file mode 100644
index 000000000000..c5639de145d3
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0
@@ -0,0 +1,16 @@
+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-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~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 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b341abe011da0072fef37518c7283dc5
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc2 b/metadata/md5-cache/sys-libs/libomp-13.0.0_rc2
deleted file mode 100644
index e7f15049af67..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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-rc2.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=06f5334cc29c4dc968aae2865aff4753
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc3 b/metadata/md5-cache/sys-libs/libomp-13.0.0_rc3
deleted file mode 100644
index 7a2863ab44a5..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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-rc3.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2dfb585e1d025ee1decd58fd77187126
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc4 b/metadata/md5-cache/sys-libs/libomp-13.0.0_rc4
deleted file mode 100644
index 4ef84c4e3339..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-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-3.20.5
-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-rc4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-rc4.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b1b6d70fc0cee4e670d66c6bc24cb4f7
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
index 686b05aac467..cec4dee82b4e 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( static-libs || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.1/libseccomp-2.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=740ec7aeb33a0bebed50bfb724d8eaa0
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
index 79098fe88f50..4aaceedb6ec5 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.1/libseccomp-2.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95ac2c29ab56e555973bbdc66b5349cc
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.2 b/metadata/md5-cache/sys-libs/libseccomp-2.5.2
index d366ee58f4d9..935a96a848b4 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.2
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.2/libseccomp-2.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61a747ff0794933b4694736264d98895
diff --git a/metadata/md5-cache/sys-libs/libseccomp-9999 b/metadata/md5-cache/sys-libs/libseccomp-9999
index 099e7ba4cf5f..9563c7e2e338 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-9999
+++ b/metadata/md5-cache/sys-libs/libseccomp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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 ) )
 SLOT=0
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61a747ff0794933b4694736264d98895
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r4 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r4
index 2c1fb58e9bb1..7e189d3d6eb0 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r4
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/zlib
 SLOT=5
-SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-4.tar.bz2
+SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-3.3.6-patches-4.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c104ad3f5066f184005fd714fd3a11f2
+_md5_=4ac23b4b112a40c1d3ef92e47b8c2ee0
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0
new file mode 100644
index 000000000000..b37c6b98dd8a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0
@@ -0,0 +1,15 @@
+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-3.20.5
+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
+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-13.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8e36b5e856360d17e980fbe79743ac55
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc2
deleted file mode 100644
index b0ce02612c68..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc3 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc3
deleted file mode 100644
index 31357b97fa6a..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc4 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc4
deleted file mode 100644
index 75b8b2ff89db..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-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-3.20.5
-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-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-libs/newlib-4.1.0 b/metadata/md5-cache/sys-libs/newlib-4.1.0
deleted file mode 100644
index 5a1541ee76a0..000000000000
--- a/metadata/md5-cache/sys-libs/newlib-4.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DESCRIPTION=Newlib is a C library intended for use on embedded systems
-EAPI=7
-HOMEPAGE=https://sourceware.org/newlib/
-IUSE=nls threads unicode headers-only nano
-KEYWORDS=~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=NEWLIB LIBGLOSS GPL-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/newlib/newlib-4.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1ee5a8f637a1792036318dfcac84f38
diff --git a/metadata/md5-cache/sys-libs/newlib-4.1.0-r1 b/metadata/md5-cache/sys-libs/newlib-4.1.0-r1
new file mode 100644
index 000000000000..594b106d649f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/newlib-4.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup
+DESCRIPTION=Newlib is a C library intended for use on embedded systems
+EAPI=7
+HOMEPAGE=https://sourceware.org/newlib/
+IUSE=nls threads unicode headers-only nano
+KEYWORDS=~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=NEWLIB LIBGLOSS GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/newlib/newlib-4.1.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8af66748a7e3205fc2ef5f4c6d80ddf3
diff --git a/metadata/md5-cache/sys-libs/newlib-9999 b/metadata/md5-cache/sys-libs/newlib-9999
index 993e82011933..74d9e13c4b4f 100644
--- a/metadata/md5-cache/sys-libs/newlib-9999
+++ b/metadata/md5-cache/sys-libs/newlib-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=strip
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1ee5a8f637a1792036318dfcac84f38
+_md5_=8af66748a7e3205fc2ef5f4c6d80ddf3
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
index 3882d5304fd4..752a6dabaf96 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.30/uClibc-ng-1.0.30.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2294de68da35ff56430bf93e661676c1
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.32 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
index d63609bd78d5..d6655ea616b6 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f43f53980e5d7d1cdf6cd912c24821c8
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.33 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.33
index 5b0fd072d207..89293d1346e8 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.33
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.33
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.33/uClibc-ng-1.0.33.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3be81276496998c5f36254eea9e12dc1
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.35 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.35
index 30b548c362c1..5118c26a6688 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.35
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.35
@@ -9,5 +9,5 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.35/uClibc-ng-1.0.35.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e29ac6513b865bf36238908472882ab
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
index adab555b397a..d5dcf62b031e 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e29ac6513b865bf36238908472882ab
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 069e2ffeed95..c30cdfb4c82b 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/acpi_call-1.2.2 b/metadata/md5-cache/sys-power/acpi_call-1.2.2
new file mode 100644
index 000000000000..668a164e4ec6
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=A linux kernel module that enables calls to ACPI
+EAPI=7
+HOMEPAGE=https://github.com/nix-community/acpi_call
+IUSE=examples kernel_linux kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7172c3c6ea120695245a43c5f0f3f36b
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index cbd6ecfa2140..ea250f47f4e3 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/bpytop-1.0.61-r1 b/metadata/md5-cache/sys-process/bpytop-1.0.61-r1
index 137d718a6e35..74300f835f13 100644
--- a/metadata/md5-cache/sys-process/bpytop-1.0.61-r1
+++ b/metadata/md5-cache/sys-process/bpytop-1.0.61-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/aristocratos/bpytop/archive/v1.0.61.tar.gz -> bpytop-1.0.61.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca6706550c93a7a907ef640ba04419e9
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.63 b/metadata/md5-cache/sys-process/bpytop-1.0.63
index 6a96d8ef70dc..4c5e8959f3f3 100644
--- a/metadata/md5-cache/sys-process/bpytop-1.0.63
+++ b/metadata/md5-cache/sys-process/bpytop-1.0.63
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.63.tar.gz -> bpytop-1.0.63.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=baf123b32cc53858870549637b4f4229
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.67 b/metadata/md5-cache/sys-process/bpytop-1.0.67
index ab7bb0a4ab2e..1d33a7f5a5eb 100644
--- a/metadata/md5-cache/sys-process/bpytop-1.0.67
+++ b/metadata/md5-cache/sys-process/bpytop-1.0.67
@@ -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/aristocratos/bpytop/archive/v1.0.67.tar.gz -> bpytop-1.0.67.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=940826024fb755f80e82ed0b23deb005
diff --git a/metadata/md5-cache/sys-process/glances-3.2.1 b/metadata/md5-cache/sys-process/glances-3.2.1
index 770d8570f538..acfb00271b8c 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a6f6e967f3d4ebccf98ae4fa45d0ccb
diff --git a/metadata/md5-cache/sys-process/glances-3.2.2 b/metadata/md5-cache/sys-process/glances-3.2.2
index f022bf3e4a1c..9fbe2d642156 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.2
+++ b/metadata/md5-cache/sys-process/glances-3.2.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/nicolargo/glances/archive/v3.2.2.tar.gz -> glances-3.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cba2d2c795575f874cdb8444820d26a
diff --git a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1 b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
index b48605e4117e..c3b4ffb13d08 100644
--- a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
+++ b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
@@ -4,9 +4,9 @@ DESCRIPTION=inotify based cron daemon
 EAPI=7
 HOMEPAGE=https://incron.aiken.cz/
 IUSE=kernel_linux
-KEYWORDS=amd64 ~arm64 ppc x86
+KEYWORDS=amd64 ~arm64 ppc ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/ar-/incron/archive/1eedfbc9b318372efd119fd17f4abdbde561a53d.tar.gz -> incron-0.5.12_p20191114.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1824e20856868d26b9edbd830771743d
+_md5_=5028c484db16ae6ebcb5060c945dbeed
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index b298259ce84d..d105a8a39560 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/iotop-c python_targets_python3_8? ( dev-lang/python:3.8[ncu
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7ab1a1941c7e7720afbdb65c64333d0
diff --git a/metadata/md5-cache/sys-process/parallel-20210822 b/metadata/md5-cache/sys-process/parallel-20210822
index 28e5ca64399e..4356d78da194 100644
--- a/metadata/md5-cache/sys-process/parallel-20210822
+++ b/metadata/md5-cache/sys-process/parallel-20210822
@@ -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-20210822.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210822.tar.bz2.sig )
 _eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=e2c517a534bc5d79f22bbb7e5ccb5599
+_md5_=58e1477dac2ffffb292d93d0040ce637
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index a5682ad2df13..5fe5317e270f 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.69 b/metadata/md5-cache/virtual/dist-kernel-5.10.69
new file mode 100644
index 000000000000..4266a1755953
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.69
@@ -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.69 ~sys-kernel/gentoo-kernel-bin-5.10.69 ~sys-kernel/vanilla-kernel-5.10.69 )
+SLOT=0/5.10.69
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.70 b/metadata/md5-cache/virtual/dist-kernel-5.10.70
new file mode 100644
index 000000000000..209d3588d0fd
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.70
@@ -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.70 ~sys-kernel/gentoo-kernel-bin-5.10.70 ~sys-kernel/vanilla-kernel-5.10.70 )
+SLOT=0/5.10.70
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.8 b/metadata/md5-cache/virtual/dist-kernel-5.14.8
new file mode 100644
index 000000000000..672fddc9e279
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.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.14.8 ~sys-kernel/gentoo-kernel-bin-5.14.8 ~sys-kernel/vanilla-kernel-5.14.8 )
+SLOT=0/5.14.8
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.9 b/metadata/md5-cache/virtual/dist-kernel-5.14.9
new file mode 100644
index 000000000000..efed3d821980
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.9
@@ -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.14.9 ~sys-kernel/gentoo-kernel-bin-5.14.9 ~sys-kernel/vanilla-kernel-5.14.9 )
+SLOT=0/5.14.9
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.149 b/metadata/md5-cache/virtual/dist-kernel-5.4.149
new file mode 100644
index 000000000000..448e1fb0dd2b
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.149
@@ -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.149 ~sys-kernel/gentoo-kernel-bin-5.4.149 ~sys-kernel/vanilla-kernel-5.4.149 )
+SLOT=0/5.4.149
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.150 b/metadata/md5-cache/virtual/dist-kernel-5.4.150
new file mode 100644
index 000000000000..33f19f761cb0
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.150
@@ -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.150 ~sys-kernel/gentoo-kernel-bin-5.4.150 ~sys-kernel/vanilla-kernel-5.4.150 )
+SLOT=0/5.4.150
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/httpd-php-8.0 b/metadata/md5-cache/virtual/httpd-php-8.0
index 3a22f7ff7ad2..fc2e55109e88 100644
--- a/metadata/md5-cache/virtual/httpd-php-8.0
+++ b/metadata/md5-cache/virtual/httpd-php-8.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( dev-lang/php:8.0[fpm] dev-lang/php:8.0[apache2] dev-lang/php:8.0[cgi] )
 SLOT=8.0
-_md5_=ba54f287dc4472bc60f66467747960ae
+_md5_=b9c3004fc858c187379a448cb53ab70b
diff --git a/metadata/md5-cache/virtual/httpd-php-8.1 b/metadata/md5-cache/virtual/httpd-php-8.1
new file mode 100644
index 000000000000..5c2583043950
--- /dev/null
+++ b/metadata/md5-cache/virtual/httpd-php-8.1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to provide PHP-enabled webservers
+EAPI=8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+RDEPEND=|| ( dev-lang/php:8.1[fpm] dev-lang/php:8.1[apache2] dev-lang/php:8.1[cgi] )
+SLOT=8.1
+_md5_=91d10f2e0d11b0c24d2edf9ce8eda4b6
diff --git a/metadata/md5-cache/virtual/ttf-fonts-1-r1 b/metadata/md5-cache/virtual/ttf-fonts-1-r1
index e254af795ce4..9906210f46b2 100644
--- a/metadata/md5-cache/virtual/ttf-fonts-1-r1
+++ b/metadata/md5-cache/virtual/ttf-fonts-1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Serif/Sans/Monospace font packages
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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
 RDEPEND=|| ( media-fonts/liberation-fonts media-fonts/source-pro media-fonts/dejavu media-fonts/croscorefonts media-fonts/droid media-fonts/freefont media-fonts/corefonts )
 SLOT=0
-_md5_=bbfe6f1c7d4cfe6d6abbddec3df75132
+_md5_=b9efdf25e314fc2bc606ca8914f4ccb8
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4d2fdbda72ec..c540ff474bd7 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc2 b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc2
new file mode 100644
index 000000000000..7744ed941083
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc2
@@ -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 install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=7
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.0-rc2.tar.gz -> mod_h2-2.0.0-rc2.tar.gz
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	c7052b276346587968d52ea8eaf5aca1	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b0bfa705066fbbaf36d40fbe980a1c1c
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc3 b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc3
new file mode 100644
index 000000000000..5c652b00c8b2
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc3
@@ -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 install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=7
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.0-rc3.tar.gz -> mod_h2-2.0.0-rc3.tar.gz
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	c7052b276346587968d52ea8eaf5aca1	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b0bfa705066fbbaf36d40fbe980a1c1c
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc4 b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc4
new file mode 100644
index 000000000000..036bd7b3609b
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.0_rc4
@@ -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 install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=7
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.0-rc4.tar.gz -> mod_h2-2.0.0-rc4.tar.gz
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	c7052b276346587968d52ea8eaf5aca1	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b0bfa705066fbbaf36d40fbe980a1c1c
diff --git a/metadata/md5-cache/www-apache/mod_h2-9999 b/metadata/md5-cache/www-apache/mod_h2-9999
index 92a8d456f1d1..413922ffa978 100644
--- a/metadata/md5-cache/www-apache/mod_h2-9999
+++ b/metadata/md5-cache/www-apache/mod_h2-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	c7052b276346587968d52ea8eaf5aca1	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fc3ed029e4cb47a852cbc4696dafbd48
+_md5_=b0bfa705066fbbaf36d40fbe980a1c1c
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 75bd5a28b051..087e53bb27ea 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.11.2 b/metadata/md5-cache/www-apps/airdcpp-webui-2.11.2
new file mode 100644
index 000000000000..983b67b9d084
--- /dev/null
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-2.11.2
@@ -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.2.tgz
+_md5_=95c84b2bb5eb10e3f161a3429f1f1313
diff --git a/metadata/md5-cache/www-apps/blohg-0.13-r4 b/metadata/md5-cache/www-apps/blohg-0.13-r4
index a10c4b6fa092..fd5aedecf1f6 100644
--- a/metadata/md5-cache/www-apps/blohg-0.13-r4
+++ b/metadata/md5-cache/www-apps/blohg-0.13-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg/blohg-0.13.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/blohg-patches-0.13-r4.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d168f09f3b6b17d11efd71ce2f1597eb
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
index 01387ef9c0cc..b945ebb2ee91 100644
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ b/metadata/md5-cache/www-apps/blohg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/docutils[pytho
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d168f09f3b6b17d11efd71ce2f1597eb
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.41 b/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.41
deleted file mode 100644
index a53b14718e68..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.41
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/94.0.4606.41/chromedriver_linux64.zip -> chromedriver-bin-94.0.4606.41.linux64.zip )
-_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61 b/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61
new file mode 100644
index 000000000000..8068e6b3e507
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=7
+HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
+KEYWORDS=~amd64
+LICENSE=google-chrome
+RDEPEND=!www-client/chromium www-client/google-chrome
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/94.0.4606.61/chromedriver_linux64.zip -> chromedriver-bin-94.0.4606.61.linux64.zip )
+_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/element-1.9.0 b/metadata/md5-cache/www-apps/element-1.9.0
new file mode 100644
index 000000000000..457d9f74736c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.9.0
@@ -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.9.0
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.0/element-v1.9.0.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/klaus-1.5.2 b/metadata/md5-cache/www-apps/klaus-1.5.2
index 1cbf0c8be24b..cda4adc67c34 100644
--- a/metadata/md5-cache/www-apps/klaus-1.5.2
+++ b/metadata/md5-cache/www-apps/klaus-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_8(-)?,python_targets_
 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=294b9bf46ce5af391095215205036374
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.36.2 b/metadata/md5-cache/www-apps/mediawiki-1.36.2
new file mode 100644
index 000000000000..fdfee2e7a758
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.36.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.36.2
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.36/mediawiki-1.36.2.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=ee94f82eb70b2113a9c545cc067160c4
diff --git a/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.4 b/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.4
new file mode 100644
index 000000000000..499b0834d192
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.4
@@ -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.4.tar.gz -> nextcloud-notify_push-0.2.4.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/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.3.2/download -> bitflags-1.3.2.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/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.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.70/download -> cc-1.0.70.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.1/download -> combine-4.6.1.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc/2.0.0/download -> crc-2.0.0.crate https://crates.io/api/v1/crates/crc-catalog/1.1.1/download -> crc-catalog-1.1.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.19.3/download -> flexi_logger-0.19.3.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/futures/0.3.17/download -> futures-0.3.17.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-executor/0.3.17/download -> futures-executor-0.3.17.crate https://crates.io/api/v1/crates/futures-intrusive/0.4.0/download -> futures-intrusive-0.4.0.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.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.4/download -> h2-0.3.4.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.3.1/download -> http-auth-basic-0.3.1.crate https://crates.io/api/v1/crates/http-body/0.4.3/download -> http-body-0.4.3.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.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.12/download -> hyper-0.14.12.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/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/js-sys/0.3.54/download -> js-sys-0.3.54.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.101/download -> libc-0.2.101.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.5/download -> lock_api-0.4.5.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/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.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.1/download -> memchr-2.4.1.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/minimal-lexical/0.1.3/download -> minimal-lexical-0.1.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/multipart/0.17.1/download -> multipart-0.17.1.crate https://crates.io/api/v1/crates/nextcloud-config-parser/0.4.2/download -> nextcloud-config-parser-0.4.2.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/7.0.0/download -> nom-7.0.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-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-bigint/0.4.2/download -> num-bigint-0.4.2.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.2/download -> object-0.26.2.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/owo-colors/1.3.0/download -> owo-colors-1.3.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.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.3.0/download -> php-literal-parser-0.3.0.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.29/download -> proc-macro2-1.0.29.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.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.2/download -> redis-0.21.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.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.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.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/safemem/0.3.3/download -> safemem-0.3.3.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/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.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.67/download -> serde_json-1.0.67.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.8/download -> sha-1-0.9.8.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.8/download -> sha2-0.9.8.crate https://crates.io/api/v1/crates/sharded-slab/0.1.3/download -> sharded-slab-0.1.3.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.4/download -> slab-0.4.4.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.8/download -> sqlformat-0.1.8.crate https://crates.io/api/v1/crates/sqlx/0.5.7/download -> sqlx-0.5.7.crate https://crates.io/api/v1/crates/sqlx-core/0.5.7/download -> sqlx-core-0.5.7.crate https://crates.io/api/v1/crates/sqlx-macros/0.5.7/download -> sqlx-macros-0.5.7.crate https://crates.io/api/v1/crates/sqlx-rt/0.5.7/download -> sqlx-rt-0.5.7.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.23/download -> structopt-0.3.23.crate https://crates.io/api/v1/crates/structopt-derive/0.4.16/download -> structopt-derive-0.4.16.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.76/download -> syn-1.0.76.crate https://crates.io/api/v1/crates/synstructure/0.12.5/download -> synstructure-0.12.5.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.29/download -> thiserror-1.0.29.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.29/download -> thiserror-impl-1.0.29.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.4.0/download -> tinyvec-1.4.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.11.0/download -> tokio-1.11.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.8/download -> tokio-util-0.6.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.27/download -> tracing-0.1.27.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.16/download -> tracing-attributes-0.1.16.crate https://crates.io/api/v1/crates/tracing-core/0.1.20/download -> tracing-core-0.1.20.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.22/download -> tracing-subscriber-0.2.22.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/tungstenite/0.15.0/download -> tungstenite-0.15.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.14.0/download -> typenum-1.14.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.6/download -> unicode-bidi-0.3.6.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.2.0/download -> ureq-2.2.0.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.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.77/download -> wasm-bindgen-0.2.77.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.77/download -> wasm-bindgen-backend-0.2.77.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.27/download -> wasm-bindgen-futures-0.4.27.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.77/download -> wasm-bindgen-macro-0.2.77.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.77/download -> wasm-bindgen-macro-support-0.2.77.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.77/download -> wasm-bindgen-shared-0.2.77.crate https://crates.io/api/v1/crates/web-sys/0.3.54/download -> web-sys-0.3.54.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.3/download -> whoami-1.1.3.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/xpath_reader/0.5.3/download -> xpath_reader-0.5.3.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	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2f945c60e101c1e4bde5378d30edc65d
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.3 b/metadata/md5-cache/www-apps/nikola-8.1.3
index 845472d59777..3ca369522586 100644
--- a/metadata/md5-cache/www-apps/nikola-8.1.3
+++ b/metadata/md5-cache/www-apps/nikola-8.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( watchdog ) || ( python_targets_python3_8 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30697717a0ab2d731b641cfb35403dd3
diff --git a/metadata/md5-cache/www-apps/novnc-1.2.0 b/metadata/md5-cache/www-apps/novnc-1.2.0
index 9bdbf7e195fa..ba4572f5fabf 100644
--- a/metadata/md5-cache/www-apps/novnc-1.2.0
+++ b/metadata/md5-cache/www-apps/novnc-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/noVNC/archive/v1.2.0.tar.gz -> novnc-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=568dc8c9fa02ca1379670e1eb8ff1291
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 40c19fc2132d..16b1013f4251 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/websockify[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 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc10c5d931736e752981bddc12ad8f70
diff --git a/metadata/md5-cache/www-apps/prewikka-5.2.0 b/metadata/md5-cache/www-apps/prewikka-5.2.0
index ec2b8794cdc7..812f0d1d1b26 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.2.0
+++ b/metadata/md5-cache/www-apps/prewikka-5.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/lesscpy[python_targets_python3_8(-)?] sys-devel/gettext python_targets_python3_8? ( dev-lang/python:3.8[ssl] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=dev-python/lesscpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext 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 postinst prepare test
-DEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?] dev-python/Babel[python_targets_python3_8(-)?] dev-python/croniter[python_targets_python3_8(-)?] dev-python/gevent[python_targets_python3_8(-)?] dev-python/lark-parser[python_targets_python3_8(-)?] dev-python/mako[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/voluptuous[python_targets_python3_8(-)?] dev-python/werkzeug[python_targets_python3_8(-)?] media-fonts/font-xfree86-type1
+DEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/croniter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lark-parser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[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/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/voluptuous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/font-xfree86-type1
 DESCRIPTION=Graphical front-end analysis console for the Prelude Framework
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?] dev-python/Babel[python_targets_python3_8(-)?] dev-python/croniter[python_targets_python3_8(-)?] dev-python/gevent[python_targets_python3_8(-)?] dev-python/lark-parser[python_targets_python3_8(-)?] dev-python/mako[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/voluptuous[python_targets_python3_8(-)?] dev-python/werkzeug[python_targets_python3_8(-)?] media-fonts/font-xfree86-type1 python_targets_python3_8? ( dev-lang/python:3.8[ssl] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/croniter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lark-parser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[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/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/voluptuous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/font-xfree86-type1 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 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prewikka-5.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=339a735a0f4d126757ae42a536a7b268
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=692fdd402060b738f51c7d650fdd7e6d
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.12 b/metadata/md5-cache/www-apps/radicale-2.1.12
index 10e0c54d2037..a3190d6c296e 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.12
+++ b/metadata/md5-cache/www-apps/radicale-2.1.12
@@ -10,5 +10,5 @@ RDEPEND=acct-user/radicale acct-group/radicale >=dev-python/vobject-0.9.6[python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Radicale/archive/refs/tags/2.1.12.tar.gz -> radicale-2.1.12.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=871b4ef6253041d3c1d8e18eb1ddc22a
diff --git a/metadata/md5-cache/www-apps/radicale-3.0.6-r3 b/metadata/md5-cache/www-apps/radicale-3.0.6-r3
index 654986e36130..b2c97501985d 100644
--- a/metadata/md5-cache/www-apps/radicale-3.0.6-r3
+++ b/metadata/md5-cache/www-apps/radicale-3.0.6-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Radicale/archive/refs/tags/3.0.6.tar.gz -> radicale-3.0.6.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ff333630a2659052ad473906c48a9ed
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.2 b/metadata/md5-cache/www-apps/redmine-4.1.2
deleted file mode 100644
index d6eb57194b61..000000000000
--- a/metadata/md5-cache/www-apps/redmine-4.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) imagemagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6.0:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.0[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] dev-ruby/request_store:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.12.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=7
-HOMEPAGE=https://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown mysql passenger postgres sqlite ruby_targets_ruby26
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://www.redmine.org/releases/redmine-4.1.2.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0bfe7aee75fff2593268868dfa9c1b6a
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.4 b/metadata/md5-cache/www-apps/redmine-4.1.4
new file mode 100644
index 000000000000..88c64e20af50
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-4.1.4
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) imagemagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6.0:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] dev-ruby/request_store:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.12.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=7
+HOMEPAGE=https://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown mysql passenger postgres sqlite ruby_targets_ruby26
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-4.1.4.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae135468e865595c97590eaabdc31b63
diff --git a/metadata/md5-cache/www-apps/redmine-4.2.2 b/metadata/md5-cache/www-apps/redmine-4.2.2
new file mode 100644
index 000000000000..673b3a11268b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-4.2.2
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) minimagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/addressable[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8.2:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] >=dev-ruby/request_store-1.5.0:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.2.0[ruby_targets_ruby26(-)] dev-ruby/rotp[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.26.0[ruby_targets_ruby26(-)] dev-ruby/rqrcode[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.3.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=7
+HOMEPAGE=https://www.redmine.org/
+IUSE=fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite ruby_targets_ruby26
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagick ) pdf? ( app-text/ghostscript-gpl media-gfx/imagemagick ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-4.2.2.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ffe84e28e18efcecf3e4234f0080438
diff --git a/metadata/md5-cache/www-apps/roundup-2.0.0 b/metadata/md5-cache/www-apps/roundup-2.0.0
index 5e7820dcdc79..f9bb02cf94e2 100644
--- a/metadata/md5-cache/www-apps/roundup-2.0.0
+++ b/metadata/md5-cache/www-apps/roundup-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-2.0.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ff02f1d23f3ee2f17815143ff47962a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 99b5cf9c527b..a019277a2a8a 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-95.0.4638.17 b/metadata/md5-cache/www-client/chromium-95.0.4638.17
deleted file mode 100644
index 8b7bf66beea3..000000000000
--- a/metadata/md5-cache/www-client/chromium-95.0.4638.17
+++ /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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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 debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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-95.0.4638.17.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-95-patchset-4/chromium-95-patchset-4.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2402abc700a5df8eb99f0204148f414
diff --git a/metadata/md5-cache/www-client/chromium-95.0.4638.32 b/metadata/md5-cache/www-client/chromium-95.0.4638.32
new file mode 100644
index 000000000000..838c0a7771e2
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-95.0.4638.32
@@ -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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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 debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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-95.0.4638.32.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-95-patchset-4/chromium-95-patchset-4.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37d098ff1761e704c9ad50310eface52
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4651.0 b/metadata/md5-cache/www-client/chromium-96.0.4651.0
deleted file mode 100644
index b019916fc3d5..000000000000
--- a/metadata/md5-cache/www-client/chromium-96.0.4651.0
+++ /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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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 debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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-96.0.4651.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-1/chromium-96-patchset-1.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9228892a047e983c991e271374018a97
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4655.0 b/metadata/md5-cache/www-client/chromium-96.0.4655.0
new file mode 100644
index 000000000000..8426d3c45b5c
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-96.0.4655.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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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 debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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-96.0.4655.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-2/chromium-96-patchset-2.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a89abffdeb164192d597500a4f4ae6f8
diff --git a/metadata/md5-cache/www-client/epiphany-40.3 b/metadata/md5-cache/www-client/epiphany-40.3
index eef32fc6ac08..e18a81738407 100644
--- a/metadata/md5-cache/www-client/epiphany-40.3
+++ b/metadata/md5-cache/www-client/epiphany-40.3
@@ -5,11 +5,11 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.64.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.31.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.1.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/40/epiphany-40.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b0d0523626b222a20462f72560ab9951
+_md5_=e9d52af57270896bbfebc3f26ad74cf0
diff --git a/metadata/md5-cache/www-client/google-chrome-94.0.4606.61 b/metadata/md5-cache/www-client/google-chrome-94.0.4606.61
deleted file mode 100644
index a177c86afd76..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-94.0.4606.61
+++ /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_94.0.4606.61-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=60fa115ad24dc9c82b71c1548b0aa9dd
diff --git a/metadata/md5-cache/www-client/google-chrome-94.0.4606.71 b/metadata/md5-cache/www-client/google-chrome-94.0.4606.71
new file mode 100644
index 000000000000..6a28af6df49a
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-94.0.4606.71
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+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_94.0.4606.71-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=25a765c9195f622e934537d38506b698
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.17 b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.17
deleted file mode 100644
index 86f0a4ca8a33..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.17
+++ /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_95.0.4638.17-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.32 b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.32
new file mode 100644
index 000000000000..6f6c0d7ee054
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.32
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+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_95.0.4638.32-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4651.0 b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4651.0
deleted file mode 100644
index a8df9a0bc938..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4651.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4651.0-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0 b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0
new file mode 100644
index 000000000000..9b80795238cf
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+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_96.0.4655.0-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.23 b/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.23
deleted file mode 100644
index fff3b7a88431..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.23
+++ /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_94.0.992.23-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb79728769d82d0c18e5a479daecae2d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9 b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9
new file mode 100644
index 000000000000..52809c0a5ec7
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Microsoft
+EAPI=8
+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_95.0.1020.9-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1011.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1011.1
deleted file mode 100644
index b12d25ae5433..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1011.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_95.0.1011.1-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb79728769d82d0c18e5a479daecae2d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0
new file mode 100644
index 000000000000..d3c89c9ac014
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Microsoft
+EAPI=8
+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_96.0.1028.0-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/midori-9.0 b/metadata/md5-cache/www-client/midori-9.0
index 174497f55395..0c34d01a66ca 100644
--- a/metadata/md5-cache/www-client/midori-9.0
+++ b/metadata/md5-cache/www-client/midori-9.0
@@ -4,10 +4,10 @@ DEPEND=app-arch/libarchive:= >=app-crypt/gcr-3:=[gtk,vala] >=dev-db/sqlite-3.6.1
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=7
 HOMEPAGE=https://www.midori-browser.org/
-KEYWORDS=amd64 ~arm ~mips x86
+KEYWORDS=amd64 ~arm ~mips ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/libarchive:= >=app-crypt/gcr-3:=[gtk,vala] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.46.2:2 >=dev-libs/json-glib-0.12 dev-libs/libpeas[gtk] dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4[vala] >=net-libs/webkit-gtk-2.16.6:4[introspection] >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.12.0:3
 SLOT=0
 SRC_URI=https://github.com/midori-browser/core/releases/download/v9.0/midori-v9.0.tar.gz
 _eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=734abb563eec42567b19f1bacb575c4a
+_md5_=ab002ab4f9e7cad2d73d3d024e7bbcf7
diff --git a/metadata/md5-cache/www-client/opera-79.0.4143.50 b/metadata/md5-cache/www-client/opera-79.0.4143.50
deleted file mode 100644
index 1c9cf47f01e4..000000000000
--- a/metadata/md5-cache/www-client/opera-79.0.4143.50
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=8
-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/desktop/79.0.4143.50/linux/opera-stable_79.0.4143.50_amd64.deb https://download2.operacdn.com/pub/opera/desktop/79.0.4143.50/linux/opera-stable_79.0.4143.50_amd64.deb https://download3.operacdn.com/pub/opera/desktop/79.0.4143.50/linux/opera-stable_79.0.4143.50_amd64.deb https://download4.operacdn.com/pub/opera/desktop/79.0.4143.50/linux/opera-stable_79.0.4143.50_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4573.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e349bb1d92a298908d2fff55278c15b
diff --git a/metadata/md5-cache/www-client/opera-79.0.4143.72 b/metadata/md5-cache/www-client/opera-79.0.4143.72
new file mode 100644
index 000000000000..e29c892334fe
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-79.0.4143.72
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=8
+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/desktop/79.0.4143.72/linux/opera-stable_79.0.4143.72_amd64.deb https://download2.operacdn.com/pub/opera/desktop/79.0.4143.72/linux/opera-stable_79.0.4143.72_amd64.deb https://download3.operacdn.com/pub/opera/desktop/79.0.4143.72/linux/opera-stable_79.0.4143.72_amd64.deb https://download4.operacdn.com/pub/opera/desktop/79.0.4143.72/linux/opera-stable_79.0.4143.72_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4573.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c6f836bf78eeff11f75e221b043018ee
diff --git a/metadata/md5-cache/www-client/opera-beta-79.0.4143.19 b/metadata/md5-cache/www-client/opera-beta-79.0.4143.19
deleted file mode 100644
index 726bf64c3f23..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-79.0.4143.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=8
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/79.0.4143.19/linux/opera-beta_79.0.4143.19_amd64.deb https://download2.operacdn.com/pub/opera-beta/79.0.4143.19/linux/opera-beta_79.0.4143.19_amd64.deb https://download3.operacdn.com/pub/opera-beta/79.0.4143.19/linux/opera-beta_79.0.4143.19_amd64.deb https://download4.operacdn.com/pub/opera-beta/79.0.4143.19/linux/opera-beta_79.0.4143.19_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4573.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3223842b936276a6b773bcb2a1ce328f
diff --git a/metadata/md5-cache/www-client/opera-beta-80.0.4170.11 b/metadata/md5-cache/www-client/opera-beta-80.0.4170.11
new file mode 100644
index 000000000000..632645cd79fc
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-80.0.4170.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=8
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download2.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download3.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download4.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5d750a60b9bfc8d0a461f59527d475a5
diff --git a/metadata/md5-cache/www-client/opera-developer-80.0.4162.0 b/metadata/md5-cache/www-client/opera-developer-80.0.4162.0
deleted file mode 100644
index fda2cb5a46e9..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-80.0.4162.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=8
-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/80.0.4162.0/linux/opera-developer_80.0.4162.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/80.0.4162.0/linux/opera-developer_80.0.4162.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/80.0.4162.0/linux/opera-developer_80.0.4162.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/80.0.4162.0/linux/opera-developer_80.0.4162.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=195e6b19ce76288f0400cd36dc3024b4
diff --git a/metadata/md5-cache/www-client/opera-developer-81.0.4189.0 b/metadata/md5-cache/www-client/opera-developer-81.0.4189.0
new file mode 100644
index 000000000000..b31022fdfe2a
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-81.0.4189.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=8
+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/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download2.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download3.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download4.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d43d5ef3edf3bedce3502fd1ab581c2d
diff --git a/metadata/md5-cache/www-client/pybugz-0.13-r1 b/metadata/md5-cache/www-client/pybugz-0.13-r1
index b0911da17277..309d4cd90129 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13-r1
+++ b/metadata/md5-cache/www-client/pybugz-0.13-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=7
 HOMEPAGE=https://github.com/williamh/pybugz
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~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 ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c01a4c162a336841215c2e3a83e26549
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca5640be10f93b397f2b17f182d9880b
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index 914dcf077315..d06004556f6f 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13516933e729312922274ad2b76fb2e4
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 c66be4000639..db4583cc0e02 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	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 bc2793a4bc21..be67b7100033 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8cfbb6090e2eb071494a821d65aace10
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.1 b/metadata/md5-cache/www-client/qutebrowser-2.3.1
index 35e88cc0f76d..7b8a81d46930 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.3.1
+++ b/metadata/md5-cache/www-client/qutebrowser-2.3.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.3.1/qutebrowser-2.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=87316684e9a89be031006c3d19580b47
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index bb54595c9330..2bda4e817852 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	39fb83ed394c172aad380c33a8de287e	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cffa093d8867746d8c2fdf5732c07ef9
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 a2df3124ba94..64a98fb1f40c 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 https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.8.1-rust-1.45.0.patch.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	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	62dd698907b9eac7f1aa6cb5a58df594	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	6f8bc7aa203a04ca8cbd8780f46e95e3	mozextension	19ea1d82c0666e682443d6e868c5e269	mozlinguas-v2	bff64f9ab01c885ed5c37262765fca5d	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e0b1ed815c6e96751f723df16255c1cd
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.9 b/metadata/md5-cache/www-client/seamonkey-2.53.9
index b162cf140fe0..a281928613b7 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.9
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.9
@@ -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.9/source/seamonkey-2.53.9.source.tar.xz -> seamonkey-2.53.9.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.9/source/seamonkey-2.53.9.source-l10n.tar.xz -> seamonkey-2.53.9.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.9_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	c7052b276346587968d52ea8eaf5aca1	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	62dd698907b9eac7f1aa6cb5a58df594	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	6f8bc7aa203a04ca8cbd8780f46e95e3	mozextension	19ea1d82c0666e682443d6e868c5e269	mozlinguas-v2	bff64f9ab01c885ed5c37262765fca5d	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0a6802c06cfd6e31c03850715edd9d5c
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.9.1 b/metadata/md5-cache/www-client/seamonkey-2.53.9.1
new file mode 100644
index 000000000000..b7c57370cf8d
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.9.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip app-arch/zip >=dev-lang/nasm-2.13 dev-lang/perl sys-apps/findutils >=sys-devel/binutils-2.16.1 virtual/pkgconfig >=virtual/rust-1.34.0 amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) x86? ( >=dev-lang/yasm-1.1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=8
+HOMEPAGE=https://www.seamonkey-project.org/
+IUSE=+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack lto pulseaudio +roaming selinux startup-notification test wifi +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-sqlite custom-cflags custom-optimization l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.9.1/source/seamonkey-2.53.9.1.source.tar.xz -> seamonkey-2.53.9.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.9.1/source/seamonkey-2.53.9.1.source-l10n.tar.xz -> seamonkey-2.53.9.1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.9_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	c7052b276346587968d52ea8eaf5aca1	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	6f8bc7aa203a04ca8cbd8780f46e95e3	mozextension	19ea1d82c0666e682443d6e868c5e269	mozlinguas-v2	bff64f9ab01c885ed5c37262765fca5d	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=350c829d50815f2900aa951fa5e23b81
diff --git a/metadata/md5-cache/www-client/surf-2.0-r1 b/metadata/md5-cache/www-client/surf-2.0-r1
index 0a38efa79a9f..b4ca8c6f3104 100644
--- a/metadata/md5-cache/www-client/surf-2.0-r1
+++ b/metadata/md5-cache/www-client/surf-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!sci-chemistry/surf dev-libs/glib:2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st )
 SLOT=0
 SRC_URI=https://dl.suckless.org/surf/surf-2.0.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b72569da41887f3f9a9676306aa42ce1
diff --git a/metadata/md5-cache/www-client/surf-2.1 b/metadata/md5-cache/www-client/surf-2.1
index b7b230b7777c..0a6df1a57977 100644
--- a/metadata/md5-cache/www-client/surf-2.1
+++ b/metadata/md5-cache/www-client/surf-2.1
@@ -5,10 +5,10 @@ DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
 IUSE=tabbed savedconfig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
 SRC_URI=https://dl.suckless.org/surf/surf-2.1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2846483837638b6e30cd12d1acc7cec5
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef647d762a1ff8df860c549e2bbe3f8f
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index fc55f31007d2..6aacd07fc9ec 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=14460765860fe0e1a08b0c0a714a2815
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ae4f0b47b5a636a97556b5997673cde5
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 7d87f3d01875..6bcb97d095b4 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/buku-4.5 b/metadata/md5-cache/www-misc/buku-4.5
index be20111f3e15..ed49b948c351 100644
--- a/metadata/md5-cache/www-misc/buku-4.5
+++ b/metadata/md5-cache/www-misc/buku-4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jarun/buku/archive/v4.5.tar.gz -> buku-4.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc805633eef2f90facc36496ac2ed66f
diff --git a/metadata/md5-cache/www-misc/buku-4.6-r1 b/metadata/md5-cache/www-misc/buku-4.6-r1
index e8d3b4045f21..fb96ea76fa01 100644
--- a/metadata/md5-cache/www-misc/buku-4.6-r1
+++ b/metadata/md5-cache/www-misc/buku-4.6-r1
@@ -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/jarun/buku/archive/v4.6.tar.gz -> buku-4.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e730d72615769176a2e3e4be630b8b67
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.22 b/metadata/md5-cache/www-misc/urlwatch-2.22
index dd48ae5abc3f..c904eae66a18 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.22
+++ b/metadata/md5-cache/www-misc/urlwatch-2.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.22.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e0e7d03c0808870fe938ef2c8586191
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.23 b/metadata/md5-cache/www-misc/urlwatch-2.23
index 511cadd8c9a6..d44f3e2afcc0 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.23
+++ b/metadata/md5-cache/www-misc/urlwatch-2.23
@@ -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/u/urlwatch/urlwatch-2.23.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a7b68b6a225a2cbcf3676a271895336
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 46355f50d8a7..b98f6153aec6 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-94.0.4606.61 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.61
deleted file mode 100644
index 63d82c6b9cc0..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.61
+++ /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_94.0.4606.61-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.71 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.71
new file mode 100644
index 000000000000..f6f7053b4533
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.71
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+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_94.0.4606.71-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=46c5306777c1d85adde0e74978989a7d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.17_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.17_beta
deleted file mode 100644
index f752cbf55ad5..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.17_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_95.0.4638.17-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.32_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.32_beta
new file mode 100644
index 000000000000..f132cdda9f5a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.32_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+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_95.0.4638.32-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4651.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4651.0_alpha
deleted file mode 100644
index 4be88b40438d..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4651.0_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4651.0-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha
new file mode 100644
index 000000000000..2d1d6d2d5a68
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+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_96.0.4655.0-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 888a83cc3d72..62a9175f48bc 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 512aafe84371..a2ea34cf8b55 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8be2bf0ae866e542e295316a253bd8ea
diff --git a/metadata/md5-cache/www-servers/servefile-0.5.1-r1 b/metadata/md5-cache/www-servers/servefile-0.5.1-r1
index f56814b29960..f767ffb5ca62 100644
--- a/metadata/md5-cache/www-servers/servefile-0.5.1-r1
+++ b/metadata/md5-cache/www-servers/servefile-0.5.1-r1
@@ -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/sebageek/servefile/archive/v0.5.1.tar.gz -> servefile-0.5.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c148cde0cc9ca408238a0fd815e93b97
diff --git a/metadata/md5-cache/www-servers/servefile-0.5.2 b/metadata/md5-cache/www-servers/servefile-0.5.2
index 495d64728a58..44ccbc3d72f6 100644
--- a/metadata/md5-cache/www-servers/servefile-0.5.2
+++ b/metadata/md5-cache/www-servers/servefile-0.5.2
@@ -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/sebageek/servefile/archive/v0.5.2.tar.gz -> servefile-0.5.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a01864935813ee52edd0f625f2a19f4
diff --git a/metadata/md5-cache/www-servers/tornado-6.1 b/metadata/md5-cache/www-servers/tornado-6.1
index d5b14d5f68be..2d5ba3fa4323 100644
--- a/metadata/md5-cache/www-servers/tornado-6.1
+++ b/metadata/md5-cache/www-servers/tornado-6.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/t/tornado/tornado-6.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2756d3548c4bb8fafd1ef8a02e7ae352
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r104 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r104
deleted file mode 100644
index a08823381e08..000000000000
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r104
+++ /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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DESCRIPTION=uWSGI server for Python web applications
-EAPI=7
-HOMEPAGE=https://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 ruby_targets_ruby26
-KEYWORDS=amd64 arm x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 ) ) python-asyncio? ( || ( python_targets_python3_8 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
-SLOT=0
-SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf37eaa16586f9f450f4b8261dba2db3
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r105 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r105
deleted file mode 100644
index 3737105c6b55..000000000000
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r105
+++ /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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DESCRIPTION=uWSGI server for Python web applications
-EAPI=7
-HOMEPAGE=https://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-asyncio? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
-SLOT=0
-SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2acf3040a680ccbb3ef4526740bc990f
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r106 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r106
new file mode 100644
index 000000000000..3ecc3fb77467
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r106
@@ -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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=7
+HOMEPAGE=https://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 ruby_targets_ruby26
+KEYWORDS=amd64 arm x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 ) ) python-asyncio? ( || ( python_targets_python3_8 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
+SLOT=0
+SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3cdc7ffbb2dcbc53bf0ff956d5b72095
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r107 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r107
new file mode 100644
index 000000000000..92ab34cea298
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r107
@@ -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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=7
+HOMEPAGE=https://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-asyncio? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
+SLOT=0
+SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c9fd272f7c17e70173ceeb467be70289
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 2d248c3bf8db..f47043394891 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/xcalc-1.1.0 b/metadata/md5-cache/x11-apps/xcalc-1.1.0
index b73c49ed37d9..0810b0add4cc 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.1.0
+++ b/metadata/md5-cache/x11-apps/xcalc-1.1.0
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=scientific calculator for X
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcalc
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcalc-1.1.0.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
-_md5_=3fb0fc13d5237691a8b4ca480d7993a8
+_md5_=3d085b1f0a8f7c31e004e9110a625419
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.4 b/metadata/md5-cache/x11-apps/xev-1.2.4
index 8bd1f9a543dd..1ac31592abed 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.4
+++ b/metadata/md5-cache/x11-apps/xev-1.2.4
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto
 DESCRIPTION=Print contents of X events
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xev
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.4.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
-_md5_=eb96ef9e02d9c8717a8a9219dcaecc2c
+_md5_=e6508ab3a0c646539df6dc4d9c74ff77
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.6 b/metadata/md5-cache/x11-apps/xfontsel-1.0.6
index 9d417a8e8d6c..420d2d7d4ada 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.6
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.6
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 DESCRIPTION=point and click selection of X11 font names
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.6.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
-_md5_=503a4298fe64a4db090f744343eed7a1
+_md5_=b4f3f67d9233185d6ab65f97cd0f6d15
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.3 b/metadata/md5-cache/x11-apps/xload-1.1.3
index 6c31140d59f7..e7f9624baf73 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.3
+++ b/metadata/md5-cache/x11-apps/xload-1.1.3
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 DESCRIPTION=system load average display for X
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xload
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.3.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
-_md5_=d121c5ff8deb70c0e6a71850f1fedc10
+_md5_=9d3303417c611eae2499a968c907284c
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.5 b/metadata/md5-cache/x11-apps/xman-1.1.5
index 806b4f661682..c26453bcc518 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.5
+++ b/metadata/md5-cache/x11-apps/xman-1.1.5
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
 DESCRIPTION=Manual page display program for the X Window System
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xman
-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=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.5.tar.bz2
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
-_md5_=3e270ec9c53c87b7141981820d6a7d0d
+_md5_=3f13591489112d0f5e2ce6ad57989e56
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 8b34ea21e446..a5810f76dac7 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/libfm-qt-0.16.0 b/metadata/md5-cache/x11-libs/libfm-qt-0.16.0
deleted file mode 100644
index 5d969fe9f9ad..000000000000
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif x11-libs/libxcb
-DESCRIPTION=Qt Library for Building File Managers
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif x11-libs/libxcb !lxqt-base/lxqt-l10n
-SLOT=0/7
-SRC_URI=https://github.com/lxqt/libfm-qt/releases/download/0.16.0/libfm-qt-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7aebce1bdfff33f47fd938165507e12d
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.16.1 b/metadata/md5-cache/x11-libs/qtermwidget-0.16.1
deleted file mode 100644
index 11e6fab59d9a..000000000000
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-DESCRIPTION=Qt terminal emulator widget
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD GPL-2 LGPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0/0.16.1
-SRC_URI=https://github.com/lxqt/qtermwidget/releases/download/0.16.1/qtermwidget-0.16.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=702370c44aa281ca56206a85a002316f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 3168ee7e220d..4bf694fd43ba 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/arandr-0.1.10-r1 b/metadata/md5-cache/x11-misc/arandr-0.1.10-r1
index 50435ec607fd..b764cd1d2938 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.10-r1
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3=[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.10.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=35f7332130bbc5f1c891a6aecd86ce41
diff --git a/metadata/md5-cache/x11-misc/autorandr-1.11 b/metadata/md5-cache/x11-misc/autorandr-1.11
index ff2930151f29..79298cf9216b 100644
--- a/metadata/md5-cache/x11-misc/autorandr-1.11
+++ b/metadata/md5-cache/x11-misc/autorandr-1.11
@@ -11,5 +11,5 @@ RDEPEND=launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/autorandr/archive/1.11.tar.gz -> autorandr-1.11.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8be217f62ceafee110b507cbb73f0a11
diff --git a/metadata/md5-cache/x11-misc/autorandr-9999 b/metadata/md5-cache/x11-misc/autorandr-9999
index ee963439ab21..d808cf36f58d 100644
--- a/metadata/md5-cache/x11-misc/autorandr-9999
+++ b/metadata/md5-cache/x11-misc/autorandr-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8be217f62ceafee110b507cbb73f0a11
diff --git a/metadata/md5-cache/x11-misc/dmenu-5.0 b/metadata/md5-cache/x11-misc/dmenu-5.0
index 6275decaedac..9cf6dc94cb6f 100644
--- a/metadata/md5-cache/x11-misc/dmenu-5.0
+++ b/metadata/md5-cache/x11-misc/dmenu-5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/dmenu-5.0.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26713308e8480f43d11f30c2d3907566
diff --git a/metadata/md5-cache/x11-misc/dmenu-9999 b/metadata/md5-cache/x11-misc/dmenu-9999
index d6a7f2f11314..2fa84a88faea 100644
--- a/metadata/md5-cache/x11-misc/dmenu-9999
+++ b/metadata/md5-cache/x11-misc/dmenu-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0e88cac89011c20cacc0ce695d7ce64
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
index c8425c3f9846..fb4343fd3d82 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.3.0.tar.gz -> grub2-theme-preview-2.3.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84e1793f6033ab96331fb50215f0a538
diff --git a/metadata/md5-cache/x11-misc/hsetroot-1.0.5 b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
index aeacce0c5abe..93ab751fb509 100644
--- a/metadata/md5-cache/x11-misc/hsetroot-1.0.5
+++ b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama x1
 DESCRIPTION=Tool which allows you to compose wallpapers ('root pixmaps') for X
 EAPI=7
 HOMEPAGE=https://github.com/himdel/hsetroot/
-KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama
 SLOT=0
 SRC_URI=https://github.com/himdel/hsetroot/archive/1.0.5.tar.gz -> hsetroot-1.0.5.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d61e8dcf2df7d6f85b0e75ac98c91ce
+_md5_=a2e55ad76a2123afa934e52116f6b47c
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.13 b/metadata/md5-cache/x11-misc/i3lock-2.13
index 9c3bee2f1814..8f6447c33116 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.13
+++ b/metadata/md5-cache/x11-misc/i3lock-2.13
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb]
 DESCRIPTION=Simple screen locker
 EAPI=7
 HOMEPAGE=https://i3wm.org/i3lock/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.13.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c4f0ce913a98f3ec9771d2a70d9e75e
+_md5_=2fccf370b5620e8272d80625769d4b4e
diff --git a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1 b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
index 1002b6dba592..a1ebe1253ab2 100644
--- a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
+++ b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
@@ -3,9 +3,9 @@ DEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 DESCRIPTION=Utils to help with the transition to the new freedesktop.org naming scheme
 EAPI=6
 HOMEPAGE=http://tango.freedesktop.org
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/icon-naming-utils-0.8.90.tar.gz
-_md5_=03fe28d230738a0929dd3bc920e79ad0
+_md5_=56efaa16148ef24d3b26020523c5e676
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
index d1146e67e4c0..e8eff2493045 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7be86bc3d3d9a77617b49fe280a24b1f
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.3 b/metadata/md5-cache/x11-misc/mugshot-0.4.3
index 59ee495aa60c..cbe8dd2b1439 100644
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.3
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/bluesabre/mugshot/archive/mugshot-0.4.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4932ed4455270928e6df268903d54c06
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
index 83cdf93b4992..6e224ed82cf7 100644
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b17ef88a244b891828e15874f1569c92
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
deleted file mode 100644
index acf8c7acaf87..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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
-DESCRIPTION=Qt GUI Tabbed Filemanager
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-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	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	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/py3status-3.39 b/metadata/md5-cache/x11-misc/py3status-3.39
index d0fcd20e64aa..33ebf71121e6 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.39
+++ b/metadata/md5-cache/x11-misc/py3status-3.39
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ultrabug/py3status/archive/3.39.tar.gz -> py3status-3.39.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21bb47f8012d86e3c6b2e3af75f8f20e
diff --git a/metadata/md5-cache/x11-misc/qps-2.2.0 b/metadata/md5-cache/x11-misc/qps-2.2.0
deleted file mode 100644
index fe53e13de1f8..000000000000
--- a/metadata/md5-cache/x11-misc/qps-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.16.0
-DESCRIPTION=Qt GUI Process Manager
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.16.0
-SLOT=0
-SRC_URI=https://github.com/lxqt/qps/releases/download/2.2.0/qps-2.2.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9a12454d3bd1050235d5d544d6ab5bdb
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.2-r1 b/metadata/md5-cache/x11-misc/qt5ct-1.2-r1
deleted file mode 100644
index 4aaee27623e4..000000000000
--- a/metadata/md5-cache/x11-misc/qt5ct-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 dev-util/ninja >=dev-util/cmake-3.20.5
-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 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.2.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d182134ebab65c18f9eb63cec4529f1e
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.3 b/metadata/md5-cache/x11-misc/qt5ct-1.3
index f587633bed36..28e854617765 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.3
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.3
@@ -5,10 +5,10 @@ DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
 IUSE=+dbus
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+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	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dab23ceae0b7be0268b6951286311e37
+_md5_=a8875fe747ef1f8486a7c117033cd74e
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2 b/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
index 2625a6911587..22bd2f4d75da 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.9.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0aafaff6eed166962b4c656ceff53a98
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.1 b/metadata/md5-cache/x11-misc/safeeyes-2.1.1
index 165c300263f4..8e5eab0b0967 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.1
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bbd2096e440ea61e2b7a4421b4890d3c
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.2 b/metadata/md5-cache/x11-misc/safeeyes-2.1.2
index ad6e2e071407..1f5393833865 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.2
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.2
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3501a8ca3a93b1525c682b03e8bc7814
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.3 b/metadata/md5-cache/x11-misc/safeeyes-2.1.3
index 92d1a8136e25..fdd5d8bd9bd2 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.3
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.3
@@ -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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3501a8ca3a93b1525c682b03e8bc7814
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1 b/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
index 5ff7c2a77dba..8bd74b646c23 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libappindicator:3[introspection] dev-python/Babel[python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=19a30805e3ae0d19d0648ede9b3cf5cb
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.3 b/metadata/md5-cache/x11-misc/screenkey-1.3
index cd9feb8eeebe..a04b8cb49dbe 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.3
+++ b/metadata/md5-cache/x11-misc/screenkey-1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/v1.3/screenkey-v1.3.tar.gz -> screenkey-1.3.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=295df2fa7eac41537de1009e2a29549a
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.4 b/metadata/md5-cache/x11-misc/screenkey-1.4
index d6d60521dd37..99955002c639 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.4
+++ b/metadata/md5-cache/x11-misc/screenkey-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/v1.4/screenkey-v1.4.tar.gz -> screenkey-1.4.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b911855ebd269f93d748fa82aed3c8bc
diff --git a/metadata/md5-cache/x11-misc/screenkey-9999 b/metadata/md5-cache/x11-misc/screenkey-9999
index 5f1058cfb01f..5a9be56b9e8f 100644
--- a/metadata/md5-cache/x11-misc/screenkey-9999
+++ b/metadata/md5-cache/x11-misc/screenkey-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b911855ebd269f93d748fa82aed3c8bc
diff --git a/metadata/md5-cache/x11-misc/sent-1-r1 b/metadata/md5-cache/x11-misc/sent-1-r1
index 894545c84908..af893d690196 100644
--- a/metadata/md5-cache/x11-misc/sent-1-r1
+++ b/metadata/md5-cache/x11-misc/sent-1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/sent-1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b37b7e4fcd292576275c19f35744a6af
diff --git a/metadata/md5-cache/x11-misc/sent-9999 b/metadata/md5-cache/x11-misc/sent-9999
index 194d3cec64d9..f074e96d4ae7 100644
--- a/metadata/md5-cache/x11-misc/sent-9999
+++ b/metadata/md5-cache/x11-misc/sent-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6080da427b7212cb251f9fb00841ce77
diff --git a/metadata/md5-cache/x11-misc/slock-1.4-r1 b/metadata/md5-cache/x11-misc/slock-1.4-r1
index bbb7a64c3dc8..9803e3a8ac62 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4-r1
+++ b/metadata/md5-cache/x11-misc/slock-1.4-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1b7517b2b9db95388f58f1d3c98243ac
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1 b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
index 7626c92dd805..2ef9ec6901e3 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
+++ b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
@@ -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://dev.gentoo.org/~slashbeast/distfiles/sunflower/sunflower-0.4_p20200716.tar.xz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5eb282a8372dd2a884026f19fc5ad24
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
index 64f2b0c52b4f..0e0e87d9a7d2 100644
--- a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
+++ b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=98a5dcc1a0667d070626539a9ebe2eab
diff --git a/metadata/md5-cache/x11-misc/synergy-1.14.1.32 b/metadata/md5-cache/x11-misc/synergy-1.14.1.32
index d12dfdb28f0f..d7878511fac0 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.14.1.32
+++ b/metadata/md5-cache/x11-misc/synergy-1.14.1.32
@@ -5,11 +5,11 @@ DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple c
 EAPI=7
 HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core/
 IUSE=gui test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib dev-libs/openssl:= dev-qt/qtdbus:5 x11-libs/gdk-pixbuf x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXi:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXtst:= x11-libs/libnotify gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/1.14.1.32-stable.tar.gz -> synergy-core-1.14.1.32-stable.tar.gz https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png test? ( https://github.com/google/googletest/archive/18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz -> googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b440899df286ceb74fb73b093d83376a
+_md5_=a44640ea53aca19a228a3a69a722f4cb
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6-r1 b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
index aaf52e160d08..b150586bb8f9 100644
--- a/metadata/md5-cache/x11-misc/tabbed-0.6-r1
+++ b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple generic tabbed fronted to xembed aware applications
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/tabbed
 IUSE=savedconfig
-KEYWORDS=amd64 arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/tabbed-0.6.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7446c72054f8c8ee0d41e2e6a5613449
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5bea8a5fd3a814bb6c2a39a40191c4a9
diff --git a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2 b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2
deleted file mode 100644
index 3dca7654eaf0..000000000000
--- a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/asciidoc virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter x11-base/xorg-proto
-DESCRIPTION=Hides mouse pointer while not in use (rewrite of unclutter)
-EAPI=7
-HOMEPAGE=https://github.com/Airblader/unclutter-xfixes
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter
-SLOT=0
-SRC_URI=https://github.com/Airblader/unclutter-xfixes/archive/v1.5.tar.gz -> unclutter-xfixes-1.5.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e53a8111f392937b3d82682bb167384d
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20210903.1 b/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
index 1bae30593344..e06fb4333c95 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
@@ -5,11 +5,11 @@ 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
+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.20210903.1/xdotool-3.20210903.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2768111283ba0d31650278a017918c04
+_md5_=aa7aa83a50b75e3e077d11eae5c2cb23
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r2 b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r2
index a33ca3d1ea00..026103035086 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r2
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/v1.2.0.tar.gz -> xflux-gui-1.2.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7c5878579e78712760a5afc3d25a07a5
diff --git a/metadata/md5-cache/x11-misc/xiccd-0.3.0 b/metadata/md5-cache/x11-misc/xiccd-0.3.0
index 800d8d659eba..6b3430fa1708 100644
--- a/metadata/md5-cache/x11-misc/xiccd-0.3.0
+++ b/metadata/md5-cache/x11-misc/xiccd-0.3.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord
 DESCRIPTION=A desktop environment-independent bridge between colord and X
 EAPI=7
 HOMEPAGE=https://github.com/agalakhov/xiccd
-KEYWORDS=amd64
+KEYWORDS=amd64 ~riscv
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord
 SLOT=0
 SRC_URI=https://github.com/agalakhov/xiccd/archive/v0.3.0.tar.gz -> xiccd-0.3.0.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0a5ba6b2894e1c8bf04e12b8e71e035
+_md5_=251ee11f0d4803f7c8f3b62712779ee5
diff --git a/metadata/md5-cache/x11-misc/xnots-0.2.1-r2 b/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
index 1ddd6f2339bc..e2eb6dba5fff 100644
--- a/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
+++ b/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] virtual/pkgconfig x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] x11-base/xorg-proto
 DESCRIPTION=A desktop sticky note program for the unix geek
-EAPI=6
+EAPI=8
 HOMEPAGE=http://xnots.sourceforge.net https://github.com/thePalindrome/xnots
 IUSE=vim-syntax
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 -riscv x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xnots/xnots-0.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d23d44398831cf2698b1132ef90b3c9
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f14c377fa841230122e075245084d73a
diff --git a/metadata/md5-cache/x11-misc/xnots-9999 b/metadata/md5-cache/x11-misc/xnots-9999
index 918f860ac23a..cfeed41bb671 100644
--- a/metadata/md5-cache/x11-misc/xnots-9999
+++ b/metadata/md5-cache/x11-misc/xnots-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] virtual/pkgconfig x11-base/xorg-proto >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] x11-base/xorg-proto
 DESCRIPTION=A desktop sticky note program for the unix geek
-EAPI=6
+EAPI=8
 HOMEPAGE=http://xnots.sourceforge.net https://github.com/thePalindrome/xnots
 IUSE=vim-syntax
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c0b317d4ec9505612109471aae37ff5b
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dc4ef6a76572760bd2ce01bcc9a36da3
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
index 341c5ca13e8b..ed66bd71458f 100644
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ b/metadata/md5-cache/x11-misc/xowl-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8726a85410c680b66868b6e9e42cf092
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.5 b/metadata/md5-cache/x11-misc/zim-0.73.5
index 85fcc183875b..86067f2b8f87 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.5
+++ b/metadata/md5-cache/x11-misc/zim-0.73.5
@@ -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/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.5.tar.gz -> zim-0.73.5.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4ee9bf5ad8b59df4ab44f6bb5c7e0181
diff --git a/metadata/md5-cache/x11-misc/zim-0.74.0 b/metadata/md5-cache/x11-misc/zim-0.74.0
index e7600542ae16..e91a4d002978 100644
--- a/metadata/md5-cache/x11-misc/zim-0.74.0
+++ b/metadata/md5-cache/x11-misc/zim-0.74.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/zim-desktop-wiki/zim-desktop-wiki/archive/0.74.0.tar.gz -> zim-0.74.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1401e893a6991d8e25975419188fa7fe
diff --git a/metadata/md5-cache/x11-misc/zim-0.74.1 b/metadata/md5-cache/x11-misc/zim-0.74.1
new file mode 100644
index 000000000000..ab2dcdb9100f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.74.1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.74.1.tar.gz -> zim-0.74.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1401e893a6991d8e25975419188fa7fe
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 78b38d23a25c..e7dda01a00f4 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/guake-3.7.0 b/metadata/md5-cache/x11-terms/guake-3.7.0
index 7e722ba5c956..ee63a7ca9aff 100644
--- a/metadata/md5-cache/x11-terms/guake-3.7.0
+++ b/metadata/md5-cache/x11-terms/guake-3.7.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guake/guake-3.7.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4e2b2ef282b1512dcfeeca5270489a5e
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index 4db5a4d633ae..eb6a648d67c2 100644
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ b/metadata/md5-cache/x11-terms/guake-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pbr[python_targets_python3_8(-)] dev-python/pycairo[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/pbr[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=898d8cea70d11b725f5b65209208fc2d
diff --git a/metadata/md5-cache/x11-terms/mrxvt-0.5.4 b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
index 3ec47ba8a936..f29ed4c6bfe6 100644
--- a/metadata/md5-cache/x11-terms/mrxvt-0.5.4
+++ b/metadata/md5-cache/x11-terms/mrxvt-0.5.4
@@ -5,10 +5,10 @@ DESCRIPTION=Multi-tabbed rxvt clone with XFT, transparent background and CJK sup
 EAPI=7
 HOMEPAGE=http://materm.sourceforge.net/
 IUSE=debug png jpeg session truetype menubar utempter xpm l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= ) truetype? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft elibc_uclibc? ( dev-libs/libiconv ) ) utempter? ( sys-libs/libutempter ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a1b0a08a610cb06a806e1b7a6985b6e
+_md5_=3c238eb114a7cf1764e244bcb557dec7
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.16.1-r1 b/metadata/md5-cache/x11-terms/qterminal-0.16.1-r1
deleted file mode 100644
index f9ac45daf4b6..000000000000
--- a/metadata/md5-cache/x11-terms/qterminal-0.16.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.16.1
-DESCRIPTION=Qt-based multitab terminal emulator
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.16.1 !lxqt-base/lxqt-l10n
-SLOT=0
-SRC_URI=https://github.com/lxqt/qterminal/releases/download/0.16.1/qterminal-0.16.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6d0f230c9c1293c589636eca860fc845
diff --git a/metadata/md5-cache/x11-terms/st-0.8.4 b/metadata/md5-cache/x11-terms/st-0.8.4
index 171072c95b85..055208a0de41 100644
--- a/metadata/md5-cache/x11-terms/st-0.8.4
+++ b/metadata/md5-cache/x11-terms/st-0.8.4
@@ -9,5 +9,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://dl.suckless.org/st/st-0.8.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4117ad4763205f1b9a648f04103fc48d
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 3ac0844f3eda..898749836a81 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -9,5 +9,5 @@ LICENSE=MIT-with-advertising
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d23864ea1166311df653225ae4ecc590
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1 b/metadata/md5-cache/x11-terms/terminator-2.1.1
index 80d7399f434a..9594094a7681 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	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f9379f8da9df2ed07d638b33b3590c0f
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 0a32c2a1cbcf..a2c95f6bb00b 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/gnome-icon-theme-symbolic-3.12.0 b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
index c1bec377b765..f28e4f4531e7 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
@@ -3,11 +3,11 @@ DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 v
 DESCRIPTION=Symbolic icons for GNOME default icon theme
 EAPI=5
 HOMEPAGE=https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg !=gnome-extra/gnome-power-manager-3.0*
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/gnome-icon-theme-symbolic-3.12.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=77ef6d8236be47b3985188df01c92343
+_md5_=9ee0c57a92949364eceefc8ca505bbc4
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.16.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.16.0
deleted file mode 100644
index 36a16b1a5761..000000000000
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.16.0
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=LXQt Themes
-EAPI=7
-HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=https://github.com/lxqt/lxqt-themes/releases/download/0.16.0/lxqt-themes-0.16.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b35e5faf7090ee422f6db4e8faf5a4ca
diff --git a/metadata/md5-cache/x11-wm/2bwm-0.3 b/metadata/md5-cache/x11-wm/2bwm-0.3
index 06457e05530c..98f0cb6ba252 100644
--- a/metadata/md5-cache/x11-wm/2bwm-0.3
+++ b/metadata/md5-cache/x11-wm/2bwm-0.3
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://github.com/venam/2bwm/archive/v0.3.tar.gz -> 2bwm-0.3.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4dfb268671f29e1bf75bb56d5559189a
diff --git a/metadata/md5-cache/x11-wm/2bwm-9999 b/metadata/md5-cache/x11-wm/2bwm-9999
index ca5b3368f019..b5c07023097a 100644
--- a/metadata/md5-cache/x11-wm/2bwm-9999
+++ b/metadata/md5-cache/x11-wm/2bwm-9999
@@ -9,5 +9,5 @@ LICENSE=ISC
 PROPERTIES=live
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4dfb268671f29e1bf75bb56d5559189a
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index dca046c7bd4a..366ba99b5c9d 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/blackbox-0.77 b/metadata/md5-cache/x11-wm/blackbox-0.77
index a4e4431c6360..42cdf4bf3052 100644
--- a/metadata/md5-cache/x11-wm/blackbox-0.77
+++ b/metadata/md5-cache/x11-wm/blackbox-0.77
@@ -5,10 +5,10 @@ DESCRIPTION=A small, fast, full-featured window manager for X
 EAPI=7
 HOMEPAGE=https://github.com/bbidulock/blackboxwm
 IUSE=debug nls static-libs truetype
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXft x11-libs/libXt x11-libs/libX11 nls? ( >=sys-devel/gettext-0.20 ) truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=https://github.com/bbidulock/blackboxwm/archive/0.77.tar.gz -> blackbox-0.77.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdb98308006b1dcc834f02ed1594df7d
+_md5_=fb9419c996c75d57bb7c59c7f634f48f
diff --git a/metadata/md5-cache/x11-wm/dwm-6.2 b/metadata/md5-cache/x11-wm/dwm-6.2
index fae2f1958fd1..c568c02b76c1 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.2
+++ b/metadata/md5-cache/x11-wm/dwm-6.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.2.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d5d875b6aac4bbebc0adef302a79afd
diff --git a/metadata/md5-cache/x11-wm/dwm-9999 b/metadata/md5-cache/x11-wm/dwm-9999
index d32eea095d84..b5470ca0585a 100644
--- a/metadata/md5-cache/x11-wm/dwm-9999
+++ b/metadata/md5-cache/x11-wm/dwm-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b11ef92d004502e7c97160b74438227
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.3.1 b/metadata/md5-cache/x11-wm/evilwm-1.3.1
index 451e629b275d..6a4f5013f867 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.3.1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.3.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A minimalist, no frills window manager for X
 EAPI=8
 HOMEPAGE=http://www.6809.org.uk/evilwm/
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
 LICENSE=MIT 9wm
 RDEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.3.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c3cd128f478289de67336c68d67cf81
+_md5_=15be19223eaf048ec386060ef209ac05
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
index 268e98b4355f..bcf28793053c 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9bb475d8a0d7dddb64ed5c418a11ab49
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index c4341983a8a1..c1489db2dedc 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -11,5 +11,5 @@ RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( doc )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5f3b99d058178439d293ae3508bad7e0
diff --git a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4 b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
index 12b015e2b1cd..7004f77e68d2 100644
--- a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
+++ b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=x11-misc/dmenu-4.4 apis? ( x11-misc/xbindkeys )
 SLOT=0
 SRC_URI=mirror://gentoo/musca-0.9.24_p20100226.tgz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4a702d9e6695aca9171440a411997cb
diff --git a/metadata/md5-cache/x11-wm/mutter-40.2.1 b/metadata/md5-cache/x11-wm/mutter-40.2.1
deleted file mode 100644
index 5cb85c20e34e..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-40.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 || ( x11-libs/libxcvt <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=mirror://gnome/sources/mutter/40/mutter-40.2.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a579b87d47b835ce12c93c2c091f76a6
diff --git a/metadata/md5-cache/x11-wm/page-1.9.9-r3 b/metadata/md5-cache/x11-wm/page-1.9.9-r3
index 12747c8466e4..88f5fb0af538 100644
--- a/metadata/md5-cache/x11-wm/page-1.9.9-r3
+++ b/metadata/md5-cache/x11-wm/page-1.9.9-r3
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixe
 DESCRIPTION=A mouse friendly tiling window manager
 EAPI=6
 HOMEPAGE=https://www.hzog.net/index.php/Main_Page
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X,xcb(+)] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2
 SLOT=0
 SRC_URI=http://www.hzog.net/pub/page-1.9.9-r1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=977df51f2c89de4e8785a58afa10adfd
+_md5_=ca02c71b33e671ea9138020a97997536
diff --git a/metadata/md5-cache/x11-wm/qtile-0.16.1 b/metadata/md5-cache/x11-wm/qtile-0.16.1
index c0b64d7485f3..45bfbe6bc256 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.16.1
+++ b/metadata/md5-cache/x11-wm/qtile-0.16.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/q/qtile/qtile-0.16.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcab154e0f4e87ae4f9573b6aa9cec57
diff --git a/metadata/md5-cache/x11-wm/qtile-0.17.0 b/metadata/md5-cache/x11-wm/qtile-0.17.0
index 09c52f39083a..7e96facf4ad2 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.17.0
+++ b/metadata/md5-cache/x11-wm/qtile-0.17.0
@@ -4,12 +4,12 @@ DESCRIPTION=A full-featured, hackable tiling window manager written in Python
 EAPI=7
 HOMEPAGE=http://qtile.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/cairo[X,xcb(+)] x11-libs/pango dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cairocffi-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/xcffib-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-sound/pulseaudio python_targets_python3_8? ( dev-lang/python:3.8 ) 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
 SLOT=0
 SRC_URI=mirror://pypi/q/qtile/qtile-0.17.0.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c93b345c73737382427d4d7a81a3a5aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8b42985e68348c0dc11ef5d508d51a7c
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2 b/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
index eb465f3ef248..24375c6ead6f 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.9-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The fast and light GNUstep window manager
 EAPI=7
 HOMEPAGE=https://www.windowmaker.org/
 IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( >=media-gfx/imagemagick-7:0= ) jpeg? ( virtual/jpeg:0= ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://windowmaker.org/pub/source/release/WindowMaker-0.95.9.tar.gz https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d319ed452dc13c76307fd7bbf08caf1c
+_md5_=07519f20f65756dfaf8f3805cc36baeb
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index 0132b229bdb5..a113818afc13 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1d927fa9d1edc75a70f7d20c3b8feac
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2 b/metadata/md5-cache/x11-wm/xpra-4.2
index eddc3e430fb5..f0c1b6978970 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b55329e31286f782d8fa2b402a269160
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2.1 b/metadata/md5-cache/x11-wm/xpra-4.2.1
index 92a30b20a391..40ce1881b69f 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2.1
+++ b/metadata/md5-cache/x11-wm/xpra-4.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.1.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=267ffd21f4f75212e867ce5294bc0b25
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2.2 b/metadata/md5-cache/x11-wm/xpra-4.2.2
index ae2d28eddfba..64746fce8e99 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.2.tar.gz
-_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1281093c81f0ebf72139ea3eec96848f
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 0e9a089ec327..6121f4db79d6 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-4.17.1 b/metadata/md5-cache/xfce-base/exo-4.17.1
new file mode 100644
index 000000000000..a0cd12dde3a2
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/exo-4.17.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/gtk-doc-am dev-util/intltool >=dev-util/xfce4-dev-tools-4.16.0 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17:=
+DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/exo/4.17/exo-4.17.1.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8891ccfa54153005bf210bc77116ddfc
diff --git a/metadata/md5-cache/xfce-base/thunar-4.17.3 b/metadata/md5-cache/xfce-base/thunar-4.17.3
deleted file mode 100644
index 361eb524aac1..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-4.17.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.15.3:= >=xfce-base/libxfce4ui-4.15.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.15.3:= >=xfce-base/libxfce4ui-4.15.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.17/thunar-4.17.3.tar.bz2
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42c745e006ac572c547c7408f807d18a
diff --git a/metadata/md5-cache/xfce-base/thunar-4.17.4 b/metadata/md5-cache/xfce-base/thunar-4.17.4
deleted file mode 100644
index 1ef82482d492..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-4.17.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.0:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.0:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.17/thunar-4.17.4.tar.bz2
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d8ffbe655b7b2cce39d6cd8fed1fd38
diff --git a/metadata/md5-cache/xfce-base/thunar-4.17.6 b/metadata/md5-cache/xfce-base/thunar-4.17.6
new file mode 100644
index 000000000000..6ab9a9aa3238
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-4.17.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.56 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.1:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.56 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.1:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.17/thunar-4.17.6.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c299ddbc777c2c41450b994b78131e93
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 452a882c6865..dae8bf9ba259 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.4 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.4
new file mode 100644
index 000000000000..4675b56e486c
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
+DESCRIPTION=A system load plug-in for the Xfce panel
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.4.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=268621bc7370edd0d3057546f2a67a11
diff --git a/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
new file mode 100644
index 000000000000..bf66553d1fea
--- /dev/null
+++ b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
@@ -0,0 +1,104 @@
+Title: Possible failure to preserve libraries
+Author: Sam James <sam@gentoo.org>
+Author: Hank Leininger <hlein@korelogic.com>
+Posted: 2021-09-29
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-apps/portage
+
+We have observed in some cases corruption of Portage's internal database
+(VDB), where the libraries provided by a package are not recorded. This
+can break the "preserve-libs" functionality, and thus in rare cases
+break your system during much later updates (even if you do not use
+"preseved-libs" now, but decide to switch it on later).
+
+The underlying problem occurs usually when glibc has been upgraded to a
+new major version, but pax-utils has not yet been upgraded to a version
+compatible with it (but at that moment stays undetected).
+
+The full technical details and investigation can be found on a Wiki page
+[0] and on Bugzilla [1]. Changes have been made to prevent this happening
+again both within Portage [7] (with possibly more to come [2]) and within the
+glibc and pax-utils ebuilds [3][4].
+
+To detect whether a system is affected, emerge the
+app-portage/recover-broken-vdb package:
+```
+$ emerge --ask --verbose --oneshot app-portage/recover-broken-vdb
+```
+which provides two tools: recover-broken-vdb-find-broken.sh and
+recover-broken-vdb.
+
+Then run recover-broken-vdb-find-broken.sh:
+```
+$ recover-broken-vdb-find-broken.sh | tee broken_vdb_packages
+```
+
+This check should be run on all Gentoo systems. It is only necessary
+to run this as a one-off, as changes have been made to prevent such
+problems occurring in future.
+
+If you have any output, read on.
+
+Fixing a broken system is not always straightforward. It is strongly
+recommended to take a backup of your full system before proceeding,
+as well as a copy of /var/db/pkg (the VDB):
+
+1. A tool has been developed [5] to attempt to fix the consistency
+  of the Portage database. Using this tool to modify the VDB is NOT
+  mandatory (read the full news item before proceeding) - you can skip
+  to Step 2 if you wish, but fixing the integrity of the VDB
+  makes it as safe as reasonably possible to proceed with
+  rebuilding packages.
+
+  Run:
+  ```
+  # Take a backup of /var/db/pkg before proceeding, such as by doing:
+  $ cp -a /var/db/pkg /var/db/pkg.orig
+
+  # And then:
+  $ emerge --ask --verbose --oneshot --noreplace \
+  	app-portage/recover-broken-vdb
+
+  $ recover-broken-vdb
+
+  # The tool will output to a random temporary directory.
+  # Inspect the results, and then update the real /var/db/pkg/
+  # by doing either:
+
+  $ recover-broken-vdb --output /var/db/pkg
+
+  # Or, manually copying the new files from the temporary directory tree
+  # into your real /var/db/pkg/ directory tree.
+  ```
+
+2. Attempt to rebuild the affected packages, first upgrading
+  app-misc/pax-utils to the latest version:
+  ```
+  $ emerge --ask --verbose --oneshot ">=app-misc/pax-utils-1.3.3"
+  $ emerge --ask --verbose --oneshot --usepkg=n $(cat broken_vdb_packages)
+  ```
+
+Given that there are possible other side-effects of the corruption/bug,
+it is strongly recommended that if any corruption is detected, all
+packages on the system should be rebuilt, after following the above
+steps:
+```
+$ emerge --ask --emptytree --usepkg=n @world
+```
+
+Note that binary packages may need to be discarded given they may
+contain corrupt metadata.
+
+Please see the wiki [0] for a full description of the background
+of this problem and handling corner cases such as e.g. already
+being affected by system breakage [6] as a result of the bug.
+
+[0] https://wiki.gentoo.org/wiki/Project:Toolchain/Corrupt_VDB_ELF_files
+[1] https://bugs.gentoo.org/811462
+[2] https://github.com/gentoo/portage/pull/744
+[3] https://bugs.gentoo.org/811462#c6
+[4] https://bugs.gentoo.org/811462#c7
+[5] https://github.com/thesamesam/recover-broken-vdb
+[6] https://wiki.gentoo.org/wiki/Fix_my_Gentoo
+[7] https://gitweb.gentoo.org/proj/portage.git/commit/?id=83af7270fafbd7b1eed0031a5e06836ad1edf06d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4c756060c0e0..8220b43a708e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14592 BLAKE2B a7d806b5163e73c21c0227fc1f2adadc4859065455f0ced4449c36fcbdcb9ae961814f766ac8cafd8435efd9028ce5b7f9d92e7620fa0081688a267f9b7eeaff SHA512 0ce5a50a6ee16cb568824b8e674a08c7b6e11fcaba871e84d2348e4b517277aed553941d484a7e0f6c4360bc98e6b29879d2520de01fef227c387edf7bf0ecae
-TIMESTAMP 2021-09-25T18:39:22Z
+MANIFEST Manifest.files.gz 14793 BLAKE2B 63cc284f2ac18483698ea05b1c55258037eb17749b6d6c28fc951c5b5fe6503bcad78fddc6eef365513509da659366418f1f5e90ff7868df5cdd39fc63d27252 SHA512 e11f5a24d5bb12a423d4ccf0fed6d571075b5a2dc70bdfaf0d04987a042cb77040ec7a17c930fd4329b8bcd32eb8b8228599d7cd4d1297297b874c28d3647aa4
+TIMESTAMP 2021-10-01T19:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFPbNpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFXXNNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABiA/+JI186oCzF2iYiNirAok4mYWuAtBQhYXABofJ3GqhNzPsIT02nh9Fb79/
-pKT+nJe8ZlF7ely02fFUcgPvQ9hqR7IV8f7pD2lqgY3bmGiz3tZZ58VMHxqxsCGJ
-f6+14zmOB1/6ivVVl2xCtJjLUOvAs60lWVueZYOTfEsoSCEBR1JUrb1HGQ4bGYSH
-ieFsoVib1wp3dKY7wBa6oWdoADQbiCBPJe6/IhYlid5pQ+RArePOqi88sR8QGEXu
-BpffRP+Sd2+g8tSwIBXAkwgEqwfHrTPDJj9tuDFk/0wZV65MEEftpxzvLkDqcZmD
-kWIeG9hrTzPUT1+N3W1rVFKNLcu5eWi6jmInE5HTnZiY6baWspQ0gZ4Hwva7EH+F
-oB3k4jgROnuLmHuYXCfmSp5t8ZaY0d0OT2kjDZgoE4OHHpazb3Htdl5jFpwOHB9M
-Fh2ek7xRFkS+AfdOvvgv/C/JKXNEIvq3VbNKp5iWYHriUjnaZcZRMHftMN+k/Su/
-Yp0Az+AWse1dgWvTOggVPOtTz+3lZtrQeypk+VqE8koG2xSCt28N573zyyG9qLLt
-xwaJCl+5XXjadTIIvTjffO1SN1sQ0wBIdwq8Yfallg3YHhAfvhguFA5oFcwolcW4
-lhrFNZqlQdD71Zl6vR17YVnjS5QQAWDAmkfujAQIW4v5b51wzMA=
-=DDkh
+klAUEBAAlwQ+LS0yVNzAbDjRIqg+yGLqBNyU8KiaGvvYqaaxXexjNDmqOVJYms5w
+lCMEj/TQqqnxtzh/WpyTgMdWObAWXjMLJx8jPTInmZUPlVKHqeVmB0h4qxFe8HLU
+rnlLysQVW7+TitpjKl4XmQ2K7p8U3rQxO4RMAhoYFYu+WRTzFhXGc195ObmOfZJT
+fCKNbJL9WiCQWB4Uaaus4g+azEU/eWLo5t3tJp0VyCPp2J+sodLrNBzjj9QfV9Is
+G4PN8q9/SW+1pI2p8sRk712Qztt1ZKDvS7M5QzAUQJcUpHsnFe5UgHUnW8zyHxhv
+kunN4QuSR7scbbbl9cMfWkTWnTwWhvL8o1L8C3oC8Dulvo8UEqQen6BcsoE1cY9Q
+W0YMENy33IA2IQ4hPE6WMQn1+jKrwyqrRv+6NI9s8+xHNTEL8nQ1VWfQxu/3fYFA
+Y6nN9vSg7FfGQU7ZctnpsNMZwpf//9PxyWiP24MppdkqAT8LDsJ21F8h807mmGuM
+WawGkDwe3szRgi2kIDhHOBm26UuJ2Jilpl8LUkbwNTQivvwxUv9WSWNmEA+gll7b
+LHtCAToxXyBNFXCb0y/HrSFBXEFM02ITm1XN82CXDouvn6KWxFNyZsp0qfju+sTN
+UPSSdI5L5SAEQ2cuBIfUHctrPaGlrVZEY5yQMi4FLZlv2n3Zcv0=
+=x5vY
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 1ae8e377f316..d98d8076d98a 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8fea7f448100..af47f195eb11 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Sep 2021 18:39:19 +0000
+Fri, 01 Oct 2021 19:09:02 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 95737b0ffb90..b654c98cae1b 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-573532ce5b9b584936644777d8b5a1bbf342ad92 1632517072 2021-09-24T20:57:52+00:00
+4d715f694dba3bde1d7235b315d8ab3a654fc22d 1633022211 2021-09-30T17:16:51+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 09b6ca77dd85..7b70980252ad 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -14,6 +14,10 @@
       <email>expeditioneer@gentoo.org</email>
       <name>Dennis Lamm</name>
     </member>
+    <member>
+      <email>mva@gentoo.org</email>
+      <name>Vadim Misbakh-Soloviov</name>
+    </member>
   </project>
   <project>
     <email>alsa-bugs@gentoo.org</email>
@@ -366,6 +370,11 @@
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Hüttel</name>
     </member>
+    <member>
+      <email>mva@gentoo.org</email>
+      <name>Vadim Misbakh-Soloviov</name>
+      <role>Not assigned (pretend to be sysadmin)</role>
+    </member>
   </project>
   <project>
     <email>sci-biology@gentoo.org</email>
@@ -457,7 +466,7 @@
       <name>Agostino Sarubbo</name>
       <role>stable amd64/x86 liaison</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>floppym@gentoo.org</email>
       <name>Mike Gilbert</name>
     </member>
@@ -1743,6 +1752,10 @@
     <url>https://wiki.gentoo.org/wiki/Project:Lua</url>
     <description>Lua language and library maintenace</description>
     <member>
+      <email>mva@gentoo.org</email>
+      <name>Vadim Misbakh-Soloviov</name>
+    </member>
+    <member>
       <email>robbat2@gentoo.org</email>
       <name>Robin Johnson</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 391d90927a97..84deb90bbc52 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep 25 06:39:19 PM UTC 2021
+Fri Oct  1 07:09:02 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fd324c92c521..c8477555c621 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Sep 2021 18:45:01 +0000
+Fri, 01 Oct 2021 19:15:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 131f0909e7ae..d5064e0f0d5e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ea07c952dcbd0732b0e24a5cc787c811a1d55e29 1632594875 2021-09-25T18:34:35+00:00
+4e02c322f9dc136c2facc709c78b3d9ec05f8c87 1633114964 2021-10-01T19:02:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b51502b220aa..e159c04e1c1c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1632595201 Sat 25 Sep 2021 06:40:01 PM UTC
+1633115101 Fri 01 Oct 2021 07:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8fea7f448100..af47f195eb11 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Sep 2021 18:39:19 +0000
+Fri, 01 Oct 2021 19:09:02 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 04735eb8f7cf..d03805a34152 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 111d46a73576..a6019ca70408 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -2,6 +2,6 @@ AUX arping-tests.patch 5643 BLAKE2B 154071667f814ec720a6fce36612d251ab891eb3972b
 DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
 DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
 EBUILD arping-2.21.ebuild 853 BLAKE2B 815e29d2d3ad9641bc0067f69a41eeb9741eacbcc08c5535eb88f4219fdf8860f6c9ae36c5b338b41221a7155d64725dcce0db6f471f3d6274ec66fb967a53ab SHA512 b60dbda113926dbaa2718cb70953546afc440f988db472c588d9e287d9595dc86b50c6c6a85748ec02f6489587c8892677825298de6ab691c9d50ab308402a7a
-EBUILD arping-2.22.ebuild 780 BLAKE2B 50b1f9abf268eaec644e3bef73c474b27f025525c1f081bef0e44410ff608e7950ff8dfae1c5055929ff7800e57c1b7f1d59a4aa6e7006e6d5a19d5a51e6751e SHA512 1added26d2789ddc9a5b7faaa168be0f464c55454931d2efa8536d1c030615c42cf91ff0d6a9c3b03eaafd94e253e70074c27b9f6b1a7479ed4269468c50743d
+EBUILD arping-2.22.ebuild 779 BLAKE2B ce2cc2d6cd7828d195eec621b4f48c6868cf1122e932883d8d94ab573be854f4159c3890945202cefffcf6192bf76be770a30cd74ea17a34d48fd0a217c24c8f SHA512 8121822e9f945e699aca78a672f398c13b00fae53fb1e61b0b151dd64dfaada0c15ac9a00f75ddea1fb42388590bfc7433c86536041c340da7a1d7337f95595e
 EBUILD arping-9999.ebuild 675 BLAKE2B bcc653ec32f180d4642889cdfa4b5e3461a4a6a8821faa9faffebfa2f63bc60a96a3a3f5bccdd91e55b18845b0c83b112dd1c0be7fdc1e12454427e5c0e3563d SHA512 268cdafccae462ee61ffa4ccb1c8664242c766bb7429ea764f470f3434b428ee77b1fe0f40a3a537bcb9daa0cce736d49bb445b3ee8ae91d25c2d48baf4e7abb
 MISC metadata.xml 365 BLAKE2B c7c563e88cea335d25b5d88b725a3e05df1c3b59f5c5d5d2a18f888cbbae869520b3f9749d345cc10c066524d60d8ca456d799ab27c7a7bf8dbec0fb0ca40e3b SHA512 368117a86a11e3a6d8a847eb43c8b44c40c0cc0f774a4b06f4da6e31eb6cdfdc0820918e651c481ff1e1424f0f15a59e64a7b893621c456c2496dccb9de2b66c
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
index 29ee902a2367..619cc522a115 100644
--- a/net-analyzer/arping/arping-2.22.ebuild
+++ b/net-analyzer/arping/arping-2.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index dfae24d5f8bd..866805fd7b85 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,4 +1,4 @@
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
-EBUILD iptraf-ng-1.2.1.ebuild 1223 BLAKE2B 65337b95d7cea650e2c5bf9ed258bf46af427e3fc6f8585df657d6a98aa702bf4c6379e19b2f525b9fcf65689033f5f06ffb706d8136cc3aa356763718082528 SHA512 0bc4eb5554c28bcedcc6feb6ae0a54389a626f70a72394a8215f9ec2f384ff0c34ce456a087a0284cf53a7377e0f84d1cd1b4886ea376741a20be4694e2b889c
+EBUILD iptraf-ng-1.2.1.ebuild 1230 BLAKE2B b9e32d557b5b1f7acb18ad3dc530b3ee23360b73748fa2137b7c61b1c8b20c86065f7fcbbba2228ffb6809b0a6898d1d53ff28aa8e166790b7334cbbc9a64baf SHA512 5695f1296c2470b050710af2019ba4e7541d1fdcf61c90704fd8c7cc6b6929b7489c93284ea3b9ba978fbf6bd22b9b64c308496590dd325c211322a205af9f5f
 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
index cf6548199533..bb3fab832e02 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 0c0fc8d76ed1..382c7b145d62 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -2,6 +2,6 @@ AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5c
 DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
 DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8b4a92532f5da6f15a4470c2e458df147009599939a41fc36f5ae4941c0fdd97aa9bf77a7237544f3df3bf5772ed884 SHA512 2d57092591187f62f7ae685b867ab02d08108ce3a687ea7da444e57cbe5e9f74220747beee322ccfec0ce4319c95cc37ba0908ba8fae6a8d88bdb0928d099099
 EBUILD linkchecker-10.0.0_pre20200729.ebuild 1503 BLAKE2B efefa0b2ee492950885de3aaa4714e8f44498167fa497415630a7abfac5b070cd8cb2525d03bad5e1af6e7840e284b946b3c00de9e86d189184c3b5a98843c35 SHA512 6a03aee8aaf6203fd93f69046af29e90a976f2c1f914f0ea55a7e481850fd4ac66a68e880ea8b36369c843d8754ab1dbf38697de7ae4f7285c7743e52b811153
-EBUILD linkchecker-10.0.1.ebuild 1347 BLAKE2B 89ba0bc1630bd7c0f1b8d07bc537bfce6c3627f2d5fe1db90233853e8559d56115fcb82e05c1ef1b602ba38e636d517cc18a0bb5185692e19633372c6a69c382 SHA512 17555e5a2f0b5c2f99b3858affebda4ecf9bcd579a8c87700299abadb009cfebf96a26544d30ed9df060294c70c3d37fc2ff932b7e56a320d27a3d997ff615e3
+EBUILD linkchecker-10.0.1.ebuild 1345 BLAKE2B 1ca9ab55b77fddac197d73fd2d87ddae39ee0761c00e2bad6a44b1778b152a4c313f953e22c98c67428d79b2b3dd81f6a3afc7c0277d6bd9cfec8ccd44b31568 SHA512 6d55b89966170c6aff0ebe9747d4a7e1010723a07f21adcbe2eb09965752c2381a48978be295fcb7edcdc09ea0d53c02b8b0b91255068e28c92d5e9b62007fa7
 EBUILD linkchecker-9999.ebuild 1328 BLAKE2B 36a61c89164199abb6cd093f92c1790a8097154feb95b0b7cc9e559758610f5138473d9ae78ad549924901d228dfd27679aa8247443266d1523c21d1407425c8 SHA512 ce2c3f5728ed400e28dcdb3de3260215173605c5d6bc93f05afc55c8c88421d6313eeac517e2c1436369399bc23e4732ac15bc7fcf7026de2b56fd062720d9d9
 MISC metadata.xml 575 BLAKE2B 6996e2d330f7c0e9976cf1cc2964ce3d426f5527c491dfb0630630bddee0c932f28b0ff9fe1c9d4778ad7d73bbb69816d8740f7b3b1b5fb5545dacd073c51aaf SHA512 567a432bd5410dddf0589eaadc6ea81f516c131ce84c3ba2e1a42757d32362821f3ea1bb832d4f41381d4ee62152c019b8daa46685353cba8a6da89bb892a989
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
index d2bd5895f97a..0ad17fa60829 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linkchecker/linkchecker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index d1cf593ebe02..6ea1504bebe4 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 1433 BLAKE2B abaa921cece431cd22f96a0093fdae88752c874b8225f4f86bc4321280a8c14fabd92fdfca0931bc5eeab7ff0dc4c5100e9007b1c1183b5a8fb3fd8b4ea5642f SHA512 b34f1994dd1a070a1593aa8340946be02e23f2a4482f08d3b178145322e7fe7fdf5f2fa8e450aca6e5c910ab6d2598e9a002287a4b92d147b9ec5807e90cf90c
-EBUILD mtr-9999.ebuild 1282 BLAKE2B a9451a299afe9c557b3400d19f39b33dd6cb4cdcdf60fa58edb551e3736d8af261a76516caa9b39561d57c36c74d1eb26fa63c3ca96908c97310adf118a2b173 SHA512 e07ee53e8e2aacdf43cc8fd0d5e1adb773fd4d3c5d47cea982f8104c81d29b7040335d10e201ddda106b8a330381d38d76ea0190d2c56d617d1709b6e3d83319
+EBUILD mtr-0.94-r1.ebuild 1435 BLAKE2B 1d4a682c1a98d639deccbba5af331fa1a56894c46a701767bc63f19f54cb97dae0c1d42c5ef70719782ad5210be41fbc702e3ef55e1286b98d37cc322cf8d0db SHA512 bcdcfac855318bee2063247d1413f20306fe9b0687242820fab39bff1825aa3b5e3e4bc336745dc90e9920beaafeb3e87654b94401224244d82eb433bd1d9769
+EBUILD mtr-9999.ebuild 1284 BLAKE2B 08bdc5af886f337ac86070a00a804d22903090226bfd97ca233550404d05e5f933081fb66067fb828d9adca904c196badbc95c6a09af5af4f249dde145e8729f SHA512 88d134303408562729358a4022b4c77392e62d58a0f3e9dd54a1c0cc56a3ceba147763f4b1d53628cdb77ae0c65bee34991d463c62309fef2b8c278d70b8f5cf
 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2
diff --git a/net-analyzer/mtr/mtr-0.94-r1.ebuild b/net-analyzer/mtr/mtr-0.94-r1.ebuild
new file mode 100644
index 000000000000..dd897d66ef6a
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.94-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 fcaps
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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="gtk +ipinfo +ipv6 jansson ncurses"
+# This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jansson? ( dev-libs/jansson:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ipinfo) \
+		$(use_with jansson) \
+		$(use_with ncurses) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
deleted file mode 100644
index c9cfd561d602..000000000000
--- a/net-analyzer/mtr/mtr-0.94.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 fcaps
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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="gtk +ipinfo +ipv6 jansson ncurses"
-# This is an inherited RESTRICT - figure out why!
-RESTRICT="test"
-
-RDEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:3
-	)
-	jansson? ( dev-libs/jansson )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.88-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_with gtk) \
-		$(use_with ipinfo) \
-		$(use_with jansson) \
-		$(use_with ncurses) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "mtr needs root privileges to run.  To grant them:"
-		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
-		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
-	fi
-}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index bf0d00068f92..f6a3911e9d43 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 		dev-libs/glib:2
 		x11-libs/gtk+:3
 	)
-	jansson? ( dev-libs/jansson )
+	jansson? ( dev-libs/jansson:= )
 	ncurses? ( sys-libs/ncurses:0= )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
index 57f11e05f337..9eb7ae7ae478 100644
--- a/net-analyzer/nagios-check_multiple/Manifest
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
-EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1363 BLAKE2B b694b57a674daa4d5f2d24818952b3073ddaa8b4a0e7c3817c5bc58ab0c61e2a5c48a362c34e61694638879283d5e4096aee199b7f90777db67911b6fe1210ec SHA512 0d5e0b7f3fc32ad9f592c5db2d2cf617a167a86ac5610db531570825d59bca2b67e76a8c3e310d8fa4eaf1cd30a7217a39d8125e7c15eb588d941b1766b84212
-EBUILD nagios-check_multiple-0.0.1.ebuild 1357 BLAKE2B bd94906a71835708c96c225886dae2212cb17b585a4b39c3df3efadc83fdf9f5319029a5ff4406c7adbe3ee50d00c2bf812e902743483c1953770aa6570b79fb SHA512 ac1e10889763e24662d02f640b3174635d2fed615a2e99dfce317dda93a3b847245aeab593bb999ae583228963d6a4df196699569c38a09838dcbee05d3cbc9b
+EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1362 BLAKE2B 8d1098d6ad41f5cbc67cda0e042bcea27e39e834f3b84b0a3dd41f60fc7f68b077807da9c8a7fce3bf27c7d284a73031b05b2e85560d68cc01ddf9119879cee5 SHA512 1a6b6a6cde2848be763f590d7b96eba7d11ba6e3153ec9fe6c145b8f1a30551a9f0b76e2783fda91b0c7427de6baeb06863f425785e432500c230bc100f4b26f
 MISC metadata.xml 347 BLAKE2B c25107d223ed89498730678d4338d8c6bdef7693a86418fd80ebcbe48b0ca7a250af6740abaa20be36b9be23490c16e52d0bc2ae20901b93c05b97222526ad83 SHA512 4f246f7fc5e6af8898c19b653013ac167107f3663aa93dbee5186f7a1740140bd01d26208347c03cdd0526639be28245d8413cb4560a1a2ea90c565729c7ee35
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
index 474031b4927f..3918f3822ea4 100644
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
deleted file mode 100644
index a509978abdb5..000000000000
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_multiple"
-DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
-HOMEPAGE="https://github.com/clarkbox/check_multiple"
-SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
-		|| die "test suite failed"
-}
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 7af963c8190a..1df114c0d780 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1-r1.ebuild 1200 BLAKE2B 7ae3d149997a47dd3958d69346a54488d89212196a8aa8a3de61c83528ac7bcc4bb57696f256d11c6140f0aa195d3f29f5fb5603aee86e9be6b223326724d62b SHA512 32a0c553937548477cdf84e369dffcbea84f2748ad460030687cccd562ee91036b7d8658e37a1858b078405bf6575d9ba3e3c434f070b8d2d3174f01205673c1
-EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1212 BLAKE2B e323ee6bbf7e208dbfe0b32068f78ce36c7b39dec27e692a534ca57eac8cf8f6fb0320827fd2b4c12a6f4e270eeec6902c5049ef452552b7f5085c70d34f6004 SHA512 c15bfb212bcf5e8407e0ba729082e99165aa05fd39e19b6cd1ab8689a9055965223728623f02d1f2bc99562d6cd28bbad50bee241a6eac53b43c49cc8cc5b283
+EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1211 BLAKE2B 11916cf4fa2c06cc3feea6d61088934e9694813657f19047baa94c049281f831179e0905fa837399056611a581deb8274e147143721e3de7c42e564a85c29075 SHA512 61e489ecda4b5821db3135e315b18ea80d41cf0850084fc3613ea9bb7ac4444c5cb90f7605baf352c0874a44be3efe008c0da76ab06937925d587cf93933143a
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
deleted file mode 100644
index 24f738884623..000000000000
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_openvpn"
-DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
-SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
index 6ff5f2740438..eb19ebd90675 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 src_install() {
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index ef2c623bf13b..54281d557339 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
 DIST NessusAgent-8.3.1-es8.x86_64.rpm 14581716 BLAKE2B 468ccc4bc41e68c0ae3b1418ab81a6405857e9fd66ecd26663f4f342b2cfdd2a119b0dfc6282c93fdefb80c7265147318b336ffa5a1fe1c126f0c088d683820f SHA512 e14838af063d9ee5c2701d2f1130bd4e28f23bdcbb865b1303906b83b2d228c34697891371ac84d2891cd10fe20aa2ea2c3735a44569657bd39ea1c82a243bb2
-EBUILD nessus-agent-bin-8.3.1.ebuild 2358 BLAKE2B 6371e2be15cb82123aff81165b12d64c11188e3aa551cbbb92ac53c2f1087fd1f3febb309f72c5936ae9a1ec6c506a1ffd50199f2ab091372f19616c311a73fc SHA512 be4fdcfc50f9d61d726c0088792b6aa52ca723519cbca08abcab93da9f91bd1fcb21cd72bbcb83c39f19da0d25d8e66c3ba992a72514dd09a349f3c356a35e6d
+EBUILD nessus-agent-bin-8.3.1.ebuild 2361 BLAKE2B 9c2eeacc92af425c8ee90c7fe7dae1d8de389aa7eecb31831abd49d6d44cd99323b08d3f84df158c4d06825ee231c55d9ff5846f26dd484a684954280d77bd92 SHA512 0f4d46b6d030b3b7847048d6e4ff2d35f766052e0051f94f7b7dd17ca699010fe8c00a7bf3a8ffad56d38a402b160eb03be1019aee10cd74de2ee60b73ec30f9
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild
index 4ea733b95d14..c347d77eb5a2 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${MY_P}.x86_64.rpm"
 
 LICENSE="GPL-2 Nessus-EULA"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="-* ~amd64"
 
 RESTRICT="mirror fetch strip"
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 24812ebee4c9..e152e1dde0fb 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
 DIST Nessus-8.15.2-es8.x86_64.rpm 43867848 BLAKE2B 6292dbece6db78dd0574d0800e91f8435c31e96d0682a19256b1ec6d146bfe9090deda7e156fcaa8876e219a202bb4d3bed70e2f46836e2bb58ecc73a5d45789 SHA512 869c1f29f8d81081f56cf4a279dbe3d13e92f2cf0a6d13a26b4f264a99a442da8f4fd106397601cc8f96c79075159b6d7d2be3158977ff50db76a11dab0a5bc4
-EBUILD nessus-bin-8.15.2.ebuild 1986 BLAKE2B ae76f7234fce71623cb7e5f661a393b35a5556f0b5f755a286e590d03f26243a22bb617bb4c08fff77609378b50bb149e34ad406b5e70ff25e23404231871781 SHA512 a5546219ee0993e20987700876389832e9b88b0b03204b5c86535ef0ce216bdcae8be6639d4551eb635dcd197363cd1d8a1080efbb2bf7d806cb3a30d9d4c398
+EBUILD nessus-bin-8.15.2.ebuild 1989 BLAKE2B ac48b9a95507f50cc029de2c9e1ce018bb73f51442e459f7f8e4f4e62540b6d7a9f728534133cd748be6bde5d222494ddb7f68da506c49458dd283df8c5d9bc0 SHA512 5aa02507bf22b6fc7e23e46a1ee51886c64af45b444e5b0a71a3df74da81612b0819771e4960b4a589d4cf4ad719e4edeff169766e1d6ea42b4d29f8bea05811
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild
index 16fed087a328..6620c073f75f 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.15.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${MY_P}.x86_64.rpm"
 
 LICENSE="GPL-2 Nessus-EULA"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="-* ~amd64"
 
 RESTRICT="mirror fetch strip"
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 14b4ad5bba52..9a0116f0f37b 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -19,6 +19,6 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
 EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
-EBUILD nmap-7.92.ebuild 3170 BLAKE2B 0549512ba9da5a1668bcd7171b0fffd17158cb901a6cf8f7bd487a610b3ba69f2fce1dfcaa9b2753b7dd82dca683f589270e67752dad2601e4e5969094e43fdd SHA512 8e3607d567a8c4ba175a6f0a386b46f93ea2d8901c3f9b3aae12391ba23bc0c08b28ed62bbc0d27800faacfdf2ccdb4e0bbb34683cf7f1b9d9d9365b34149fe7
+EBUILD nmap-7.92.ebuild 3177 BLAKE2B 46763833cb3b3c578f27476fd2bc93a9cfa41d500099f5f10e6971a4dbb3826b7e2046f457141abb72574d63520819dec0f7e220036fa4104d78b092d4d9b890 SHA512 f26f4841a5e5f7838eb06699982bbf72468a129d44ec9ff62bea18c8a674fe788fd8a82cf85d6b400e4f23d1fc639a710cafdab8d38878a1df04db87d38abd1e
 EBUILD nmap-9999.ebuild 3222 BLAKE2B fde1fd8e24e9f912f02b16bd92aaa5f4981114cdbf300a657eb6e3ce60e463cfff45f82bd9755481c884db0534823f1f43a758e9243a31cd8193b3b569fc9558 SHA512 e65d00ee53d629596e0255471a200ea5ed1ea70be1840e6ece49b2d475342226e814aaa5f51fad32b35dbbaf003b5a789f5d42436fdaa8e73b087a907a771362
 MISC metadata.xml 980 BLAKE2B 846ba0a3b3f6da9185f8d8ef3a30e76ffa84da73a3714724493359729af26790cdbe7148058a45d289dbedade8a55ef5608c334c6bfb4cbc61b5ae4db15ef31e SHA512 40bf1717c4f450cf0221c6760b03d33282fb500f29afe0bbf72977d0010dfd57e8a0e07ae67e5ee8ebc671f5ad502722ca0b068a527f98e9506be869a603b074
diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 8b3167e3b42b..ab5c1cca1c67 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	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="|| ( NPSL GPL-2 )"
 fi
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index d303f8abcede..0f40068f9de6 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -7,6 +7,6 @@ DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 37424499cff6a5e1dc811f96e1677f4efdb996be069f4474726387dd33bff2305c1cac3127a3330621bbd1cf111f181c4b0a7f47f4a7773d78ff4448f57f4c6e SHA512 b0f937130dacca550c89314f599c32bc6b36747bc90e884a58b4cfbda2a1f28fb2fd1fc66e5507b3412b26ce7c9039fa562cf53d123f92fb5cabe48fa7f24573
-EBUILD openbsd-netcat-1.195-r1.ebuild 1736 BLAKE2B 13f8074a8a4f6bb1d8a39f4cca3216df7200d675b3cc9cf4ffb52444245e78cba4c5248b777fbf01fa1b87e5a7a0c72bf93082b3d455aee6d9750a17d7b6433c SHA512 484fddf115f7c38a306bfcec77d19d921a2c9fafb6f0d1630cb44ed99ed3eb71dc31acbc90eba2499f4524085bd8db6f4b8db0f0a92688b956043b84f22a8e9a
+EBUILD openbsd-netcat-1.195-r1.ebuild 1743 BLAKE2B b5ee84f05aae6f9b09a00b35f0cbbd750da09a4c3d434ef67a8af98e4333279372951b7d8dfaa915315628fe74d10e10fa54c3006c01e46ac68f97f284b5d32f SHA512 729f774835db7977c3116e10d84f81bc727b24c170a0f098d678af9a3caf2904828230516dbf083965c3e11f93baef6c5d49d8b8952256a54f98485bf05e22b2
 EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 97c48f8f148eed200429efa52e13ef924d92be828bcbd0045e5ecde9664e0c71951254b0bef38bd9f738be2f59e49893218635c92e752ac45d9ab13f54a5fcff SHA512 a5696d2915e8dc5d11d9756917717420ac08fbb319aedee66171299290c13f4ac3e55775d9072cc24b31e15df01d7f9374b98cc2a9c22b6ffc7cd5d83b6a57d2
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 5d630245ac74..6cf8215e03c8 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="elibc_Darwin"
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5af660808f4a..5f825ebc37a1 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -4,7 +4,7 @@ AUX pmacct-1.7.6-nogit.patch 617 BLAKE2B 2e8d0874bf97ceeb0be43ecea9be9bb29094a4a
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
 DIST pmacct-1.7.6.tar.gz 2126837 BLAKE2B df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 SHA512 b370d20f8b8d49b9114db3ab74c66cd16962dee5e7c3642fab0b2787c4ea924a249ff4d8d770c0ccc8ca81366b9a5e557dcfb7cdddf878b99b719d0accdb949a
-EBUILD pmacct-1.7.6-r1.ebuild 2194 BLAKE2B 2598855ea314c214037533c41d15fb5dff436108bc755b05081420642c5474e2808c325f2dfd4d5520f3e4204f7a4b802dee2b807b401f79c415bdb07c244480 SHA512 b8a4168a1dca39fbb7fa3d743a54dcc535531656b583eb30bbe078a98a4d96163bf5a381e0bccd072d1726adcdd3dfe442910b54081a1aee8f4cda2aa388d091
-EBUILD pmacct-1.7.6.ebuild 2152 BLAKE2B cbf85e7d3c361e47956a7a0bdbbb1817f8269daf01518c2987beea2188877614c72a3f90071d1bf4e1bc8db00e46771c0431136ca6b9a9a1c2aa6cff6ee2d443 SHA512 d5542361095a1eccb7ba29f085d8b643eed7707e82dfa5c332bcb1ef2342555e88d46c3e78c53ad71442af668211936c923f8f6b84683c44560494c2e6e15102
-EBUILD pmacct-999999.ebuild 2107 BLAKE2B d27f89b663cf9e76e5d63b624b11becaf4e04a30a5c2abcd4328fb59b653caae32d2dc547ac4a2a47a06d2cd1c9c0dfbb0283801a7df820ded13f44d56b8c944 SHA512 3f9170823a7e3fd0e56bee0da6e92b51dc8ea0b270c240ea4f6b0a1aeb0a5bc0360d042518620fefb48769a0096e66d1e23e038e935950ac18e54ce7e735ff55
+EBUILD pmacct-1.7.6-r2.ebuild 2154 BLAKE2B e27390ed851b65f2040d0206dfec450cb3c76e47c873c28bd3328c34f732f094b64e8155d8ababa2456a654de58f3e6ee04232df842dd9a38c5541173bd62436 SHA512 29b3def341c1d7733afdc39a400f28b8d1e7adff7383e14b3d4f3a5ddf9b9b1fb95a6626e901b0b2feaa3ab4946414e3fcd1da95c6e1f86e3ca9bd8dfe45edb5
+EBUILD pmacct-1.7.6-r3.ebuild 2196 BLAKE2B 257f50df7f45eed32ae95965998b77a11800dd4fa2f8f010442525002a262009a11619941aa4ad99076e39f59deceeb05f8a6853036c6c55642441d2b3359c4a SHA512 dfc7ec6b9f33cb21797271ac5b533dcce5a3c36bd0696fb116f6534a5c0c77354bb663671642403d46141c8ea7662930432c0618bc6c50cd86efc0614409eab1
+EBUILD pmacct-999999.ebuild 2109 BLAKE2B 42b545bea0b7c97d1bb12a8c2247be19fa6b335703b160b77d4a6cfe292258a87660b026eedd626d7d7e4669239eb866f852caf1fdc5800e0c4334cd8a00296f SHA512 e39cb151c33ac53a22376a55a5d23d99561a5c7fcddbecf42dc966e1112824a16e86aae9925a3c66645d68aa8230f71061defd3f4c41b3807b7bb73a2ac1d6f2
 MISC metadata.xml 1241 BLAKE2B fdaae9649fb01505523873cdf5873329e4a636b4cc7087f5bcf9cf0dec5acc907d6cca8a8bb0c9e8b5ab378aa76c6ab5dea5da42647daca8a1a218c0ae1985a2 SHA512 5f94b8356e7c0be897534a2a78ea78b43bd763764a179e90a44ba662dbffdca4ce12505d64c973bbd8bd51dbe5d45a40b2ff3576a0af8f8d88d0ae31e9c6228b
diff --git a/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r1.ebuild
deleted file mode 100644
index 2f066465acba..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.6-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
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
-	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="dev-libs/libcdada
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mysql? (
-		dev-db/mysql-connector-c:0=
-		sys-process/numactl
-	)
-	ndpi? ( >=net-libs/nDPI-3.2:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
-	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
-	"${FILESDIR}/${P}-fix-mysql-crash.patch"
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--without-external-deps \
-		--disable-debug \
-		--disable-mongodb
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild
new file mode 100644
index 000000000000..41834f7749e8
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.6-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
+	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="dev-libs/libcdada
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson:= )
+	kafka? ( dev-libs/librdkafka )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cflags -fcommon
+
+	econf \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--without-external-deps \
+		--disable-debug \
+		--disable-mongodb
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild b/net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild
new file mode 100644
index 000000000000..07c9fac4b6b1
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.6-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
+	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="dev-libs/libcdada
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson:= )
+	kafka? ( dev-libs/librdkafka )
+	mysql? (
+		dev-db/mysql-connector-c:0=
+		sys-process/numactl
+	)
+	ndpi? ( >=net-libs/nDPI-3.2:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
+	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
+	"${FILESDIR}/${P}-fix-mysql-crash.patch"
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cflags -fcommon
+
+	econf \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--without-external-deps \
+		--disable-debug \
+		--disable-mongodb
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.7.6.ebuild b/net-analyzer/pmacct/pmacct-1.7.6.ebuild
deleted file mode 100644
index 3cebdfe03e0a..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.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
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog
-	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="dev-libs/libcdada
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mysql? (
-		dev-db/mysql-connector-c:0=
-		sys-process/numactl
-	)
-	ndpi? ( >=net-libs/nDPI-3.2:= )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-	zmq? ( >=net-libs/zeromq-4.2.0:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.4--Werror.patch"
-	"${FILESDIR}/${PN}-1.7.6-nogit.patch"
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable l2) \
-		$(use_enable mysql) \
-		$(use_enable ndpi) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--without-external-deps \
-		--disable-debug \
-		--disable-mongodb
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 4e643ff1e80e..4446fb29a9c9 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="dev-libs/libcdada
 	net-libs/libpcap
 	geoip? ( dev-libs/geoip )
 	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
+	jansson? ( dev-libs/jansson:= )
 	kafka? ( dev-libs/librdkafka )
 	mysql? (
 		dev-db/mysql-connector-c:0=
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 18b2a09ad075..9a873562a4f2 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -3,5 +3,5 @@ AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-5.2.0.ebuild 960 BLAKE2B 86f6e65e18e9c191cc7b113df6af2685851035681cc969bd9dc050c67a6635aaab54ff14b5f71528676528c81845082fe63ad5be816f2af9ca884596892d4fd8 SHA512 2cb32c632cfd85cb6e38b2f40b930b7b15e73f9b5b8940fc3c02e47eb08c0823fd1e0205d2287af0c753fc069eee250ac5e0baee4e94a736942d63b44ad6f059
+EBUILD prelude-correlator-5.2.0.ebuild 929 BLAKE2B 6e537c11c71d2d517b166fa3b6d57bd6c46e1f46e4d4e9c270b3b8e11b637d6c538b4c81802d0ee4eac0f3c5d6d59c02962f1068f3087d3c222ee1131af6eea7 SHA512 36d0ab00c987b09563d6e3a8168a3f4a14fff004a3d1e00942a9c5772ad555ba8d7ea8fd1364649d075a26a615d34b0b1c4147288b261bcf7acbef69ac994636
 MISC metadata.xml 855 BLAKE2B 1b31c4e7f6b471368016c8a2371cdf30bc4edb6b6cb4b932c8aa4a9df6620d6fd7022d247111915b15809d06975a006f152498f55bdfd4afca8cd7a3926918c4 SHA512 cfbcbbff8b38cad5c67e9307ae8576ae927ebdbf8a3f319d2e555d257414c7c8dbbc61886201a05254fe778b894c9a749ac187e7b1441297022e87a726a5a7cd
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
index 359b4c7a6bfd..e317719f5e8f 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 systemd tmpfiles
 
 DESCRIPTION="Real time correlator of events received by Prelude Manager"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-analyzer/ssmping/Manifest b/net-analyzer/ssmping/Manifest
index de15c9692aba..6aa37e85627e 100644
--- a/net-analyzer/ssmping/Manifest
+++ b/net-analyzer/ssmping/Manifest
@@ -1,4 +1,4 @@
 AUX ssmping-0.9-build.patch 461 BLAKE2B 5a8955ac770ec5f69d9756d0644e5599e7235e25de1cf77664cd113a0d8ae337b25af63d4f2e5023def7071e4c2eb1a8ca24379d18f83f06ac8ff2ccb1ea6157 SHA512 5072d9e02e987a3f48fdcd4b89c9f4129f50fbb5781c2b234415f8b6bef4ed4682b3e7176e8dc629a080ffb7ccdf4e49864917c8c8d63dddb7e384e7522a98cd
 DIST ssmping-0.9.1.tar.gz 16863 BLAKE2B f3ebb2940197feb8f280369d3d217c8335c64265e001d24b6e75b10dff5df0fced29b005267eb57abfd8b6aa41c2071aba69a766a85877aefe3c765134ae1454 SHA512 7929b43867f29ac7f93298820149fd326d8540187a59e4f28f226e1c0dbfcdc60dc3da437de250e4082a2d6bd845ae9e619bf3b592b824dd8d529bf093cdedff
-EBUILD ssmping-0.9.1.ebuild 555 BLAKE2B 1737c44eed2d6d63893a52c5752c2e35b56acffb7a8747d868fcad1bdb10a3d34dd1f26e2d798edd79499fd5c19c7d326c34e5e5378f6d18b8ea430678dc37fe SHA512 fd6559fedcb3698c17c6c4df0bec4c746fdd0280f0516b3b963ac0490018d9389d3830c1f4bfa95f717c4fd17d8480d9ae19943a2699fa4c2dbfcb0f90c4a2bb
+EBUILD ssmping-0.9.1.ebuild 562 BLAKE2B dc1b7ea6452b0df465e3320485fff4adc7bb3ca9d831917ee45d568c96079e7530488510e4e0732b922e4f818d6bdbe364a709c6edf03179c9f5e46c67110806 SHA512 dee7c6a1e636cfc2df86a1d0724b6662cd54ad2098046805e8f3c424fea12d1eda9d5c2ac4a0d85988658c0d0a3513caf5be44f256555dc83b668e75a8683571
 MISC metadata.xml 279 BLAKE2B b9b6bac5b09551b7e62c9535de3c9ba58586a9cbfb713bca4b70873b608f3ef4acb5ef585d1396118b79775716f29cf91254952eeec0ac2908cfdd2113a8d657 SHA512 a704a3dc70101d88b83c7754f2ad046a3699b3f54a2f4aa6efe3f096acc3e339c385fbce6d88e13ce27377a8525488a8c5584c8d836ac5bad91990afb9905956
diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
index 09a3d41b512c..13fb78913e09 100644
--- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild
+++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9-build.patch
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 375001131619..ad923f89b54d 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -9,6 +9,6 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
 DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
-EBUILD suricata-5.0.7-r1.ebuild 6468 BLAKE2B 365367825f8dc37ed14b4f32fd18a597f70ecab1d416ca0f057ac64e4160fb79e671ec30e449c44f3e8d0049f453cabcf2cea28c0560576c3e200328f47b6190 SHA512 02b64dca591e53aa7d616fdd2693a2d981d85b08a4c7e0e61c06f450408df45ebc8e9f9b5d71dcd0fd04954e79bd85ad1c3497aa71f5fb5b0e4d28bc2d38ff96
-EBUILD suricata-6.0.3-r1.ebuild 6751 BLAKE2B 03efa3e98d85808eb5f02c3ae1298c2ac09ef4c2d00a612d6e44c881cc31e589d5845d00157abbf45e21ce6c932a8bb0ed8c6402f019fa91fd1cad6ea1e1e035 SHA512 f72c53d9ee8fe398e95ef84004ea6f881dfc15465cb1a81e6e7ae7655127a059729801782d0e4d8211aa6f847e28574c914c5d533be8c037afef1b673a6ac970
+EBUILD suricata-5.0.7-r2.ebuild 6470 BLAKE2B 08fb2adebf4d1dc11a22f04002d75c846e8f26f44ae76431e5bcea09098734b4bb5d2d5accc8421fd40047bbb5726bd91f9e3e507c35adff8a1218592463e717 SHA512 aeeb96b5a8355530f7d592a1daa1dcb0fc1fd7f47b10a004395c763639a14f18b1705c80fdd51f0761ab96b42586010f8b0fcee383245bfe3905eaa677220cf4
+EBUILD suricata-6.0.3-r2.ebuild 6753 BLAKE2B dd6b148a12687c0f400625ccb4e3606e874642bf0836e7d3216e5858bd6a83d7390fd796fc46f574ab4dc833dc9c29c9ce951c5909eb9fb414088f66b2aac32e SHA512 f78de6e2aca5034e9d4486df037c9400bf373f39184fe2842bd061f42864d7a5df9478a7171bb861c9817f6be11b06d64781182e08b2df72cf9bcfedf0f4815f
 MISC metadata.xml 1047 BLAKE2B 8418aaa86ecf0e2baaf3f927c764dd8f0471f29c0b691ec3baac6988291e9e591ea4263b89a4a25b44cc2642d58bbffcfa5fdecd628ea101e4dd3d67e1914515 SHA512 1e6e38f2d0cd4335e274ab1ac72a445a3bfdd7a5c028d06a387e0f879cf7859681856ff03986816d5dae1ac841958652003b5c8057187885c579a695f8bc11cd
diff --git a/net-analyzer/suricata/suricata-5.0.7-r1.ebuild b/net-analyzer/suricata/suricata-5.0.7-r1.ebuild
deleted file mode 100644
index 58594b6169af..000000000000
--- a/net-analyzer/suricata/suricata-5.0.7-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata.io/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bpf? ( af-packet )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	acct-group/suricata
-	acct-user/suricata
-	dev-libs/jansson
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	>=net-libs/libhtp-0.5.38
-	net-libs/libpcap
-	sys-apps/file
-	sys-libs/libcap-ng
-	bpf?        ( >=dev-libs/libbpf-0.1.0 )
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/libmaxminddb )
-	hyperscan?  ( dev-libs/hyperscan )
-	lua?        ( ${LUA_DEPS} )
-	lz4?        ( app-arch/lz4 )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.69-r5
-	virtual/rust"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
-	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch"
-)
-
-pkg_pretend() {
-	if use bpf && use kernel_linux; then
-		if kernel_is -lt 4 15; then
-			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
-		fi
-
-		CONFIG_CHECK="~XDP_SOCKETS"
-		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
-		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var" \
-		"--runstatedir=/run" \
-		"--enable-non-bundled-htp" \
-		"--enable-gccmarch-native=no" \
-		"--enable-python" \
-		$(use_enable af-packet) \
-		$(use_enable bpf ebpf) \
-		$(use_enable control-socket unix-socket) \
-		$(use_enable cuda) \
-		$(use_enable detection) \
-		$(use_enable geoip) \
-		$(use_enable hardened gccprotect) \
-		$(use_enable hardened pie) \
-		$(use_enable hyperscan) \
-		$(use_enable lz4) \
-		$(use_enable nflog) \
-		$(use_enable nfqueue) \
-		$(use_enable redis hiredis) \
-		$(use_enable test unittests) \
-		"--disable-coccinelle"
-	)
-	if use lua; then
-		if use lua_single_target_luajit; then
-			myeconfargs+=( --enable-luajit )
-		else
-			myeconfargs+=( --enable-lua )
-		fi
-	fi
-
-	if use debug; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
-	else
-		econf ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize
-
-	if use bpf; then
-		rm -f ebpf/Makefile.{am,in} || die
-		dodoc -r ebpf/
-		keepdir /usr/libexec/suricata/ebpf
-	fi
-
-	insinto "/etc/${PN}"
-	doins etc/{classification,reference}.config threshold.config suricata.yaml
-
-	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-	keepdir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
-	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
-	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins etc/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	elog
-	if use systemd; then
-		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
-		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
-		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
-		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
-		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
-		elog "For details, see the section on drop-in directories in systemd.unit(5)."
-	else
-		elog "The ${PN} init script expects to find the path to the configuration"
-		elog "file as well as extra options in /etc/conf.d."
-		elog
-		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-		elog "then create a symlink to the init script from a link called"
-		elog "${PN}.foo - like so"
-		elog "   cd /etc/${PN}"
-		elog "   ${EDITOR##*/} suricata-foo.yaml"
-		elog "   cd /etc/init.d"
-		elog "   ln -s ${PN} ${PN}.foo"
-		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-		elog
-		elog "You can create as many ${PN}.foo* services as you wish."
-	fi
-
-	if use bpf; then
-		elog
-		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
-		elog "because their configuration is hard-coded. You can find the default ones in"
-		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
-		elog "and the common location for eBPF bytecode is"
-		elog "    ${EPREFIX}/usr/libexec/${PN}"
-		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
-	fi
-
-	if use debug; then
-		elog
-		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-
-	elog
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To download and install an initial set of rules, run:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-	elog
-}
-
-pkg_config() {
-	suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-5.0.7-r2.ebuild b/net-analyzer/suricata/suricata-5.0.7-r2.ebuild
new file mode 100644
index 000000000000..8fb9132b46eb
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.7-r2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata.io/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bpf? ( af-packet )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson:=
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.38
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	hyperscan?  ( dev-libs/hyperscan )
+	lua?        ( ${LUA_DEPS} )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable hyperscan) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+	if use lua; then
+		if use lua_single_target_luajit; then
+			myeconfargs+=( --enable-luajit )
+		else
+			myeconfargs+=( --enable-lua )
+		fi
+	fi
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in} || die
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins etc/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To download and install an initial set of rules, run:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+	elog
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/suricata/suricata-6.0.3-r1.ebuild b/net-analyzer/suricata/suricata-6.0.3-r1.ebuild
deleted file mode 100644
index 29b2cdff3c06..000000000000
--- a/net-analyzer/suricata/suricata-6.0.3-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata.io/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bpf? ( af-packet )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	acct-group/suricata
-	acct-user/suricata
-	dev-libs/jansson
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	>=net-libs/libhtp-0.5.38
-	net-libs/libpcap
-	sys-apps/file
-	sys-libs/libcap-ng
-	bpf?        ( >=dev-libs/libbpf-0.1.0 )
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/libmaxminddb )
-	hyperscan?  ( dev-libs/hyperscan )
-	lua?        ( ${LUA_DEPS} )
-	lz4?        ( app-arch/lz4 )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.69-r5
-	virtual/rust"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch"
-	"${FILESDIR}/${PN}-6.0.0_default-config.patch"
-)
-
-pkg_pretend() {
-	if use bpf && use kernel_linux; then
-		if kernel_is -lt 4 15; then
-			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
-		fi
-
-		CONFIG_CHECK="~XDP_SOCKETS"
-		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
-		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	default
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var" \
-		"--runstatedir=/run" \
-		"--enable-non-bundled-htp" \
-		"--enable-gccmarch-native=no" \
-		"--enable-python" \
-		$(use_enable af-packet) \
-		$(use_enable bpf ebpf) \
-		$(use_enable control-socket unix-socket) \
-		$(use_enable cuda) \
-		$(use_enable detection) \
-		$(use_enable geoip) \
-		$(use_enable hardened gccprotect) \
-		$(use_enable hardened pie) \
-		$(use_enable hyperscan) \
-		$(use_enable lz4) \
-		$(use_enable nflog) \
-		$(use_enable nfqueue) \
-		$(use_enable redis hiredis) \
-		$(use_enable test unittests) \
-		"--disable-coccinelle"
-	)
-	if use lua; then
-		if use lua_single_target_luajit; then
-			myeconfargs+=( --enable-luajit )
-		else
-			myeconfargs+=( --enable-lua )
-		fi
-	fi
-
-	if use debug; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
-	else
-		econf ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize
-
-	if use bpf; then
-		rm -f ebpf/Makefile.{am,in} || die
-		dodoc -r ebpf/
-		keepdir /usr/libexec/suricata/ebpf
-	fi
-
-	insinto "/etc/${PN}"
-	doins etc/{classification,reference}.config threshold.config suricata.yaml
-
-	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-	keepdir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
-	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
-	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins etc/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	elog
-	if use systemd; then
-		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
-		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
-		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
-		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
-		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
-		elog "For details, see the section on drop-in directories in systemd.unit(5)."
-	else
-		elog "The ${PN} init script expects to find the path to the configuration"
-		elog "file as well as extra options in /etc/conf.d."
-		elog
-		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-		elog "then create a symlink to the init script from a link called"
-		elog "${PN}.foo - like so"
-		elog "   cd /etc/${PN}"
-		elog "   ${EDITOR##*/} suricata-foo.yaml"
-		elog "   cd /etc/init.d"
-		elog "   ln -s ${PN} ${PN}.foo"
-		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-		elog
-		elog "You can create as many ${PN}.foo* services as you wish."
-	fi
-
-	if use bpf; then
-		elog
-		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
-		elog "because their configuration is hard-coded. You can find the default ones in"
-		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
-		elog "and the common location for eBPF bytecode is"
-		elog "    ${EPREFIX}/usr/libexec/${PN}"
-		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
-	fi
-
-	if use debug; then
-		elog
-		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-
-	elog
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
-		ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
-		ewarn "If you need unified2 support, please continue to use suricata-5."
-	else
-		elog "To download and install an initial set of rules, run:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-	elog
-}
-
-pkg_config() {
-	suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-6.0.3-r2.ebuild b/net-analyzer/suricata/suricata-6.0.3-r2.ebuild
new file mode 100644
index 000000000000..d8e374f6afc6
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.3-r2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata.io/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bpf? ( af-packet )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson:=
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.38
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.1.0 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	hyperscan?  ( dev-libs/hyperscan )
+	lua?        ( ${LUA_DEPS} )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch"
+	"${FILESDIR}/${PN}-6.0.0_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable hyperscan) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+	if use lua; then
+		if use lua_single_target_luajit; then
+			myeconfargs+=( --enable-luajit )
+		else
+			myeconfargs+=( --enable-lua )
+		fi
+	fi
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in} || die
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins etc/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
+		ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
+		ewarn "If you need unified2 support, please continue to use suricata-5."
+	else
+		elog "To download and install an initial set of rules, run:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+	elog
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 82ad87af0038..dfe4169f5dcb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
 EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
-EBUILD wireshark-3.4.8.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
+EBUILD wireshark-3.4.8.ebuild 7268 BLAKE2B 411034706ba52711d08e0ca5fc82e59506b3567968ae8b35adb785e13bbd374b7b34f58380d77aa573311969dc9ad1bdef5573ec64939b193d46755c9ee8f328 SHA512 68c74146158b572f200dc604c417623dd359f885a7d55fd54fd8b3d452e119f1589fa210b57c2ec1d80af4377fc4b283f4a5a9790a945fbe3f49d92dd13c37b1
 EBUILD wireshark-9999.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 4871d3fcafeb..f16c381920aa 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 23739c2839c1..547dd7ebec29 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index dbdb00f3e132..276d2874d4fb 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -5,5 +5,5 @@ AUX lrzsz-0.12.20-gettext-0.20.patch 850 BLAKE2B f3d810b7335c33f1e28247cd7a68d50
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r4.ebuild 1586 BLAKE2B 906e13fd5c38487ced02fbb88e3bd29c4ca02526690c7dcfc73049e78619f6d172aecdbf064f0ef9f6804d3bc405c233b37a6e1ebb86de9e49c823a921bf5cfa SHA512 22ea526e72c100258ddd016553816942c4ce3610352e8010796ed35f004dce3ece1cd6655686ae0b42c2b4e821def00bc1933f43a72d10d1c5ff1d250f93d043
+EBUILD lrzsz-0.12.20-r4.ebuild 1593 BLAKE2B a03823f58d7a209e121167434cab4a605626dfaff982f60102adf3afd9f928fd00f1f67241addb0c13241cf7684d5504c7ef7fcccd46195b19af26fec578e45a SHA512 c5a677efcc5da003e848c913668fa9048e8932f31cb370c02e5cb318f7c083428dd589df396a678c66f4c0570694bdbc600f5e03549c9e04ef4333f9b4aa2050
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index b5461864bb7c..b89e6b98f2c8 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 7dd7ec0609e9..f614d4c20c80 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -8,5 +8,5 @@ AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
 DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
 EBUILD minicom-2.7.1.ebuild 1346 BLAKE2B e90609e4c0ace7d210b644e2c02deaaf60686dd779e6df1ca3a2b724e33f8a707a230aaff594ff0e6dc295d89546bf2e2e27d9174334b852327b5e8b4f747cf3 SHA512 caf7634c4d8e11d209d9a18130f4c40be955aa98c62b9352ad8ef6b0cd2ba433985e970820b4591a8f5ee67348af21c460e6d7e0edb6400fb23ed6629caddbea
-EBUILD minicom-2.8.ebuild 1138 BLAKE2B a68ee6e814783bc28a767ac7b229f04f5cd873e97172bafc59fae15a5c7e39debc4d6d6910e2082b22912eb160598480e0940c3510764fbece446bccb274f7ee SHA512 784635a81ce14df079e2c2a798c79b3ff2d2077653880229845b6da8d7fc4f71c91b702e76919ac9b331fa30fd2a82b2bc5275bcf2cdb429784a79480125bf0c
+EBUILD minicom-2.8.ebuild 1145 BLAKE2B e75c061da5c2d3e4088e985f0e7af5e26bae13bf0e41558341dfe62671680035d2bb77e95ff1bd19472ad57ec3198268735bdefc23f2f8efa81d7aa0a19d5978 SHA512 9d00f58d1ad7af3a58eed564e33fc3210397a00e965c734b50a7c0a21b540c12fe135329e1c35f79f95168e4b0d14febb3926e52a04ade1bf3cc04e2703294c0
 MISC metadata.xml 529 BLAKE2B 3b898729ec228a2557e80c69f47f73c4fa16e2cab7934c6c7792a8a4704fe7a428843dcc8e5c61416e0a3346e5f4dc3c932a6a72f15744ee530cc22c17145d2c SHA512 6a4a40a24146a5b33402ff508a47b0b159511930e564f3b4aad1b09016a48db7d1e127babe09d4ebee08321334ef669f3d48b9dc191f411fdf6766ae96131309
diff --git a/net-dialup/minicom/minicom-2.8.ebuild b/net-dialup/minicom/minicom-2.8.ebuild
index 6b1839b3b1e2..d68e0a208e56 100644
--- a/net-dialup/minicom/minicom-2.8.ebuild
+++ b/net-dialup/minicom/minicom-2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c1af50f684e1..14b585c1fea8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 61e966ec514c..6583618a7030 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -7,7 +7,9 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc334
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
 DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
 DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029
+DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
 EBUILD dnscrypt-proxy-2.0.45.ebuild 2832 BLAKE2B 1f4f1532670c887f22fd04cbaef47abcafc658d29a66ee2e662d030e1c9fad54c558d7ee4546af940fc72b7e4d7b0f22d7d71466899264726fdc8fca5a641d2f SHA512 ec71d789ef81d3dd5b90fa5b8dc436242525c6d95b2ebd12e6ae1a653da69a5bc403f19753566c992c205a94214caccf2ba8c6fc41b8e1a5e0d422f4d512b4db
 EBUILD dnscrypt-proxy-2.1.0.ebuild 2833 BLAKE2B 736cc68e0f8d7d98aa4d3a98dbcd64a56138b91921e8a899f5c3bf7622840ddfd2b5e9350c63576e337f54a4b5386385eb87058fa1cdfea3dcee652819acec1e SHA512 35bac5465c345aa6558d3882d73c053b08b920286ed86ac9417a927ad5cdaad130c32c5d12a74d19243f6bf7d344725631ce918e0ade59feac3812d6aa62af05
-EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B ada23235d56488fdb8339b0ee00cc19f309f7dc15687baadf9e677c28d38c3498062a1c3cec607739228471f7ffc6ce293d495c989a99fdac3d9d9ae75bd3145 SHA512 7a8ecb736fd88a4fdafc58f3dcf5f32e4c1e8b91cb29029f5258ebb61b15ae222836d2a277820f8326c0639daed8aae5250fb562a695ab46b67d480f858926ea
+EBUILD dnscrypt-proxy-2.1.1.ebuild 2837 BLAKE2B 22085dcfbe06de07c55afd2bc405f5e7bf5325f941175db34331c42c75d589c0db9b8ee1bc8930e16c7667f9afcbc3c3f8d6eea912653d349ac4bedf5f68b991 SHA512 9c924e578eb2870ace30ad932ae050df222af11988b8dd518e49d7321d79d884252a8847909b84f12244a76869a28c83403a7a8d7030fe4ccb8f3ea3df35512b
+EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B 22085dcfbe06de07c55afd2bc405f5e7bf5325f941175db34331c42c75d589c0db9b8ee1bc8930e16c7667f9afcbc3c3f8d6eea912653d349ac4bedf5f68b991 SHA512 9c924e578eb2870ace30ad932ae050df222af11988b8dd518e49d7321d79d884252a8847909b84f12244a76869a28c83403a7a8d7030fe4ccb8f3ea3df35512b
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
new file mode 100644
index 000000000000..3e4c51ce549e
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/DNSCrypt/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
+)
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blocklist/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index ef2293465894..3e4c51ce549e 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
 
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="pie"
+IUSE="+pie"
 
 BDEPEND=">=dev-lang/go-1.13"
 RDEPEND="
@@ -31,7 +31,7 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.45-config-full-paths.patch"
+	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
 )
 
 src_compile() {
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index 6b8b0463f7bc..81e8b6cde665 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -2,7 +2,9 @@ AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b248
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
 DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6
 DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5
+DIST dnsviz-0.9.4.tar.gz 477971 BLAKE2B 3c8bebcea89bc6e78247c45c4266f73be4f9f618bfaa48a47460a43deb4789fe71eaa77eb4ff59c2d8e863cdfdddaf5908279aad93ffd63fdbe16d0966aa943b SHA512 b88d0ddff6279078a5222b4250a404c39db6d896d57bba51c878c8b8d01582deda2fe67b5f6370d7a98389e09ad46bdf3903d77fee91c0291b14a9109f1739e3
 EBUILD dnsviz-0.8.2-r1.ebuild 1665 BLAKE2B 8fc98b6e8541017e8ef69860f5f4c303ae0bd1052df844d292d32b9f4cbe8fa8c948c113cabbd79c3956637401c3ce6296e327b7c469a63eb9e12e6966d6a95f SHA512 6d282ff6cd563d83b8fe667bc65ba16dd714938301df646025d6f68cea456e6eb1390fc18279ab4bf3f8d143d151c648d688d2c76b8b8e0653b7e02a1b1fad0b
 EBUILD dnsviz-0.9.2.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
 EBUILD dnsviz-0.9.3.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
+EBUILD dnsviz-0.9.4.ebuild 1463 BLAKE2B 4e6edb36d324916f1e1c6621bbfb7f7c9c3787884e1627d4e143e41c9436dcaf60a8fc8c9634a6f2cc9ddb55c7aff0a48f59605442a15ccb266f932332b27525 SHA512 275db92fe4f428bfcac1df9b0cec66d0bfc3257ac623cff47a626e073f0e4875fb9b0c7a0ca505905d4e4d94fbce76044f69ada744d5069edbf8a521524eac8e
 MISC metadata.xml 830 BLAKE2B d83cc62638ef68f4d189a48de04502833fc9c7bea7ed40487e3f1ed17cc72feb830c7b327eb533f54c48ecb67ac0b8309d4e7e388ac7a8165ef3c0ff3ed6691c SHA512 9233fd807dc00c7e2b32ff5182c1f6ed606c6481a9c8a7f8bbe7ae8bd6a82a4959a6335808577685575109cfcf9ac3503fd1e76b719018efb14ffa737c425835
diff --git a/net-dns/dnsviz/dnsviz-0.9.4.ebuild b/net-dns/dnsviz/dnsviz-0.9.4.ebuild
new file mode 100644
index 000000000000..b658637d8b29
--- /dev/null
+++ b/net-dns/dnsviz/dnsviz-0.9.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
+HOMEPAGE="https://dnsviz.net/"
+SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( net-dns/bind )"
+
+DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}]
+	>=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}]
+	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Fix the ebuild to use correct FHS/Gentoo policy paths
+	sed -i \
+		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
+			"${S}"/setup.py \
+			|| die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die
+	"${EPYTHON}" tests/dnsviz_print_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_print_run.py -v || die
+	"${EPYTHON}" tests/dnsviz_graph_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_graph_run.py -v || die
+	"${EPYTHON}" tests/dnsviz_grok_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_grok_run.py -v || die
+}
+
+pkg_postinst() {
+	optfeature "Support for pre-deployment testing" net-dns/bind
+	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 3066b7d787e9..f5ef5fd3a52a 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index f0483c6fc8bf..c76d4914f387 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -5,5 +5,5 @@ AUX conntrackd.service 273 BLAKE2B 24df8adeaf71d208d3314c3eec6d4d05ba9e211c3ae7f
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 DIST conntrack-tools-1.4.6.tar.bz2 499806 BLAKE2B 7c1ee1c5fc2b6f9d33c6cf850eca80978b8763317b1a76892cefb776130564f15fbd4e4554fdb08dbba93d9f16b7e4624a1b4dd5a631f747f5fcc0a5b01b8d5e SHA512 a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a
 EBUILD conntrack-tools-1.4.5.ebuild 2190 BLAKE2B 49e4d6cf2f37939da6d577c6de370d6a68e391a5c57c7f84a5d002befb231560d6e443d5070d0ccde1f888bcae67d9185d93aac4acfcc0dc4ae6359f49509f09 SHA512 7cdf3820923462eab080ab8c2b5ede6d3f4dd08247343aa7e0bcfdb0ed4f1e95538c1ea10a1d427470ce27df652f44bdcc9d1dfee1436adc3b51a5bf123c6e97
-EBUILD conntrack-tools-1.4.6-r1.ebuild 2181 BLAKE2B 8e1eb6be0ddb422bef3be451bdd383f5d7343dec1ddd94fcd6cfd86a611f8d6cb7d569c84dcc5337da93b56e138932e9ade5d37ebdc64b818df6e8ff5db10d6e SHA512 69a46d3ce719483799ddab73007b16df9f9b66ab6b4981fd443f6a362ab6a22c169575f5a062b35bc0062cab76574a6e85287195bb8271ed195bc92794acc07c
+EBUILD conntrack-tools-1.4.6-r1.ebuild 2188 BLAKE2B 0d470764de4874593b74fa91c72846617454762d5c4dad388a95401ffb08ce9e24a192d67af509c66ab52fc53e379b92da201ea223488ea566ebc3f720a76c2d SHA512 5ab5f24ef7e88a8ad089ef947c1d21394d79b251c5c57edf4cf8bc8307b28afc00c61764bf963ee833e90d1f442b5d42b9479e15fbf149d910d87afe4ab92e99
 MISC metadata.xml 1049 BLAKE2B 614eabcf8632ae879993c98ee216cb785f3695072029c272a1a86dff2066eabc3e69ec80cea0537e988b1c3f9256235935f45c7b62883d61dedd29786edcbe3c SHA512 74e3be48453d718aeaafb63d1a5c15a35dfb2adf62721f59c2896c7f80fd607a042ed166d275bc7d523de0b5bae4c310d77eec649fbc7ec50fa7d5c9919ec56f
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
index 16e2a2ae5f9f..228854d83c85 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc +cthelper +cttimeout systemd"
 
 RDEPEND="
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 61537a2cf7ea..85a952f04e32 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -10,7 +10,7 @@ AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f
 DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143 SHA512 1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180
 DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61 SHA512 dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab
 DIST nftables-1.0.0.tar.bz2 921053 BLAKE2B ee86a323170433c3ba62f80118947864aac0fe0aaeb48afeb5a116a48782185c83313ef1b5735c7749eb5eccb88f252b444d1ee908be25bdaa4d9c0b833c1dc2 SHA512 33460bef4ee76b7caa44fa5515357127ae84be468448cc838dd31919b6e045ba6195b761118d4c8a4219a9f008c4416542ce784f4daad94f3b44c0626bcdd014
-EBUILD nftables-0.9.8.ebuild 4283 BLAKE2B d8fe0db1b588ac9fe53b7d06d10fbd3b4ea5ab28bc7cf97bec1357422e5c9d29cb5709cac592071ab583b56018e591f120108e70f573226bc4c8bf95de2a7651 SHA512 ad668b9c2633fc2408d3d23850f3df02d26825a03a8675f84b962feec82f435fa64f022a9e5977895426ae7ff1655ac17e3b1dd3b3b53a4e4c5d342ac6c90a61
+EBUILD nftables-0.9.8-r1.ebuild 4285 BLAKE2B 4c03efb0f42ce1619c8aee1a27fa837dab27ab37c1b4db78428fe5391a0f7b7cd1b1f84c9affc52ee656d85e22055a4eacb4b09a69139239a8e480d8c3339c92 SHA512 d66b7e3072b28495cf87dcb3f55488bde050a3cce741a394b2ab9347f5ceaffca53cd258f530098c1ad87c0447d11c6fa6f77b462a00ff9b6d42caf3e0f7122a
 EBUILD nftables-0.9.9.ebuild 4553 BLAKE2B 54b3de2a5413532de597c7b496dcc83405136e442f1d9dca2e3c3cabe23f0ed8d2e84311d9091b62ec14e284cf768652f924cfd51df537a576d391026d82df2d SHA512 6d17349a2749437becd3d8a75c192e58d6019b49c3e99594d7f0f6989cb84b5a24820b843aed08cf6a43cdf359f63c250b7a00fdf2cb994c93faa31f3ad458b3
 EBUILD nftables-1.0.0.ebuild 4565 BLAKE2B f0afc01e4a040ee10068093d4a8013b6e982deb94a679f71b90a7943755feb332a6c93efd5005f948282f27321044aae3f913e515db8a23acd4b0445e1524398 SHA512 c33fa364d321b69b6b5b3c21b79ad1c7d38cc96e198e64776f65f0df186a2a25d45283d9566d510c7ea1f99802ef3e81ca2fa50436da1f322b027e6b6dcc9a4a
 EBUILD nftables-9999.ebuild 4559 BLAKE2B 2abaebf2633942855cee7b67aa2d1a93575a038be04c81b0811b81fb20e51f409393f865475678defcd0eabb7728bb10e75284831aa333cbcefef1776f6399f9 SHA512 4dd6d0ad1ebb25d6e394b8f0fd09ca348b2944f0f77a9963d704c7e69f7ca8664756d2a1e4b175b37aa3e19a64d84e236da5f8da60167aedb01b9ed0fc1c535f
diff --git a/net-firewall/nftables/nftables-0.9.8-r1.ebuild b/net-firewall/nftables/nftables-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..17044fb39c47
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.9.8-r1.ebuild
@@ -0,0 +1,166 @@
+# 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 linux-info python-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	>=net-libs/libnftnl-1.1.9:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
+)
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		"${@}"
+}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use doc; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		python_foreach_impl python_make install
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/nftables/nftables-0.9.8.ebuild b/net-firewall/nftables/nftables-0.9.8.ebuild
deleted file mode 100644
index 4bf62cdbc284..000000000000
--- a/net-firewall/nftables/nftables-0.9.8.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 linux-info python-r1 systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.4:0=
-	>=net-libs/libnftnl-1.1.9:0=
-	gmp? ( dev-libs/gmp:0= )
-	json? ( dev-libs/jansson )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	xtables? ( >=net-firewall/iptables-1.6.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		>=app-text/docbook2X-0.8.8-r4
-	)
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.8-slibtool.patch"
-)
-
-python_make() {
-	emake \
-		-C py \
-		abs_builddir="${S}" \
-		DESTDIR="${D}" \
-		PYTHON_BIN="${PYTHON}" \
-		"${@}"
-}
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		if use modern-kernel && kernel_is lt 3 18; then
-			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
-		fi
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix installation path for doc stuff
-	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
-		-i files/nftables/Makefile.am || die
-	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
-		-i files/osf/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# We handle python separately
-		--disable-python
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable debug)
-		$(use_enable doc man-doc)
-		$(use_with !gmp mini_gmp)
-		$(use_with json)
-		$(use_with readline cli readline)
-		$(use_enable static-libs static)
-		$(use_with xtables)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_foreach_impl python_make
-	fi
-}
-
-src_install() {
-	default
-
-	if ! use doc; then
-		pushd doc >/dev/null || die
-		doman *.?
-		popd >/dev/null || die
-	fi
-
-	local mksuffix="$(usex modern-kernel '-mk' '')"
-
-	exeinto /usr/libexec/${PN}
-	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
-	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-
-	if use python ; then
-		python_foreach_impl python_make install
-		python_foreach_impl python_optimize
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	local save_file
-	save_file="${EROOT}/var/lib/nftables/rules-save"
-
-	# In order for the nftables-restore systemd service to start
-	# the save_file must exist.
-	if [[ ! -f "${save_file}" ]]; then
-		( umask 177; touch "${save_file}" )
-	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
-		ewarn "Your system has dangerous permissions for ${save_file}"
-		ewarn "It is probably affected by bug #691326."
-		ewarn "You may need to fix the permissions of the file. To do so,"
-		ewarn "you can run the command in the line below as root."
-		ewarn "    'chmod 600 \"${save_file}\"'"
-	fi
-
-	if has_version 'sys-apps/systemd'; then
-		elog "If you wish to enable the firewall rules on boot (on systemd) you"
-		elog "will need to enable the nftables-restore service."
-		elog "    'systemctl enable ${PN}-restore.service'"
-		elog
-		elog "If you are creating firewall rules before the next system restart"
-		elog "the nftables-restore service must be manually started in order to"
-		elog "save those rules on shutdown."
-	fi
-	if has_version 'sys-apps/openrc'; then
-		elog "If you wish to enable the firewall rules on boot (on openrc) you"
-		elog "will need to enable the nftables service."
-		elog "    'rc-update add ${PN} default'"
-		elog
-		elog "If you are creating or updating the firewall rules and wish to save"
-		elog "them to be loaded on the next restart, use the \"save\" functionality"
-		elog "in the init script."
-		elog "    'rc-service ${PN} save'"
-	fi
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 4672497e13e0..b87e11f7ca9a 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 64ed05522f1d..bb38fccb91f3 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,10 +9,10 @@ DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
 DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
 DIST samba-4.15.0.tar.gz 18895040 BLAKE2B ac560e280d5fbea6499547de480f973bf1987558ce6b832fe0f6e5bad8cd58180731e7d1a37f85fce82c52bf735106aedec3ccfda09fa430a5c435e2437994f9 SHA512 5fcd8797f0ac2821f1bb213c9a39c0928847905f701003618f9f160eaa98f3fea25e3d8d4047658b0bd164f3e6a2a63fd7b0133317e536997c764acf7803950d
-EBUILD samba-4.13.10-r1.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
-EBUILD samba-4.13.11.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
-EBUILD samba-4.13.9-r2.ebuild 9942 BLAKE2B 7bee9ff108d961c7974c3605cfeb5d9c58094b379079bfae49b7c6623bc3bcc0ae6e6ec698d190e4ef96a1948b514e3aa3dc6f4e6bc1fb63a5b9535e2de452ab SHA512 a79bcfd3bf0a4576bcc31468ccad7c73a59bb921e40641f23f4fbf2267ca0ee48967279141b7ae24283df730cda43be00f59a374565b30045a38567936f75081
-EBUILD samba-4.14.6-r1.ebuild 10057 BLAKE2B 09c03bddb265dfd9e7fd42dbda35e7620d2fa67553847b3736de1be865e6491fa3a5ef599bcdb81c42ff14511b6513e023f25cdaecbd8a7121fa2453af82dc3f SHA512 fff09de14784eddc05c6e23eb56f94931cf7d9f73e326a77af1eb2b9be62efaa1793c1eb96ac43ef759910a9d651308b648ddaeedb32ecfd48438ff7678dae9d
-EBUILD samba-4.14.7.ebuild 10057 BLAKE2B 09c03bddb265dfd9e7fd42dbda35e7620d2fa67553847b3736de1be865e6491fa3a5ef599bcdb81c42ff14511b6513e023f25cdaecbd8a7121fa2453af82dc3f SHA512 fff09de14784eddc05c6e23eb56f94931cf7d9f73e326a77af1eb2b9be62efaa1793c1eb96ac43ef759910a9d651308b648ddaeedb32ecfd48438ff7678dae9d
-EBUILD samba-4.15.0.ebuild 9917 BLAKE2B d51176e0eb13f3d1807767505f075ba522cf8cb6cc28623039124a1ebb141d7ad1c1100561d347f6ec0283a358d8dcbaaf706e31712d5a7fc8d7253bede571da SHA512 916741315bac02da012a33bf7891c4084534f3e33f15eeddb22fdf641aaa9dd50a1d26cccc0f6a85d12a6809b4373e636d60a6e026e3af27f4f043d089ae9618
+EBUILD samba-4.13.10-r2.ebuild 9951 BLAKE2B cf9ea21b58111b468af87022d8d1de629319817c051e54d35b7d81c3053e7977c3ffb358ffb519da24f3bd29fce8d530fa3a60880984819afa47957c3171e875 SHA512 ebc5498caa155a0b987fdd500aa501004dd96b600ec452e53033bbc90b38df1af60f154898841966d15248c4f17e75027c3f2ff04bffd17366b504c020348a04
+EBUILD samba-4.13.11-r1.ebuild 9951 BLAKE2B cf9ea21b58111b468af87022d8d1de629319817c051e54d35b7d81c3053e7977c3ffb358ffb519da24f3bd29fce8d530fa3a60880984819afa47957c3171e875 SHA512 ebc5498caa155a0b987fdd500aa501004dd96b600ec452e53033bbc90b38df1af60f154898841966d15248c4f17e75027c3f2ff04bffd17366b504c020348a04
+EBUILD samba-4.13.9-r3.ebuild 9944 BLAKE2B 616fe72b46377be83605ef1a9e50d459edae637443e167c22ab3e3434b11d00b5890ba8fba46b3db8f49587ec758a9d9ea3ce65454b231adf3439c83492957d6 SHA512 de44699398edd95cc4e05271c2768285441b7af96ab76ea8a62fce8cf00dc53367c48c6cb8525fdb829509f058c99b1f9a387505b894dfd092647d354f0a4155
+EBUILD samba-4.14.6-r2.ebuild 10059 BLAKE2B 9564c2685f5204847b33a512c43a4edd4520b3378aee234a917e7812dba933df7b91b3d06885b18183aecf41e12a598176c83f8d29926b2e90134c038c84607a SHA512 c1d5492c4afdec6bcdb281c71d4aca4ade8a7cf2988533fa4e0e39e7de144f509162c3bd1c1e0b5dd683d0fd0bb709267b34678a2b4678294f5dcb91df71da3d
+EBUILD samba-4.14.7-r1.ebuild 10059 BLAKE2B 9564c2685f5204847b33a512c43a4edd4520b3378aee234a917e7812dba933df7b91b3d06885b18183aecf41e12a598176c83f8d29926b2e90134c038c84607a SHA512 c1d5492c4afdec6bcdb281c71d4aca4ade8a7cf2988533fa4e0e39e7de144f509162c3bd1c1e0b5dd683d0fd0bb709267b34678a2b4678294f5dcb91df71da3d
+EBUILD samba-4.15.0-r1.ebuild 9919 BLAKE2B dae14ce9c11091c9b480bd8ff118ee0f62710785616e6a7a57c1e7e51b6b90f6c2bf57b29a95cd7beeb9eb3dca17c29fcda42e2f4da9d0b378a67f2d15f66c7f SHA512 03eec036b3c9db9e65ef03cedfb3d90a06050ebbb0e51645b8c487da1a864be47d24cb24b193137ca519ab5de13ab1c8f88ca2fa800891a00b344417718323f1
 MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
diff --git a/net-fs/samba/samba-4.13.10-r1.ebuild b/net-fs/samba/samba-4.13.10-r1.ebuild
deleted file mode 100644
index d04cb92e5119..000000000000
--- a/net-fs/samba/samba-4.13.10-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.10-r2.ebuild b/net-fs/samba/samba-4.13.10-r2.ebuild
new file mode 100644
index 000000000000..ca82cc436a82
--- /dev/null
+++ b/net-fs/samba/samba-4.13.10-r2.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.13.11-r1.ebuild b/net-fs/samba/samba-4.13.11-r1.ebuild
new file mode 100644
index 000000000000..ca82cc436a82
--- /dev/null
+++ b/net-fs/samba/samba-4.13.11-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.13.11.ebuild b/net-fs/samba/samba-4.13.11.ebuild
deleted file mode 100644
index d04cb92e5119..000000000000
--- a/net-fs/samba/samba-4.13.11.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.9-r2.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild
deleted file mode 100644
index 494b48393144..000000000000
--- a/net-fs/samba/samba-4.13.9-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.13.9-r3.ebuild b/net-fs/samba/samba-4.13.9-r3.ebuild
new file mode 100644
index 000000000000..5ae6e673876b
--- /dev/null
+++ b/net-fs/samba/samba-4.13.9-r3.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
deleted file mode 100644
index c0aa243a9452..000000000000
--- a/net-fs/samba/samba-4.14.6-r1.ebuild
+++ /dev/null
@@ -1,339 +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="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.14.6-r2.ebuild b/net-fs/samba/samba-4.14.6-r2.ebuild
new file mode 100644
index 000000000000..3ca6d2708a41
--- /dev/null
+++ b/net-fs/samba/samba-4.14.6-r2.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.7-r1.ebuild b/net-fs/samba/samba-4.14.7-r1.ebuild
new file mode 100644
index 000000000000..3ca6d2708a41
--- /dev/null
+++ b/net-fs/samba/samba-4.14.7-r1.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		addns? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.14.7.ebuild b/net-fs/samba/samba-4.14.7.ebuild
deleted file mode 100644
index c0aa243a9452..000000000000
--- a/net-fs/samba/samba-4.14.7.ebuild
+++ /dev/null
@@ -1,339 +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="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.15.0-r1.ebuild b/net-fs/samba/samba-4.15.0-r1.ebuild
new file mode 100644
index 000000000000..16078c109713
--- /dev/null
+++ b/net-fs/samba/samba-4.15.0-r1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	if [[ "${PV}" != *_rc* ]] ; then
+		elog "For further information and migration steps make sure to read "
+		elog "https://samba.org/samba/history/${P}.html "
+		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+	fi
+}
diff --git a/net-fs/samba/samba-4.15.0.ebuild b/net-fs/samba/samba-4.15.0.ebuild
deleted file mode 100644
index 3dad3bec60b7..000000000000
--- a/net-fs/samba/samba-4.15.0.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
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	ads? ( acl ldap python winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	if [[ "${PV}" != *_rc* ]] ; then
-		elog "For further information and migration steps make sure to read "
-		elog "https://samba.org/samba/history/${P}.html "
-		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-	fi
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 75aedcfeec97..567ad9c0fbd8 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 04035c8804dd..20edf0a074cb 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -7,5 +7,5 @@ AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d
 DIST atftp-0.7.4.tar.gz 249699 BLAKE2B 8aa30df1cc92982b0e718cd9bcc68cf397e29f6abb795cf9fdfd0b9942d9a7dd16beafb24d69d7339f9ab4cbda16404eadf40096a8dfdb684fbc7ec1c7f81c9f SHA512 f9ff9b72b7d1d659d4ca00d990c28b9da8dea0228e66610ee2d17a3959fcd142998a7539f8ea68effdfe830d2f5e68c154a2911afb9cad52acd24a6a642d76a4
 DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
 EBUILD atftp-0.7.4.ebuild 1447 BLAKE2B 6508f1a2d3be859cb6cfb6e44ac306811342a6522f3b305bd3714b23b8d6ba9ab601495a1742ce24e7e8fda907347e4c60e897b2ee083fb484563aeec79b0889 SHA512 5d69276f37f510e10884a67a3ee8010bfff68076e5d10550a0b689fee35672804c18cc3feae8e7397cfed4a000e474707976dd50d6924e3f7909245090c0bce0
-EBUILD atftp-0.7.5.ebuild 1445 BLAKE2B 9c985d8fb684b64dd26cf15750d6fe8f0410b9e22cbae03cfb8d198f487975f63b6948e81cd50b72a14773149e04254c9e6b0c522ed7fe7097ec5fccf8ef4610 SHA512 50440bfa6d3ecc7a14bc994d9bd5399f0baa66496ffe65a849814499effa5aa75f51adbc15d889d1b95c3ba8bff0150be0aebc1a96a8825522b990f633307f50
+EBUILD atftp-0.7.5.ebuild 1441 BLAKE2B f2e7e0f0fc1a08712419be9625176e75531171c3f34520a715c77da305753099fae133f4acdb471329642cc13a41e66f384790ab5131f83b80d3363203e51a31 SHA512 a1f6effeb8af89272af9a26e7d512f66218eca61c5d62f648b890babdbdea7a49e3b3dd60aba5e5f2a7b8a7c3d1bfcc0ad08706c8d1c4477eea693b7f54b92a9
 MISC metadata.xml 449 BLAKE2B 11050f78a3331914e98ba7a89fd29c9ebc5d36f5f34c1143850af8e1d5c5f3a4eb0d01c8b0d79d5c9a03e0877cfb0f0604f38bf94c9e85301ce2dde548c6d09a SHA512 d4f4b423d74484fa8f72796904014647939f2bf5f4ebe52a28cd1f029ea7160b3c07c8dfdbaf4eda06d8b5bce94b22297ab4874b150058b29624c55009b7e132
diff --git a/net-ftp/atftp/atftp-0.7.5.ebuild b/net-ftp/atftp/atftp-0.7.5.ebuild
index 001bba2e8253..afc07d53b0e2 100644
--- a/net-ftp/atftp/atftp-0.7.5.ebuild
+++ b/net-ftp/atftp/atftp-0.7.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 457b922a14cf..f0d7333803ea 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -5,4 +5,4 @@ AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
 EBUILD frox-0.7.18-r8.ebuild 1899 BLAKE2B 69b44a1a481786424b4da09b3c31c450eaf24a7ab4a00c064d5a676606187494d5e5fffa27de48326ca25ad23401f35864df879ec4824715d9030dc8ea5d0551 SHA512 150792890883cefe7c5ee7c0e4a5bb3ab214b35b08cd728151697261da68c225250cbe27345cae160da47b6a42570998ea94398070f5ed71f4ac1f7eb3eb203e
-MISC metadata.xml 624 BLAKE2B e7d79c1ffe531cf36ede7af0d1721411ebe08a8ca07492e1858c433c4cd838a6671ff1f3c0279aaba58c430206956a7cb921e493cece133cf53b0c8745f910c2 SHA512 38db6e56654b3a9a880fb7dca456dc92cb6b549b9285ec3be8b7b7a83c990ee2926e4444c379513d01a1cff33e4698dca637a861779fdbc939723252ef6f1e25
+MISC metadata.xml 623 BLAKE2B ebe352b066faf827000496491e2570a28b62f5ae484f780c912fe18a8447b277fae392c19eaa97e7014bf01bd1500d8c4cc37968536c550c645953e821f0818b SHA512 27db1dfd65ecef394d8b5b9d289b0063b37b28a365380c34ba60188385e93ae8eb7387dfdc07df2a36666d08bcf8499a05d7c47b1f7208d6c3be478255b590bb
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 8688ff9e96d8..9ec5aa89bc85 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person" proxied="yes">
-        <email>kabel@blackhole.sk</email>
-        <name>Marek Behun</name>
+        <email>kabel@kernel.org</email>
+        <name>Marek Behún</name>
     </maintainer>
     <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index fa4f795e2fa1..0ba9e8502822 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,8 @@
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
+DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
+DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718
 EBUILD ftp-0.17.23.0.2.1.ebuild 1495 BLAKE2B aceff27473bba089c3cb5d92b3c98563bd40ce959e1be4f60b5558b212d4abea68faf37520e6a5f1b7c329e62d6c62b15d8fb94dfd50300c433822a64cd9b07a SHA512 dbb1dc09a22f6825c6d4bd354124084e2f6194b56aac60f7d3637d48a2280efd73fe8d2e1e932229d6cdb4a13ed5889086341419c5dbd188683952127a5dd98a
+EBUILD ftp-0.17.34.0.2.5.1.ebuild 1506 BLAKE2B fe9b96cce8798671fbe06a3f1738cb6d72f9546a6c7c3edebba85153b2c5e72ec437b75c20891334527d9af99c70c9c9805e1bd533aa8bb48bebc958f8c2f19f SHA512 20014497945799716fd3c5ce1caacddb4cbc399e32cb456d5a7359038ace7f527ad4e05416f005d5b8e65e418fb6ba59c24343f8d3d85dfcecd133ce90e3d9e3
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
new file mode 100644
index 000000000000..5c394dd064b5
--- /dev/null
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+PATCH_VER="3"
+MY_PN="netkit-ftp"
+MY_PV="$(ver_cut 1-2)"
+MY_P="netkit-${PN}-${MY_PV}"
+DEB_PN="${MY_PN}-ssl"
+DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
+DESCRIPTION="Standard Linux FTP client"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
+	mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 readline ssl"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2:=
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/grep"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local p
+	for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do
+		eapply "${WORKDIR}/debian/patches/${p}"
+	done
+
+	eapply "${WORKDIR}"/patch
+
+	sed -i \
+		-e 's:echo -n:printf %s :' \
+		configure || die
+
+	default
+}
+
+src_configure() {
+	append-lfs-flags #101038
+	tc-export CC
+	# not an autoconf script
+	./configure \
+		--prefix=/usr \
+		$(use_enable ipv6) \
+		$(use_enable readline) \
+		$(use_enable ssl) \
+		|| die
+}
+
+src_install() {
+	dobin ftp/ftp
+	doman ftp/ftp.1 ftp/netrc.5
+	dodoc ChangeLog README BUGS
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3a6557265fdf..55a02f2c73ff 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 65aed8e3ebee..c43e979398ec 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -5,6 +5,6 @@ DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc34
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
 DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
 EBUILD pidgin-2.14.5-r1.ebuild 7569 BLAKE2B e9093afec931c7a48d730f0cc531f904001a7e9d0f80f4f7d771b5dc9bf14ed669457996ec0ee50fd7ae1d993243ae1ee1b860a815927b13d9bb705abbfa72c7 SHA512 33ff1a4da14c4fdd6f6d66b96397641b8d9c836f6589eb519e9080ff26bb6709d4f153f9a9c76bd3aed5df4dc128ef636be51a4beeb9a649c361a5b8dd98a41a
-EBUILD pidgin-2.14.6-r1.ebuild 7583 BLAKE2B 90efcc7558cdeb162601d225780fdb61b11c2da664fcc4075564000ac1faa89e09a705cf7513044fdcd60be2d2846cc06a3ee8c1ce17a4f2fa3ea13e4e8bacb5 SHA512 fffade129e46fa5b59c84afca453d02ea8f6ffc60cda0d5cc2b62c663a1bf0497a02b2708358cea6557cc4c8b8ac6b78eb8d27cea417a3c9a23450a37ef745a9
+EBUILD pidgin-2.14.6-r1.ebuild 7582 BLAKE2B 1747500494c8733c41cb5160b3e52817480c8297377720e56936beae72bbbe8ffcea011cfac1f6948dc648ae4e1019b60fd06c4b0fcc9423feead29bffcf36b8 SHA512 af69f1a3695bbc7778b59055c8ab4b49125bfcbe4f6627ca52226e9e70fa57dc6234310124e6c7d493df2a2eef429276287f81f563b6b4db9ab41aa47bd7574d
 EBUILD pidgin-2.14.7.ebuild 7524 BLAKE2B e96334e50940ab294f6f1da6ebb63c6e8b5fce110b96ce4a23d772f3cdae60398ab4d22b4a23a151e85e38db29ecce3a55d3028bb872f201904d6ee296cf4cee SHA512 a360b21703c418b7ad5d31c34a81e913e8c4b3e68abfedc284c9c68f5b9cbb9d54571b5f5178f43b84eb59d319f61c1e2b7b9f9e1db6201efe9f041b25d8f0b8
 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index b1f6fe4fbaf2..b90358d5c2f0 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 9eae771773a2..9b2e36ef5cf3 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.16.0_amd64.deb 112367192 BLAKE2B bf4ae3eb95542d6321302fa222ddb78f48a26cfef2aaf4e29fdc53e6279c9fca00c7346532fbad4a8e0709cdb91eb35a745f7a9b0b420a178dd067995216553a SHA512 7cfb5a1889dd7f1b8d2937b12190dd2ef05060685590ad0c6b4b38063644431092d7e482f25206f81e6b161a29176b24de136c7b5e49e2845219d8d3d9a8f285
-EBUILD signal-desktop-bin-5.16.0.ebuild 2797 BLAKE2B 86692e71e23c026cb930c541a7fe4307c420fc6f83a3603bd17cebef303e5d33a1c54a76973bb1c256f3bc5a1a19585ab0e366330f1779b19287eb8a909f83ca SHA512 567e1b7e7a5cdf1690b75778e092323c757aceca61a9b54f7e573fc960495f91e37e727af2b429198c81ff9ab1ca4fc941f281b02ef7c3e4b9082c08495c6627
+DIST signal-desktop_5.17.2_amd64.deb 112501116 BLAKE2B f01fb6f3b579c86d4157c4b4832f2b8f7a2b721487af9342f79e75cb2ef55302068c42910db0778d888bbbc504fdab2ad37f8a01e78f11c0a6167cd60934a5e9 SHA512 2aaa25c3670d360f0a1db286d9a6c712c2de975f26f995a7fa8b7fab4d30925dbb7827f2e9bbf9d50663db601ed8a761db0fd788fae8eba0afc11226b74765f9
+EBUILD signal-desktop-bin-5.17.2.ebuild 2797 BLAKE2B 86692e71e23c026cb930c541a7fe4307c420fc6f83a3603bd17cebef303e5d33a1c54a76973bb1c256f3bc5a1a19585ab0e366330f1779b19287eb8a909f83ca SHA512 567e1b7e7a5cdf1690b75778e092323c757aceca61a9b54f7e573fc960495f91e37e727af2b429198c81ff9ab1ca4fc941f281b02ef7c3e4b9082c08495c6627
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.16.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.17.2.ebuild
index e6ca382563fa..e6ca382563fa 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.16.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.17.2.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 10b894be099e..1c510ce72052 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 9698961c4c94..0dd4a4197243 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -4,5 +4,5 @@ DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a
 DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
-EBUILD libaxc-0.3.6.ebuild 1345 BLAKE2B b38dc4d4eb07781ef697ca50275145d3a5c3063a765b97133c2a71021726567daa6b4c546ad092c735467f95a023f97129670d71db6da90917c79163ff9a1fc2 SHA512 6aaa85fa43881875485eee2a41cab39cf8cb01e46a90ef90a18040f82bd5b999d039b5f01da1939c64098e8a31f0e322b2920cd2a8ddea2416fb49d185ee914c
+EBUILD libaxc-0.3.6.ebuild 1343 BLAKE2B 7f02ed46dd870dfce8e6bf54d89aab586fea370583129ae203d1a3bacd51cbf0ef76994a25457ca0c8131180fd32758d07db1cbf6611d3726f52d56475399244 SHA512 b5371a8f15a8e034d506db0009b4d1daa9c8bc8d96b9a5e8002b638fa9e9a3c719781b7228672468c3044423f9fc6c3bbeabca246140b955219cde3974f1bf90
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/net-libs/libaxc/libaxc-0.3.6.ebuild b/net-libs/libaxc/libaxc-0.3.6.ebuild
index b5901be4efdc..6fe97dd4c072 100644
--- a/net-libs/libaxc/libaxc-0.3.6.ebuild
+++ b/net-libs/libaxc/libaxc-0.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"  # not GPL-3+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index c7528f847e06..0e1b60a5b049 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,3 +1,3 @@
 DIST libblkmaker-0.6.0-github.tgz 28907 BLAKE2B 31b64604040a514ae844564d19e884932fbaa0640d0491cda5ec9e922b0714c89e8810f1da3d0057625633555ea486c15e20f2a32d8528a6795be52e692d4e4f SHA512 3e9028c7c4664491274c241020d507ba6d736b9e9048562434d27d92f6cdd58ec167fae060bc355ee6a7f010a6a8a6ccff1660ecfc616c705c5deb3ed95c5e69
-EBUILD libblkmaker-0.6.0.ebuild 689 BLAKE2B 3f5e0fcb1a85738a7bd13af19c0ae11fe56f549c41aab5806fed8995e24c1609916dcb58f4224b818fb347d7ee71eb52cd6b4e7455d5119ca6f4bfd4668bbc73 SHA512 c3acceed12b5d8bfc9d845829c7d1a306a6d6f1075db4d275900e9d559629f2425c4ebbd2ff3787ec3a331980bd5239aed7c80d7960591c5ba5a90ad98e4d571
+EBUILD libblkmaker-0.6.0-r1.ebuild 691 BLAKE2B 963f27af1ca59cfdf8461c4b0c99b23011654bd89f335176768b1cb09a47ce0a1e1cddbd0eaccf30005421cadd7c84c706149bae34110e6a8b1e8bef2bc7140e SHA512 21e15b15b6e3c20a31698cb59b498ad37114a6888303efdb267fc9a62bf5b02e2a831aab4d21ce676d8c2ea229cc5243d52beaf1ab54a0c944f5e6dd9a0de8b9
 MISC metadata.xml 489 BLAKE2B 7c3d3347ec58fdcc8645e02c1f1d5be3c4406bf0306ab05217f6bb8905ee5a00adab844ed1f1be5c48b79a11d325d3e95023824fb4f2e9c3b66d77ce1e0034a6 SHA512 6dcab8cdde1b6ac9056a9004512a9798f072a1d61081338a885b929aa1e768791a3fae24bf7ac53bfdfae2283cf0fab7eca811c0c91750ba0f33f9625cae4e78
diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..96ad5efcab6b
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C implementation of Bitcoin's getblocktemplate interface"
+HOMEPAGE="https://github.com/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+SLOT="0/7"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.0.0:=[${MULTILIB_USEDEP}]
+	dev-libs/libbase58[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
+"
+
+ECONF_SOURCE="${S}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
deleted file mode 100644
index 8ceb40dd5dc9..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="C implementation of Bitcoin's getblocktemplate interface"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/jansson-2.0.0[${MULTILIB_USEDEP}]
-	dev-libs/libbase58[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
-"
-
-ECONF_SOURCE="${S}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index a178c3b6e3d5..ac5706f5cf95 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2174 BLAKE2B f4286f655db01f1849ee40d35a8e6711abfebebb64efeba9741d935edb6422196835209a01cb6265c85f5807bd872e39d94f5999d8ab56c097f7a755990e1a57 SHA512 90d7225e787054cbf12648e23209fd9798bad85d27bc777babd571cf47ad326145f36443056f0613d7de8e9cdbf993ac8246768311bcec7a351965b375a9a66b
+EBUILD libetpan-1.9.4-r1.ebuild 2181 BLAKE2B 2bc6319caafff8b9d976fff913c80c3bc8495e4f5936d6033e511de0cae78897a848dadc6fdef0014c8c54c4c65ebc8fff6072f1cbaaf089ee522249cbd54d81 SHA512 52f798514786f2314355c71cc6f77b3304553ef4bb55c69b628290f664f8f14ffed3428fd6b9b3da68dc863259601c71765dbeb6f0856fbb9802a33786184fea
 MISC metadata.xml 829 BLAKE2B 24ff53ddef21ae8441fe99cabff9dae940b72baefbebadb0138a2e36222272ff72d7dadfc38bfc9e9acf212e80359e4f3892447475a8969fb6aee4ce42ef2b1f SHA512 8f4b30e3e3c713ed44b25a7718f67decebce5ed748c0e19791e8e44fda07c0eef9793dbcb8b8fcd300849ac662fd2badc810e06be191026aeb2cb4aaba579554
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index 73576da4da6e..73e3f2ae838d 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 58650631f79c..8618aae8ff64 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
-EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 711 BLAKE2B 635855439c1cd9754f2e5aa8ad6199ef0981684159c2903be245efcdfe44f231f13769c4b7c8a14d66d790755cc675979d79dc17ddabc8b0dc1fba80b663d7b4 SHA512 c1674aee271237e98edb8242f4b547e71b7fcb4d5eb0ad7a3aa37104a6a2e03b58bc55e14e3e4e1e46516f0489772de52ebfa39eb891e096b07b43a86a75ee22
+EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 718 BLAKE2B dd3649bc6c114f4460d79905128fed1acb960ae9a555714af134fe24771cd67321a9617aeb1fff5faa92f6e4e708a8fd29be40dd553f997dad407e8097037143 SHA512 54038b6339549768e8d9b70d869736e8a6408e8d56cf4aa3352fca79e3548a2ada85c0f915f847dbc9e33fa5b111a633837d40f3af6e32e83e3c449401c571bb
 MISC metadata.xml 381 BLAKE2B 8ecab4404b863f9412227e54b55e1eb4fef71888e57346770e8a67d0a10b671899f723dbf3dad2c09d99f701bad98c4d58b556b566908b55621fad5a29ca0ad9 SHA512 7294460cfe3b2eb8fcee0eb29c7c75e3abd740986bf3499c46b302a67036dd55e95af65495c8e285f82bb15a29ba73b129d90d3317cfe246f88d04a2dd4ba695
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index 960e302de273..6d07d30b2777 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 6ba1a2a7d765..291cbf0c5ce1 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,4 +1,4 @@
 AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
-EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 727 BLAKE2B 9ce45489db53beba78627c1cc133ac01317c151f19e1d5774b79d7de27cd8562fdb3ca0dfadcf12fd448578514616ef1b800cbcc417c76fd671cf00432723604 SHA512 459a9731246e797b6e3a75122b12a8a963154d4c2e5e64acfdf0c6041c8602aa200ef6c329cc41b8e383b04b245c71feb60eb812ebe4eb8d35073e2fd5b31ded
+EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 734 BLAKE2B 0113cc5ff0add3e3ad3445ac55190409203cc0715ae3e68cea583262b7b7f825e1144a6a44101cfae5ac00c1d65704cc7dd0d97ecad73d41ea6eb4cc662de2a4 SHA512 f0ffcd7a255f1f96de644d880efec508057386032953650ad4c69fe15c1e6cb591bde10b8da612e794b5cd1d40a9621d0216b012d9065bcf2be5f644675cc5a6
 MISC metadata.xml 375 BLAKE2B e79373a8cb0bcb5656035de8d0e24ea6a5b1fba4b4cfba83596a8c1ba8b212039e4dce3b328122688a8e8ce8cb864aa11a0413af33a9663c1356aae9f53f615d SHA512 68e7e0ad45bcb6c8e0f1f737b6fb70ad7120231a09adcbe665f542fb08567e5abc32fc55e22c2a989696962bf56b61757d092150ee4e882b2df979298f233ffc
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index 5079b1ffc74b..85aa46b43ebc 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 64535c88c281..57d398892de5 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 825 BLAKE2B bf767130207e96391bd06f631ab9e090ae4e153a957ed17d2c15369119a88e4d4d68273758c496ef92e2e7c18f4d5f482d03f7f58b3bb5e3ae94c09f0eb57265 SHA512 6584c7f5c32006f6d5a84de117ce58d68b184d0bbaefb10e3920aca37731e5ec33355ac96b270af29eb5b903eb0429099fdc4dd35e1d699b5acda2cf7ebb67f9
+EBUILD libsearpc-3.2.0-r2.ebuild 827 BLAKE2B ed8ab63b0262084df41b7cef3554a59f6545b221f32ad35eb74f47f6623490dcfbce5fb90218b0c05ebeba7c3cfa7393b1f25d7d34182823293347135879a1be SHA512 d1ad5b3379b875aed5d564f6cae33d2f46f8ba1b9e2ac0166eaa6d4cbe424d5075643ca18409a15c4502a508ba195211072cff030ec81a816f6c468b2fff5312
 MISC metadata.xml 480 BLAKE2B 087b5283b9c24e54190f2d964757dc82df0b887fc0ed1c6f70669bd2ca96ff3b098a31558993b982e5427c2c0b7a5ed86fe7fe44159fd494d4a7665ad00b5c7a SHA512 8497088fc5dd29ca69b2100c293562dd5f07c06d37d8097448b1233c17328c17618b3a4259dbf82ad6c2c32add052f288ee15d54ee1ae3bb0dbf7fcfc3d93cfa
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
deleted file mode 100644
index c19c1820eaf0..000000000000
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="A simple C language RPC framework"
-HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.0
-	>=dev-libs/jansson-2.2.1"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..09a9b176ad52
--- /dev/null
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="A simple C language RPC framework"
+HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.0
+	>=dev-libs/jansson-2.2.1:="
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')"
+
+src_prepare() {
+	default
+	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 599b7451e6b4..835b07e3d383 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1.ebuild 1955 BLAKE2B ca3adc859a4948dd392a239a78bb06edbcc9171a22ebe67e4a8ba1fbbd8234e2a5280201f70b6a52472f4c66caa84fcced0f10a0a59eb64af3339d821f483f86 SHA512 5a49a2b79d862664c1f9c91ec602ce9aa642bbe0e25cc369c4d4d0b9e65157b9761dac7765d3cf4eb306ad3bb5bf19e3c40edf8c81a55313bf4bad0757f427a3
+EBUILD libsignon-glib-2.1.ebuild 1997 BLAKE2B 70390d89aaeba042d5f9c21783d59b77e71d43bbccf910ccdf7e438d52aefc1455442760ea7f0a660d6ffbee8c5e970264ff38e9cc5c4f067d169f1f4a666cc8 SHA512 9bcc988c0b597c0d2a5295e7c8f2b67cfecb4ad81c3e8d93ee372235e1258b746993fe9617968eee6fad914d9741babd62d3440153834cf5eea7181ba086d581
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
index e4b555478261..d23a1c777afd 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="$(python_gen_any_dep)
 	$(vala_depend)
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
@@ -39,6 +39,8 @@ BDEPEND="${PYTHON_DEPS}
 
 S="${WORKDIR}/${PN}-VERSION_${PV}"
 
+python_check_deps() { return 0; }
+
 pkg_setup() {
 	python_setup
 }
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 29934514c4fa..206268b30481 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -9,7 +9,7 @@ DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57
 EBUILD libtorrent-rasterbar-1.2.10-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
 EBUILD libtorrent-rasterbar-1.2.11-r1.ebuild 2675 BLAKE2B f3eca25e40c12852703a06522b6904d64ae7fcf71b42df5ef3c0d78c06c76898977a29fd51f4cffb60472526c8a99c4b145eca3fb5f02d31e3f7d7be2b647a2f SHA512 2ab394714973bf577cc5ef3d124a2d48dbdad8b9db0178755f53c34a8cc2b4f27d30dcc94f898e3df28c0f37b388836d64fb7beb0cd517c81cdecdcbaa6a9c33
 EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e8880f0e6484aa795334f36aa3e46b71faac9036d9a0fa1fdd545bc6732339747f67b2aa7e3f85fba02f6d0662ae42f81df766bc9bc16 SHA512 395be1fc23c0f7eb88a2531ffdfea79b67f4a575ba97dc59f41e0f3cba7bc91defdbc1aeb0532356b5a13c82b540bb76a1ec37d91bbebcdad5694383a30db395
-EBUILD libtorrent-rasterbar-1.2.14.ebuild 2454 BLAKE2B 42dde0e47fd8046bf296d1ec92509e229b89337c56baa3f26b77a14759111913d5cfa68c3a9abb6aa0f05b58db9d4d69c0fa27493b7457f79e11b146c20b7213 SHA512 7d766a5fbf18f1a213f819e2aa9ed224551d750bdfea8ddc77b39c6d2d4748e95e85a605cb2397f12e015b5aa77767d1d3030d65bcf3e04a531a105eadf8d0af
+EBUILD libtorrent-rasterbar-1.2.14.ebuild 2452 BLAKE2B 9dd020ba7d4e24b43611777065774c9db30e6f6f30ec1201c749cf0e4d980a37079fefd38ce955e6f72fb85e766374cd848059506c8d89ea43fd4d727976c5af SHA512 99dbf55575981dc2c3d951f515bd89703ee5dcf60b2fcb92faa4fb5712435cbcf5e2fc0304e7fb891db2130eb0e9f5f65875bc1f22e1b7e212dbe8857d7a47ba
 EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f
 EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
 EBUILD libtorrent-rasterbar-2.0.4-r2.ebuild 1511 BLAKE2B be2686a64a4e1aa713e8f34943f4dafbb7ab8eab035ad81d25fc5e69e9f74279216497c15357ce1ad5356ab47a2a9471b81a4ca5cbf360c0d4d6b7c9d9121b92 SHA512 095466c72a42123093078efc78e8c54cb0262184857f959276147906fca6cb9e78beecced02dc42026ab1c59d09c984ccb228b586eb3dfbfc311e94a36cb5388
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild
index 7cc75214e00a..c4c0789e0fca 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorren
 
 LICENSE="BSD"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 5e814cad95b9..b8f8b054e0d3 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST libwebsockets-4.2.1.tar.gz 14557242 BLAKE2B 07d5a7278a3f0518f8d8c1a20c6ad08d7125c276d1b0236649abe961879e3985319ce03d6800f7312f63d2a92dd96d341783257695a91864a2ee93116a5a108f SHA512 b8b03a9f099079aace448eeee6690bee519c23ba14e0b186e1813bfdb9b915462a07a5f52bdb81949021bf631d99bda2661704814575f559b5a91c70cbb2ec30
 DIST libwebsockets-4.2.2.tar.gz 14589100 BLAKE2B 371bae4790e92aa4f48e51b40fbe2e4efc3b885e07740db14c96146eb857616fd3f7a1b6c83c11fded2791b1db59cb1f6761bc4eebaee918ada7e9bcf4be52d0 SHA512 52d9b4511fc484781108a3036f870905d4427fcbab02f3e84ee38f534ae7d1979c2cc3eec0719f4609226d4aae788a79fe7d99a8506537bbcf8fc3d9b8a7b478
 EBUILD libwebsockets-4.2.1.ebuild 2346 BLAKE2B 7e0f277a5e9d8bcc6dc9f6377341eb00e4dc6d0dd566e374bb1d4eaac0d0c422f03a00d72cc7cf722d2fdab44fa0d5aa3fb3d83b8646404f6d23e25095d25ab5 SHA512 2dbdbf89687faf2aab61532a31a7a955bc66f19987447f02ebd9e778e1a2a235db5b26e4aa6d2b5a7e9f43ec514c3eb3be7386cfb52126b5a2dc0b1cde79e4c7
-EBUILD libwebsockets-4.2.2.ebuild 2351 BLAKE2B 8d3ab6bfd878f0d6f2adc024cf55259d11ef8937e3b4442a2390341b78865f5f68605008c309358cf48281739fa11bc0c3d209f55058e15ca858d57e10ea888b SHA512 2af4352af03055910abb539b45f5810d469f9035ec712d6abfbfdc59eec8eaba0d922319a69ca66d195031db587fe80e1a62cb451cedb5dc9ec367763568b3ec
+EBUILD libwebsockets-4.2.2.ebuild 2348 BLAKE2B db6bf69f85f4b75a39aa51c0d669214ede8d256f13483b88b1e88da255df750aec517e3d53ac027e0f47f91d26df46b7d123bebdc435231d47108c5f4026941c SHA512 a6fb21c0eb1d16482910ad442cc1b616244e81fc09de9dc86c52a0c9b2016e8c8d25d288a2cb196f4103b5936fbd8b04e071da05c6bef01db71cc53e5251e793
 MISC metadata.xml 1703 BLAKE2B 7ebe447535ebfd38c9df8e0bb865a7e3302fe5c820d768433c33f714c28e2b24ccd6b54d9b8f82e3d1296c50f655d6595c2e0cf41da456b4132b9fbdd0ea5769 SHA512 f1f62216dcc707501003f1da3386235fe53a6df6c14339b8c2371170224a11159c75ad88a6d3cf6abf848c6d73d4970982d2f1ec49aa6a2db5ebccdad44ef574
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
index 180d8b2a195a..55affe4a0606 100644
--- a/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/18" # libwebsockets.so.18
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index e11e067399e9..7a079981c45a 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,11 @@
+AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
 DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
 DIST miniupnpc-2.2.2.tar.gz 100008 BLAKE2B 76bd18ad455be91a2b7680f59f59828a592077f3694ea5ed0f42222370d9e3d0e328dac1a6d530abcf28586384369d7c858c32fc3105f79cacad762ac5bc70fc SHA512 d322ae2a99faf01bee52f50a40d4bc2150c67a2f7e15b6078fe92faf2aecfe7ce10bd98cef3d94a77f6f7d1f7d8451cf4cdbf6fe11c9e7c1854ee066300b0116
 DIST miniupnpc-2.2.2.tar.gz.sig 543 BLAKE2B e1089a0c3d937cb4e52b511ed0cc7b43a686a6c08df5ce5e008f1f5ec892b6a4f9f1c45ad4eb252c2aa57fd932a5c5dd4300adfdcee145f27cae51469f244179 SHA512 525f4b5c60ca1375df8a05cfffec3cf8e99ae070510621de2871926b6e84faec28cceb4feb983380e12b7271880872083ea4f4080c74572697476bb7ae795cf7
+DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
+DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
 EBUILD miniupnpc-2.2.1.ebuild 1524 BLAKE2B 8b08e48755c0e7a0570630fa7303cdae350fd76b75c9e9db2f7be6afd201f98a080a23c0d5ee61f6681e7a457bd13a2508ec9c28c4e2dec59ad27f1430344830 SHA512 d19c2f2dd2a038cd5d14e4b25f53cf98ad72870bbc421d8329db942f10867b6230b2c43fb13f0affcb5e202fa47f302adab89d77b2b1d1ef2a715e12e3710462
 EBUILD miniupnpc-2.2.2.ebuild 1531 BLAKE2B d96235e0df9e81ce6bd27acb4a5d392de6f24e4fad6ac294aff7f010210cb195bb45d250d1745500193fd6bf9e9a2eb017347f125e1af746379011e558e77f33 SHA512 75ee602e5778d5fb05d54bb5dc8c449b7c59bc55056ba2ba11474b40e4f3b8317de809a8e25280368314a24ea81d558762d25e3954cdb1fd30711b2a6193feee
+EBUILD miniupnpc-2.2.3.ebuild 1536 BLAKE2B 2e1f7dfd1f0e70ab32ffdb55a7dbabdb995ee460d13e961be6b8672be250de26a1812149d892625a799eb8f7e9169bf9cd7fdfb773dceb55d1882a51924aab3a SHA512 afa26da736e6f21ea8e401a7eb6e8e299a1885876ffa95010ba76f7a57df6e254d137c0ce7557076da9d524d0bcefb21add84d68cd1f47b5e122ff6d4a677f86
 MISC metadata.xml 244 BLAKE2B a3306e4b6476e267c2dd1f4e24a57bcba54d6ac43270610af57976f19046bb17d1f9afdeadf07407c045b9c66afe1c5b631e0955ff1346e49151e604717dc1be SHA512 b2b16db336068dd5e6c40f2721e1b1e8a6626954196287bf409082db21ff804375fd740a76c5d2ee6b4ec13abf25dfa3f941944a7b25eb332b90a1da9c740868
diff --git a/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch b/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch
new file mode 100644
index 000000000000..7578bc3f8819
--- /dev/null
+++ b/net-libs/miniupnpc/files/miniupnpc-2.2.3-makefile.patch
@@ -0,0 +1,54 @@
+From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 29 Sep 2021 08:28:27 +0200
+Subject: [PATCH] Makefile: fix install rules to account for $(BUILD)
+
+Fix missing references to $(BUILD) in the install rules, as well
+as incorrect shared library symlink name.  Otherwise, the 'install'
+phase fails either being unable to find files:
+
+    make: *** No rule to make target 'miniupnpc.pc', needed by 'install'.  Stop.
+
+or trying to create the symlink in the wrong subdirectory:
+
+    ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory
+---
+ miniupnpc/Makefile | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
+index 4563b28..11a17f9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
+ 
+ FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
+ ifeq (, $(findstring amiga, $(OS)))
+-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
++FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
+ endif
+ 
+ 
+@@ -251,15 +251,15 @@ install:	updateversion $(FILESTOINSTALL)
+ 	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
+ ifeq (, $(findstring amiga, $(OS)))
+ 	$(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
+-	ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
++	ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
+ 	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
+-	$(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
++	$(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
+ ifneq (, $(findstring amiga, $(OS)))
+-	$(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
++	$(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+ else
+-	$(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
++	$(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+ endif
+ 	$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
+ ifeq (, $(findstring amiga, $(OS)))
+-- 
+2.33.0
+
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
new file mode 100644
index 000000000000..d7358d0677db
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6 kernel_linux"
+
+RDEPEND=""
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-makefile.patch
+	)
+	default
+
+	local exprs=(
+		# These bins are not installed, upnpc-static requires building static lib
+		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
+		# Prevent gzipping manpage.
+		-e '/gzip/d'
+		# Disable installing the static library
+		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
+		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
+	)
+	sed -i "${exprs[@]}" Makefile || die
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake build/upnpc-shared
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 4e5071248086..09fa41d1bf62 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,9 +2,9 @@ DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e8
 DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
 DIST nghttp2-1.45.0.tar.xz 4023840 BLAKE2B 779fb55110bce0a8c0cd955cf33afb7059f548c0eeb3310f726e82b0e62c5c55bc33f48a9f39296bf63a05854494542405695dff6f0fa6448dadc9421fbedcaf SHA512 e97f5ee9c468083582396bb4772f39cf13db415747c6b4118e6961d7e8da0e5302053884ed39386ad48aa4fcd2452f6e23868164b976b127e105762bb4567038
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
-EBUILD nghttp2-1.43.0-r2.ebuild 2008 BLAKE2B 4458b7697a66bedf0a73ee89d3dae5435097f71bc490436018b588b23b8a3084f4945990cb1ff9039266c3cddc3021893247ec81d99a76a9268098c2e93268de SHA512 64b7aba361f32e9d5d37b4ad189b340eadc14310ad9f8243d59b5b237ac9f8072e35f0af2f81e727cd931ae405d8748f0b98a61c953c1ab9e6765c520e4252b1
-EBUILD nghttp2-1.44.0.ebuild 2010 BLAKE2B 0fe182225d1611f5996e9825cecd2b190c2996e6188fba8a7ca8d985071f9bd35b9f392789f099e232355760fd4e4118853650481258ae6e2bc7720b05c76b07 SHA512 f65b3b3220edd048652ddd7e36be964a82bf0d01f11b5094b5f25466731c4f6cd24d34bf6179a09b670bba65b8dd70c55145d6f7ccc034e1346865be68faebdd
-EBUILD nghttp2-1.45.0.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
-EBUILD nghttp2-1.45.1.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
-EBUILD nghttp2-9999.ebuild 1979 BLAKE2B accfeb064d7750bb523939d9e9f50dc194455d771e0e22b1a5c7138d826f521faa3b0f830cf320d470803636faaaf38f83a6f84a272d875f04bc6d115780cc64 SHA512 f6ea435254aa3f2d2622eee95739a80d9f9e3d9321413a74ed875d71cba1901d87f225b7ed1086db2dd81295bda21bb72152b7502296ff87296cb37485a8a77b
+EBUILD nghttp2-1.43.0-r3.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
+EBUILD nghttp2-1.44.0-r1.ebuild 2012 BLAKE2B a79914a3d4ba023b0abc8cde4af04f4ecd8344d186569e5d7d3615cca607b77bea9778c0d58e0a96e683876af426732c99dda9dfd72eff516e3cf636af5b6ec5 SHA512 53c01f2a5ec4121725569b2caa3b83a1354f33ed22a7120feb9c18d2a05c974c1501ddb6043e59db2e8e5e397eadfe8d98878525865971e4128b606a21a28a3b
+EBUILD nghttp2-1.45.0-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
+EBUILD nghttp2-1.45.1-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
+EBUILD nghttp2-9999.ebuild 1981 BLAKE2B 7ea2358d8340ba890109eb5f0c97005b0c8f14681548f7110c738b68dd234355cd9b40141c1f683382bca17748c97034ebd526e77dc4968722fea8ee215f28e4 SHA512 b614027807d25668bd4d1a1127b7e8bd7c54288d2f618cb1f9ae7dce7cf629c2568ba2702487b0666cd110728e468c8d59cd59d722fb0d558d5d398069606c43
 MISC metadata.xml 493 BLAKE2B daffa7d9a21815507215b560815358be5bdfb984eab2fdc28ae872ce2e7fb4f43339bed4b8426ecd7e09ac8c79a19b33427b8a4de68123bf127e88a3a178a6a2 SHA512 85224aae10478e7a6bb2442d595b0bb750503272f281ef4526d976a620316ef0fb5cc7d1d3ae88fd2da05faab1d67b7d93d1bdbc97195ae5bfdf182bd180cc15
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
deleted file mode 100644
index 1315b9f5e31e..000000000000
--- a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
new file mode 100644
index 000000000000..f79b1b5a91ea
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild
new file mode 100644
index 000000000000..f95de61d06e9
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.44.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-1.44.0.ebuild b/net-libs/nghttp2/nghttp2-1.44.0.ebuild
deleted file mode 100644
index 5d6b3277275f..000000000000
--- a/net-libs/nghttp2/nghttp2-1.44.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild
new file mode 100644
index 000000000000..33f0539ba850
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-1.45.0.ebuild b/net-libs/nghttp2/nghttp2-1.45.0.ebuild
deleted file mode 100644
index cc514dc2d659..000000000000
--- a/net-libs/nghttp2/nghttp2-1.45.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
new file mode 100644
index 000000000000..33f0539ba850
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-1.45.1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1.ebuild
deleted file mode 100644
index cc514dc2d659..000000000000
--- a/net-libs/nghttp2/nghttp2-1.45.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 0c55b0475533..71186bfd3600 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 		${SSL_DEPEND}
 		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
 	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
 	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 139585118083..ceb6fda28054 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index df985188fe51..4b8fc75624d5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -10,9 +10,9 @@ DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb33
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
-EBUILD cyrus-imapd-3.0.13-r2.ebuild 6064 BLAKE2B bf1a1c4c74ffa14c4589b2567113634bf8b095b7277c0e0fb2d8862381c6db7397428344f78c66b4a6397e2f65572537a3ea497330a0a4ebadb7e86cdd5f53ba SHA512 00c690dc8aef5df29986e1aed176a2bf17bdd18353a73bc16f5b880332a1ead1927e5e3b9995cdd4c2c28bc3c533bceb1265dd81dc30c45ec63118f1de1ee184
-EBUILD cyrus-imapd-3.0.14-r2.ebuild 6025 BLAKE2B d471a5946e4cc4d052cd3dc147b3d13e730b7dcf1cd4c2798061a3b7a79d44b7b1c99f78642c431bab576a833ee6dcf155061db2bb0e65cfe58fef94e0299b9d SHA512 11de275e32ebb7d4ed18681fa43b426f140f45d3987c7ba358bd38098cadb264723db1479f9e6ba42b29516f052355ff0fc250271b1e064462e13caf619daeb0
-EBUILD cyrus-imapd-3.0.15-r2.ebuild 6011 BLAKE2B a23c3d69c79476d00ef3a6b60a3ed8d297d9316f4f5b0d83ed5643d8f6a95d057729817ae64b227896c22ed1a0655d00a5269e2765da2a145b62f13b8731d00c SHA512 77aadc470981018cee1ddfc744cf80c38d7a757387196f73cf2386eba39d9b72e998fe8122a6c2654c4908a6cbc57e3ca6d49e9b92e4a12d3374bb2e3edc4e46
-EBUILD cyrus-imapd-3.0.16.ebuild 6014 BLAKE2B 71d75a50701b5010fbe415375a5b4e15573113d1c4fafeeaba7cedb6487de3cd96310f69a0f39d39d5cd2e634905ec03d5eff570ad82ffcecf0c90061914c49b SHA512 74ebf8fd6449e66a05a49ed3741d4dec380417d6c665d2ee17a87ec85ec83382686315c8c82d62c868a1b25b6ebb2d82d5da43bc9e60ef5fabe39c610a30d9ef
-EBUILD cyrus-imapd-3.4.2.ebuild 5951 BLAKE2B 48f7498bbae7fe7a36dd5f561dd2526d6f06a5e923c0541661fa4d42258121f00ab83394c5f306acd0dc7d6b20fe7a4240ea011b13041d4c0d3746d65e42f833 SHA512 b31e04a58d2a07332a0d807aefae710127bc3c7e11714ec964e39b35eaf819aef1868d3ee5e92a81737e9d75c84d923cefad305da011d1194d484b12f1cd9d0a
+EBUILD cyrus-imapd-3.0.13-r3.ebuild 6066 BLAKE2B b2cfa376a54a4887ecf91a93f94139f77d7546966de851f117fbe67617a789cd58176de2921cd027879774fb91ff12be9da8740a93038d6c9a10fcd23536e36d SHA512 58dae45fd21f12d6eb1907fe1e6063139dac6a422dc83cebd1d5dede4c3546de07ce0aafd70ecf25ea143a33e1ee91395fe9c22544b74e2a350e2eea76c0e069
+EBUILD cyrus-imapd-3.0.14-r3.ebuild 6027 BLAKE2B 60f6bd7e02f8ab0edae948c5312e1a18cb1c0b57d026f9280061821173fbf2a4268f558b0d07953210fc051bde5d1d36dac770bd2c817978946a8572e0ef81ef SHA512 539e6596d182291897c5ded61a233b5f308758c8ba2dd5e4ad1fa35cc30bea15d69869148ffafbada3f8da7193ea1b05f11d81107e7bdc0f25dad4ee508fcaaf
+EBUILD cyrus-imapd-3.0.15-r3.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
+EBUILD cyrus-imapd-3.0.16-r1.ebuild 6016 BLAKE2B 55de4af67542ccf0f6b7a7fb7bdc46580299de1020a3c92bec08fadb0bb95920650e539f70a9e148aa468f7774c420a8e95991f7978fe1e6563dfe2d49fc2a5e SHA512 91b2789384ea6fc8df409fbd436ca9ca4729946f59adb76f18f20a33087ad828110521c3a01951a4f86f09bc563e800aa17e607d28a754cdf9ac24a4d704adbc
+EBUILD cyrus-imapd-3.4.2-r1.ebuild 5953 BLAKE2B 18b097df3d03ee087538f1259f57273b7411f31eb533f4af4ba379eec74d01eb280f4b8273a83ebb795cd45acc0fb630d1e0ce7a4098d33cba4c2661ad910b73 SHA512 9bb22987fd209fe739b43a5370a54b4af6242cad3ac2c3cc16bf2f402d0216daab114fdea640ea6a9a127a13fbdedf385bf0f53cccbc564d135cd3f870b2dced
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
deleted file mode 100644
index b43bc8a9c6be..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.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
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=(
-	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-	"${FILESDIR}/cyrus-imapd-libcap.patch"
-	)
-
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
new file mode 100644
index 000000000000..6b45c1d02cd5
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+	"${FILESDIR}/cyrus-imapd-libcap.patch"
+	)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
deleted file mode 100644
index 5bbfe2dcd570..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=(
-	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-	)
-
-pkg_setup() {
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
new file mode 100644
index 000000000000..1a96230a857f
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+	)
+
+pkg_setup() {
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
deleted file mode 100644
index c815c216b760..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.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
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=(
-	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-)
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
new file mode 100644
index 000000000000..cdbc51c6944c
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
new file mode 100644
index 000000000000..65438fc551b6
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:0= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			sys-libs/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
deleted file mode 100644
index 7d03ce6b6864..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.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
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=(
-	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-)
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..314a790e39a4
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:0= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:0=
+		net-libs/nghttp2
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
deleted file mode 100644
index 9f3b5413327e..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam ssl-cert
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap \
-	mysql nntp pam perl postgres replication +server sieve \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? (
-		dev-libs/libxml2:2
-		dev-libs/libical:0=
-		net-libs/nghttp2
-	)
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-		>=net-mail/mailbase-1
-		sys-libs/pam
-	)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	acct-group/mail
-	acct-user/cyrus
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-#PATCHES=(
-#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
-#)
-
-src_prepare() {
-	default
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-
-	# TODO:
-	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
-	# - post-emerge message re lmdb removal?
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--with-sphinx-build=no \
-		--without-krb \
-		--without-krbdes \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_with http nghttp2) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-
-	cp -r contrib tools "${ED}/usr/share/doc/${PF}" || die
-	rm -f doc/text/Makefile* || die
-
-	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${ED}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${ED}"/etc/imapd.conf || die
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${ED}"/etc/cyrus.conf || die
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${ED}/etc/cyrus.conf" || die
-	fi
-
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${ED}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest
index 505a72715798..b183ada83e16 100644
--- a/net-mail/django-mailman3/Manifest
+++ b/net-mail/django-mailman3/Manifest
@@ -1,3 +1,5 @@
 DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91
+DIST django-mailman3-1.3.7.tar.gz 404133 BLAKE2B cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda SHA512 923ca67cc813f59ee9e84b639c4a0b2cfe5b39b63a1a19c5b28c7727540a0ca1f1ee9ecfa12d91a314ee3d7cdb3535c939b9a240281ba277b9af276f18be28e8
 EBUILD django-mailman3-1.3.4.ebuild 657 BLAKE2B dcde478a57d048ccd605b6fb17585fb3ff569d5b1b80384335b535eddbf905a66477b115c7adb0c9942b13fb7e6af104e0af62e8d49a19c4bd815b7267c07ac3 SHA512 ad28c00eeca189b37ef7dd7cc219d830c8f07929ccb7b0887886e13faa006f525fcb6aaea9ae8c98741c43cb88cfa2dc76d014d682aa6dcba598ad537ed6d21a
-MISC metadata.xml 295 BLAKE2B 264e7013eaef2782694248a6aa0f8cd0cc2de9c88d5e9616f7ae1c57cb9e38e7331cb613412ba0b3114bc6755f544c79b4f3b98b9dc73d72457eedc44bb21f5a SHA512 859e3f54e8aa33b028a21296c5442a2b2fd5b1364ae70067f5f46acb55faeaa6bb75de71f6d3ba5ee9456b2b2096329c9d584bd0e287c96363cc0873c71a6eb3
+EBUILD django-mailman3-1.3.7.ebuild 748 BLAKE2B 2929115e607101c92f321fd21c6229ccebc180fbf82ddd87a8e5a76dc5616e4b2ddc7c6acb1bb3f3d3a7b9d51bfe780ce3fab5cc572d5f2cf955c48bdcdff5e3 SHA512 c8069659ce3352440bc5373c4badb35a173c123be899e46e655469b53c8062f9715dff504015a01580de854b0b682cf18e7416211e1f7d7641b5fb696b99c732
+MISC metadata.xml 382 BLAKE2B b9442ce978403ff3e1ed0c6d1538af640752d2f71642907abffe331af8b77b169ece82095716c2c0b4660d5cdbf313c9d452b3fd1a1296b015798188e1f0f643 SHA512 1f024eb4b324355e1b2c31a89e5fd1d460922622f58aed6eb863faf36ee4361a21469866ab10df18baa85a897f59fdf4565eb870490a9912c93227d46dcf9f68
diff --git a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
new file mode 100644
index 000000000000..f241f724a959
--- /dev/null
+++ b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django-based interfaces interacting with Mailman 3"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+	dev-python/django-allauth[${PYTHON_USEDEP}]
+	dev-python/django-gravatar2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=django_mailman3.tests.settings_test
+	local -x PYTHONPATH="${S}"
+	django-admin test -v 2 || die
+}
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
index dba8d0c4ff14..11a27be75e9b 100644
--- a/net-mail/django-mailman3/metadata.xml
+++ b/net-mail/django-mailman3/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-mailman3</remote-id>
+		<remote-id type="gitlab">mailman/django-mailman3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index ed025b0db8fc..c2643b58fed2 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,3 +1,7 @@
+AUX mailman-3.3.4-fix-click-8.patch 3704 BLAKE2B 4055807ee7546d94d6358c3d1c1cd46e8a964d7aca151cf4c11ba4b093809186bb75f3f01cf63b0a6a30a72c5b72b0cf86065038fa660e68ebd01342c2b48da2 SHA512 ab2ddc4ddcb8ab841c7de07749b78ae6856d3c86a80b84de5b0b06024fdf65a22b0f42b6e136282a5719b30d6980bb583187b7750c1df9402faff9d07d1d7ad9
+AUX mailman-3.3.4-py3.9-importlib.patch 2738 BLAKE2B a77f1d5a5a8ceb731484f290aa33734d2754b38594c40b7f7ecdea3321aa8dcd7902f6062b60357b34c99cddee11c77d2e6500022edf51e2c6fb9fba33b0e0c4 SHA512 0952811aa467ed7f30e206cf1132e3af120ac14b513c2edc2e00b05563e811f04d259d1e508c011a7c7b92e2fce12d6f7af4d934a5be6baf13cab86298683a94
 DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29
+DIST mailman-3.3.4.tar.gz 1578084 BLAKE2B d0c8ba6dd0df481915397b55521c9a524b44bbdb7c4efe789c6fe92c1383950b6107a76db43337b7a310a7d97eb3931a4289566271ac5b6360645ec8d316230a SHA512 52d7e8355744730f608605b05bc9c977c3e4daf22a78267b1ea6cd3922b2826d3f70dd61a591f13633fc7cbcc536b6d56a2076c00752a6590964cbd4e1aec3cc
 EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9
-MISC metadata.xml 342 BLAKE2B f8593b2132bcc582bea99d611092f1d3654de1fa352200fa84def65c55126e540ab03f475ab4a7338f5ce07a6bd1bd4efcd1cdf7d0da6ce373f30c7b535c8bce SHA512 facf7fec950cdedfe764bfa4d7c46c1c236c90caab5c48561ee724d2c7eeb2b1f9f9b94883ffc23eacb7bf80ebc59757876aa8cb8615f141dd87b4bec4059bc0
+EBUILD mailman-3.3.4.ebuild 1764 BLAKE2B 9e32da093e3b42b092cdcc9d226a1ac95f8862bd1ad239700aaf75dff653e2523c5715d245065225ae9295b97a5cdc97a7ad618372f115c1175340f4d9ca7eac SHA512 b3ec8bead3c034bd03cc698074e6b124ef2f37704f6d0269b7e82c21e82554ddf2fa3f40703c8239235e22b79cc7b2301670cb31c9408e245e79347f8e246317
+MISC metadata.xml 366 BLAKE2B c96d08478344ac29e91c7f8104b1669229e7d0b964a8ff6b07fc086118441fa16c9d2ed7e1f78a68a1316248f3b74fe144a526535871c4eb04dc94c587a7e9d7 SHA512 85eb201c452095f5ac8fdc1d6babd3fbad04b8d4452b69a5bc67c0589c90017475fa3edd6450898ec0da1a649077be2709121307a91329d3757e74839941f6ef
diff --git a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
new file mode 100644
index 000000000000..c5f5d774fdaa
--- /dev/null
+++ b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
@@ -0,0 +1,75 @@
+From 5d27492403f80c4b4ea1820b3d6f821bd8401ca8 Mon Sep 17 00:00:00 2001
+From: Mark Sapiro <mark@msapiro.net>
+Date: Tue, 11 May 2021 18:14:59 -0700
+Subject: [PATCH] Require click >=8.0.0 and fix the tests it breaks.
+
+--- a/src/mailman/commands/docs/import.rst
++++ b/src/mailman/commands/docs/import.rst
+@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change.
+     Import
+ 
+     >>> command('mailman import21 import@example.com ' + pickle_file)
++    Importing ...
+     >>> print(mlist.display_name)
+     Test
+--- a/src/mailman/commands/tests/test_cli_addmembers.py
++++ b/src/mailman/commands/tests/test_cli_addmembers.py
+@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase):
+             result.output,
+             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'addmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'FILENAME\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'FILENAME\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_already_subscribed_with_display_name(self):
+         subscribe(self._mlist, 'Anne')
+@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase):
+             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'addmembers --help\' for help.\n\n'
+             'Error: Invalid value for \'--delivery\' / \'-d\': '
+-            'invalid choice: bogus. (choose from regular, mime, '
+-            'plain, summary, disabled)\n')
++            '\'bogus\' is not one of \'regular\', \'mime\', '
++            '\'plain\', \'summary\', \'disabled\'.\n')
+ 
+     def test_invite_member(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+--- a/src/mailman/commands/tests/test_cli_delmembers.py
++++ b/src/mailman/commands/tests/test_cli_delmembers.py
+@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase):
+             result.output,
+             'Usage: delmembers [OPTIONS]\n'
+             'Try \'delmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'--file\' / \'-f\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'--file\' / \'-f\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_not_subscribed_without_display_name(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+--- a/src/mailman/commands/tests/test_cli_syncmembers.py
++++ b/src/mailman/commands/tests/test_cli_syncmembers.py
+@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase):
+             result.output,
+             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'syncmembers --help\' for help.\n\n'
+-            'Error: Invalid value for \'FILENAME\': Could not open '
+-            'file: bad: No such file or directory\n')
++            'Error: Invalid value for \'FILENAME\': '
++            '\'bad\': No such file or directory\n')
+ 
+     def test_sync_invalid_email(self):
+         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
+@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase):
+             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
+             'Try \'syncmembers --help\' for help.\n\n'
+             'Error: Invalid value for \'--delivery\' / \'-d\': '
+-            'invalid choice: bogus. (choose from regular, mime, '
+-            'plain, summary, disabled)\n')
++            '\'bogus\' is not one of \'regular\', \'mime\', '
++            '\'plain\', \'summary\', \'disabled\'.\n')
+ 
+     def test_override_no_welcome(self):
+         self._mlist.send_welcome_message = False
diff --git a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
new file mode 100644
index 000000000000..f8771678b3e9
--- /dev/null
+++ b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
@@ -0,0 +1,73 @@
+From 0eced2d273535577645493340c7319ebf27a559c Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Fri, 16 Oct 2020 03:47:38 -0400
+Subject: [PATCH] Use importlib.resources for Python 3.9+ and
+ importlib_resources otherwise
+
+This makes it possible to use Mailman 3 in environments where importlib_resources
+is not available.
+
+Signed-off-by: Neal Gompa <ngompa13@gmail.com>
+---
+ setup.py                        |  2 +-
+ src/mailman/__init__.py         |  5 +++++
+ src/mailman/testing/__init__.py | 23 +++++++++++++++++++++++
+ 3 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index cd3645611..6d871fbfd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,7 +121,7 @@ case second 'm'.  Any other spelling is incorrect.""",
+         'flufl.bounce',
+         'flufl.i18n>=2.0',
+         'flufl.lock>=3.1',
+-        'importlib_resources>=1.1.0',
++        'importlib_resources>=1.1.0 ; python_version<"3.9"',
+         'gunicorn',
+         'lazr.config',
+         'python-dateutil>=2.0',
+diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py
+index 2d94288e0..1c760008d 100644
+--- a/src/mailman/__init__.py
++++ b/src/mailman/__init__.py
+@@ -37,3 +37,8 @@ if 'build_sphinx' not in sys.argv:                  # pragma: nocover
+     else:
+         from mailman.core.i18n import initialize
+     initialize()
++
++# Switch over to the internal importlib.resources module on Python 3.9+
++if sys.version_info >= (3, 9, 0):
++    import importlib.resources
++    sys.modules['importlib_resources'] = importlib.resources
+diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py
+index e69de29bb..2b2ed536a 100644
+--- a/src/mailman/testing/__init__.py
++++ b/src/mailman/testing/__init__.py
+@@ -0,0 +1,23 @@
++# Copyright (C) 2009-2020 by the Free Software Foundation, Inc.
++#
++# This file is part of GNU Mailman.
++#
++# GNU Mailman 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 (at your option)
++# any later version.
++#
++# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++# more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# GNU Mailman.  If not, see <https://www.gnu.org/licenses/>.
++
++import sys
++
++# Switch over to the internal importlib.resources module on Python 3.9+
++if sys.version_info >= (3, 9, 0):
++    import importlib.resources
++    sys.modules['importlib_resources'] = importlib.resources
+-- 
+GitLab
+
diff --git a/net-mail/mailman/mailman-3.3.4.ebuild b/net-mail/mailman/mailman-3.3.4.ebuild
new file mode 100644
index 000000000000..d6f428c545b1
--- /dev/null
+++ b/net-mail/mailman/mailman-3.3.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mailman -- the GNU mailing list manager"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aiosmtpd-1.4.1[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
+	dev-python/flufl-bounce[${PYTHON_USEDEP}]
+	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_8)
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	dev-python/lazr-config[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-configuration[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flufl-testing[${PYTHON_USEDEP}]
+		virtual/python-greenlet[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-py3.9-importlib.patch"
+	"${FILESDIR}/${P}-fix-click-8.patch"
+)
+
+python_test() {
+	distutils_install_for_testing --via-venv
+	"${EPYTHON}" -m nose2 -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 901e3a6f96e7..135f30d32da0 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mailman</remote-id>
 		<remote-id type="gitlab">mailman/mailman</remote-id>
diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest
index e8390f0a9d23..f8fb421d7e82 100644
--- a/net-mail/mailmanclient/Manifest
+++ b/net-mail/mailmanclient/Manifest
@@ -1,3 +1,5 @@
 DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7
+DIST mailmanclient-3.3.3.tar.gz 90137 BLAKE2B d354123fb7735d8b670422461f3d5697a30ac83d1b2f9c7f642583423ab383f58b0d0604f18be23175fcdabe42721ee02102e764211fd0723c9146f8c39581fd SHA512 a4d18a7fc6084dfb20a7028cc085c31e696b8c2db4eec674852929b1d3a221a065b8e33d8047d018d4a0edf1afb3bcb55e76906808c0f6b3715abb8a81437b9e
 EBUILD mailmanclient-3.3.1.ebuild 488 BLAKE2B 9c5e9efd6be97e8cc3e9ace25ee35453cc865c50079ec9478eefc482f06df4e9c55ab331e192155ca0bb17b27053779b5d8a8e96b5040deb720c390f841f77d0 SHA512 f05454c071395effff6349ace296c6c93988f818d66e80b30580635959155c01b3b33a656e33d4b5dc2337a857132b5c033ed3d3c1649fed283e97db486dddc0
-MISC metadata.xml 293 BLAKE2B 4c775c74e3547276626175a3c706bced8eff5306aecdebc69d952436feed57201781c0aa859cb875f0f415ef6bf5c5eb6ac163363dd0cc38e2db488130de3fd8 SHA512 9503a74736048b67abc1082133910bd1d7d68883c648153a903568d1cc9d342a16c5c2e30ccc0cf00ddf3caff18c156bf01dedcdbec655fcc4038f81b170d3ea
+EBUILD mailmanclient-3.3.3.ebuild 926 BLAKE2B 3d4a9241d840958570b8dacd47df0ec24da7d04d50b5538e2ba6fa5a9530000960bb2c1089150968858b5a249d47eeb491a487b7b80d3911f050037b664cb32c SHA512 371b37aa667c9bc83056676582ea6e4f602e0080cabc57b3ad4073b832ba40451cad175ee5521dff5831ed600576fa24c746445b35fccc66daae368499bf73e1
+MISC metadata.xml 378 BLAKE2B b2d34dcdc5d9cc9f7cfe57727a3ecc68fff2aa3764f816272c969d060a306a737c16e935295d2ced259ddacec538d80fc954ac1fb5655e0550422a1eedc80052 SHA512 a0fbfacebeb1e10559f941a637215ddcae2f3b650fe4eaa288d407d077ef7879c92b9f7cca7e0b22591dcc77bcfb2f4adc103b0bd97926c3680b9f10dc9ca41a
diff --git a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild
new file mode 100644
index 000000000000..00d0bcb61d8a
--- /dev/null
+++ b/net-mail/mailmanclient/mailmanclient-3.3.3.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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the GNU Mailman 3 REST API"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+		net-mail/mailman[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network
+	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_user_page
+	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_users
+)
+
+src_prepare() {
+	sed -e '/addopts/d' -i pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
index 9b21a3c6090f..518b9cda34d9 100644
--- a/net-mail/mailmanclient/metadata.xml
+++ b/net-mail/mailmanclient/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mailmanclient</remote-id>
+		<remote-id type="gitlab">mailman/mailmanclient</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest
index 0406b9f51a67..410f7b1e2217 100644
--- a/net-mail/postorius/Manifest
+++ b/net-mail/postorius/Manifest
@@ -1,3 +1,3 @@
-DIST postorius-1.3.3.tar.gz 2704738 BLAKE2B 0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59 SHA512 31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a
-EBUILD postorius-1.3.3.ebuild 806 BLAKE2B 4708e29250342e17c97568fcc7985a6d69afcdbd548c40f57b1752ebc11801865bfe4e39e3670536484426f90c3fc76c05c21059b13b7eb81a2f8f9d95c04503 SHA512 bad6e50fa8546faab701512f0663a48663b635dd5b7e4a35338ed67489402e38aaa05eb6a1de231874dd4ac34014c8724b28825148712f77fed1c3d065d92a51
-MISC metadata.xml 289 BLAKE2B e6f2593d86670e4f99b9a209d0601ad87f838e1489608e6b99835c8ed2a463597ba6328579d9ed48fc2284988b6d5308ea86d5e80070df406421ca38e91e5bff SHA512 b3a039cd32080f3b2dd26c0702ec3ca6f2dda49ad5abf3fcd8c11ad9a7cc5c8786923cb5f9b25349ff309b08679ed6b5c135804cc1f971c7624a96a6fc367cd9
+DIST postorius-1.3.5.tar.gz 2775722 BLAKE2B 85f3408b7205ce4f89c36906280ff7ccecca0752ae611f4631e16d43972d0b52321be0f533fdabe6bf7d503120ab7a3794ef25f64a72369dec782b60347e33bb SHA512 f5f90ade87ae028fe665918b0aef69ac6c79f8d45ee4d105825ed9113661f084f3a82db9ac6ee850fa0feb5fd5afe7b66e49040d22c2e0599a95c3aa8ad56a31
+EBUILD postorius-1.3.5.ebuild 1086 BLAKE2B 52717d8e94fa1c643e2c4d1d1571fa8a827d2b18cdde76e920bbc2fcd91f0f39a10cb478bdb84f1da033e193703091ea5f912bb0d6acc86367644526851d4e74 SHA512 78fd56488c66d493caaec4b8552615b7970fed90956233e9a95ea59a708f72ba70fb21f4fc50536a1a1f594be5a0b812669c935b94b7852a8d2b873bd23b3d19
+MISC metadata.xml 370 BLAKE2B 6266c0fc5f71b98c60d93b7bc9b9e06817c3f2f093f7033396ba16b52da0d1214a2346631358ec720624285ed984484ad9219ae6dec812954821d672e899c01a SHA512 c3212bab2847e52fb883940b502b14305ffa42fdee50314ba83f9d1a3a2edf2a004a3f77678f730c9d4378966ec4d26ea95a5a886e3a063e0a92ade2a31ce90a
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
index f092b6905348..61bdb81d26ca 100644
--- a/net-mail/postorius/metadata.xml
+++ b/net-mail/postorius/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">postorius</remote-id>
+		<remote-id type="gitlab">mailman/postorius</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/postorius/postorius-1.3.3.ebuild b/net-mail/postorius/postorius-1.3.3.ebuild
deleted file mode 100644
index e78fe43d42ee..000000000000
--- a/net-mail/postorius/postorius-1.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A web user interface for GNU Mailman 3"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="net-mail/django-mailman3[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
-	dev-python/readme_renderer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
diff --git a/net-mail/postorius/postorius-1.3.5.ebuild b/net-mail/postorius/postorius-1.3.5.ebuild
new file mode 100644
index 000000000000..18b4965e46dd
--- /dev/null
+++ b/net-mail/postorius/postorius-1.3.5.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A web user interface for GNU Mailman 3"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+	net-mail/django-mailman3[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		net-mail/mailman[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's/test_list_info/_&/' -i src/postorius/tests/mailman_api_tests/test_list_summary.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH="${S}/src"
+	cd example_project || die
+	epytest ../src
+}
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 55f8e59d96e5..ad5803593382 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,5 +1,5 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
-EBUILD ytnef-2.0.ebuild 662 BLAKE2B 48da8cbf512524e5c1d54f2c0e2e321a3d138d1f163dab9ea1a0764fe08b00605fb531d04979e99ab0da958dd9bfe94bcb292c0a3e08c14f4943db09746a7581 SHA512 df7fface7cfde996443afefe56464a1bad6dd766f5cf13bcabd7cfc64d2c6fcc8f28ed0d6f58ee9218ea18a7fc49434383cf3f62da2a6fef01fd32d078ef861a
+EBUILD ytnef-2.0.ebuild 669 BLAKE2B 6632a7126dca4f06f886f0283010d4b5eb6c9da137bc6a78f0a72ff4ff77bb6b2943f6b8accc93d04287c2ef9929b4357adf147ccd6d344e2fbaaf2f02a28b14 SHA512 da099c5bcc73aab8a06bd4936e810cab33a5b3758317e2eff824fdfdaf16d2453b3847b05b72eebb6375969f501326da3f3cff3f774071b09168c10365d0135a
 MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
diff --git a/net-mail/ytnef/ytnef-2.0.ebuild b/net-mail/ytnef/ytnef-2.0.ebuild
index 0ba15afddf97..46b675827984 100644
--- a/net-mail/ytnef/ytnef-2.0.ebuild
+++ b/net-mail/ytnef/ytnef-2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 62d7e6061dfa..c52de40da753 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 27a12d291a5c..2385b555d813 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -19,9 +19,9 @@ DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b2335568
 DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148
 DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
 DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590
-EBUILD asterisk-13.38.3.ebuild 10842 BLAKE2B 44b09df35f9b59f2daa63a7cfa2910bb15eb51ac1324b28f7aee598b7a9c8853fdbd3e6484374f0fe4d831503951566737fd08b572e52da0be5dbf08bac5afad SHA512 a71bdd8a11cc2feb48b59c0e62de7e09f70d6aa7b0fa7262a31788ab20991f0e4045a4e82ea6a1ad72994afc7058fd66d89382000841bcb6cc6a9b1e101250ec
-EBUILD asterisk-16.19.1.ebuild 11248 BLAKE2B d2c137191071f2d0cf06d9c8081dc3cbb0c44c9995ff8d7d600c6cce3d3c4b8701ec0da2ed4ba6e46b09673aac64edf9a1833188234bef1436fb24d2995e5caa SHA512 34f8db71938444a1eb643f05bc0fbed1412327c5fb57a198c771033d600615a1f6e3530e4f1b7002168367ccc3788ee1477abb350472832fef996991ea96c7c5
-EBUILD asterisk-16.20.0.ebuild 11250 BLAKE2B d18d88ebfc430ebe8957455c97420b65bb892d88941f10941c46c6f88a0b6855ad169d4195631a2d935c5791a4320ef50d9a8b9d0f943c109b9be77ddaebd519 SHA512 a8e6e9bdb3fa2452735685a2c5566022bc19b5315c02617034e02524c710960694ed9fc0a86fa23676e0b4036c0e2a79ecb067c2bef67bb772870fc4e2732178
-EBUILD asterisk-18.5.1.ebuild 11223 BLAKE2B b74ab695e8413ebfb8d59b9efcda1071126bad027d3846b709a532eed2b155b881868fb5103aaeb95ce9501ae85d02e58448b5e0f7abe2dac5df02df2aaae7c5 SHA512 39fe7525da517fcd428716aef046bde75b098224eba226a8adad520bbd7656df430d0c39a0f50a3ec8878ab795186b1419916d5305f748fe6f91552d59d63e50
-EBUILD asterisk-18.6.0.ebuild 11223 BLAKE2B b74ab695e8413ebfb8d59b9efcda1071126bad027d3846b709a532eed2b155b881868fb5103aaeb95ce9501ae85d02e58448b5e0f7abe2dac5df02df2aaae7c5 SHA512 39fe7525da517fcd428716aef046bde75b098224eba226a8adad520bbd7656df430d0c39a0f50a3ec8878ab795186b1419916d5305f748fe6f91552d59d63e50
+EBUILD asterisk-13.38.3-r1.ebuild 10844 BLAKE2B 6b9c6791acac5777bc063b9bc228ae1af6e5af641f257772cf2087281c3bc1459e5b2334cc0cabae45191a0de78d91b9fc67ccdd5498c4b14aba35496b8f7bd7 SHA512 c47dcade8239df4075842249aaf0fd3b3e3089b9fc0b3a3ecbce30c6a12b82e02bd7a3eeb51eeab346f520432907a95c79ca303af08d253d767af81fca1e26cd
+EBUILD asterisk-16.19.1-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
+EBUILD asterisk-16.20.0-r1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
+EBUILD asterisk-18.5.1-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
+EBUILD asterisk-18.6.0-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
 MISC metadata.xml 1483 BLAKE2B 00aa83418aa9cf46f9ac04f2281157abd02f6e0d77b18e10ec0e516a116d92c87b6bb70a4c595dd5e2553f522f8ebd4ef6b102f30cd02fe8ce261f3fa049ddd0 SHA512 65f32411b7a6ed223a9e12d9f43fc975de7fa00c42e93b6302dbcf50a44c4805d1a116ddea0749d17e28dfc0fe6897ecccd0873a76e6dbf4f9580e2ff6df2149
diff --git a/net-misc/asterisk/asterisk-13.38.3-r1.ebuild b/net-misc/asterisk/asterisk-13.38.3-r1.ebuild
new file mode 100644
index 000000000000..9c92d3c20425
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.3-r1.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch"
+	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/libcrypt:=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( net-libs/pjproject:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		$(use_with caps cap) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable $o menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	diropts -m 0750 -o root -g asterisk
+	dodir	/etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.38.3.ebuild b/net-misc/asterisk/asterisk-13.38.3.ebuild
deleted file mode 100644
index f20b32b8542d..000000000000
--- a/net-misc/asterisk/asterisk-13.38.3.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
-	"${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch"
-	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
-	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
-	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-	diropts -m 0750 -o root -g asterisk
-	dodir	/etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.19.1-r1.ebuild b/net-misc/asterisk/asterisk-16.19.1-r1.ebuild
new file mode 100644
index 000000000000..a1a9536e12ed
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.19.1-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.19.1.ebuild b/net-misc/asterisk/asterisk-16.19.1.ebuild
deleted file mode 100644
index 77e488e7b79a..000000000000
--- a/net-misc/asterisk/asterisk-16.19.1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild b/net-misc/asterisk/asterisk-16.20.0-r1.ebuild
new file mode 100644
index 000000000000..236daff8745d
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.20.0-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.20.0.ebuild b/net-misc/asterisk/asterisk-16.20.0.ebuild
deleted file mode 100644
index a0c3ce337d8c..000000000000
--- a/net-misc/asterisk/asterisk-16.20.0.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.5.1-r1.ebuild b/net-misc/asterisk/asterisk-18.5.1-r1.ebuild
new file mode 100644
index 000000000000..456bc7d82990
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.5.1-r1.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.5.1.ebuild b/net-misc/asterisk/asterisk-18.5.1.ebuild
deleted file mode 100644
index e3f72db7541b..000000000000
--- a/net-misc/asterisk/asterisk-18.5.1.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild b/net-misc/asterisk/asterisk-18.6.0-r1.ebuild
new file mode 100644
index 000000000000..456bc7d82990
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.6.0-r1.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.6.0.ebuild b/net-misc/asterisk/asterisk-18.6.0.ebuild
deleted file mode 100644
index e3f72db7541b..000000000000
--- a/net-misc/asterisk/asterisk-18.6.0.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index ae8db69446e2..78210e1e6f94 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,4 +1,4 @@
 AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.5.0-r1.ebuild 5162 BLAKE2B 4144271fe24ae5b82a29f083ad3ffc9abfa346f20bcfd876a5dd6cd7b12ba65ea7a187c618086a6c6126fab3371601709e1419cc10a8dc88574d6087f9b835bc SHA512 d312445b6fb789fa0c78b20c42fde0ac110f0cc1d9e0c6ba6208640be5f342005d476177e6814ed3e54e3f409332471e484ce8e6f8415cf712bfa8970c04583e
+EBUILD bfgminer-5.5.0-r2.ebuild 5164 BLAKE2B 533d7a9a0af675646b0eb5df685bd77009a83e2e21fc431d7e24b98802171fe79bb4de202c1a56f3f694a9ad815f7dd066f16c6fefee40fea0e115120a4958ba SHA512 6bd83e618b6d9991a7e1ce61647559eff5f9052980e10c856e6fbf8281c999a6922b195fbfa153eba531ecc9de891fc614c63418c3bcf02ac3ef60b10b30ada7
 MISC metadata.xml 3963 BLAKE2B 604c98e56fe7e6363dd66c092feb78d097ef0c7dfa862c558e7cfca0168ef69de42c786ab2ba9cbfce12e64bf58ac69bc95afed57375bb12a902e9ce8d242c85 SHA512 f32cccabbf109e538f9735f3e37a0d4b44df398e3889af2cb20d336dc6784a8d224d868c7b46d5c4feb4b6beab0ede225e88d187ac0da6ad26892557fc33238f
diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild
deleted file mode 100644
index 65c008cf49d2..000000000000
--- a/net-misc/bfgminer/bfgminer-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE="
-	|| ( keccak scrypt sha256d )
-	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
-	adl? ( opencl )
-	alchemist? ( scrypt )
-	avalon? ( sha256d )
-	avalonmm? ( sha256d )
-	bitmain? ( sha256d )
-	bfsb? ( sha256d bitfury )
-	bfx? ( sha256d bitfury libusb )
-	bifury? ( sha256d )
-	bigpic? ( sha256d bitfury )
-	bitforce? ( sha256d )
-	bitfury? ( sha256d )
-	cointerra? ( sha256d )
-	drillbit? ( sha256d bitfury )
-	dualminer? ( || ( sha256d scrypt ) icarus )
-	gridseed? ( scrypt )
-	hashbuster? ( sha256d bitfury )
-	hashbuster2? ( sha256d bitfury libusb )
-	hashfast? ( sha256d )
-	icarus? ( || ( scrypt sha256d ) )
-	jingtian? ( sha256d )
-	keccak? ( || ( cpumining opencl proxy ) )
-	klondike? ( sha256d libusb )
-	littlefury? ( sha256d bitfury )
-	lm-sensors? ( opencl )
-	metabank? ( sha256d bitfury )
-	minion? ( sha256d )
-	modminer? ( sha256d )
-	nanofury? ( sha256d bitfury )
-	scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) )
-	sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	rockminer? ( sha256d )
-	twinfury? ( bitfury sha256d )
-	x6500? ( sha256d libusb )
-	zeusminer? ( scrypt icarus )
-	ztex? ( sha256d libusb )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-	)
-	>=dev-libs/jansson-2
-	dev-libs/libbase58
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lm-sensors? (
-		sys-apps/lm-sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	screen? (
-		app-misc/screen
-		|| (
-			>=sys-apps/coreutils-8.15
-			app-misc/realpath
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		|| (
-			virtual/opencl
-			dev-util/nvidia-cuda-sdk[opencl]
-		)
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.7
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
-)
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -no-pie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses="--with-curses=ncursesw"
-		else
-			with_curses="--with-curses=ncurses"
-		fi
-	else
-		with_curses="--without-curses"
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable alchemist)\
-		$(use_enable avalon) \
-		$(use_enable avalonmm) \
-		$(use_enable bifury) \
-		$(use_enable bitforce) \
-		$(use_enable bitmain) \
-		$(use_enable bfsb) \
-		$(use_enable bfx) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cointerra) \
-		$(use_enable cpumining) \
-		$(use_enable drillbit) \
-		$(use_enable dualminer) \
-		$(use_enable gridseed) \
-		$(use_enable hashbuster) \
-		$(use_enable hashbuster2 hashbusterusb) \
-		$(use_enable hashfast) \
-		$(use_enable icarus) \
-		$(use_enable jingtian) \
-		$(use_enable keccak) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable rockminer) \
-		$(use_enable scrypt) \
-		$(use_enable sha256d) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		${with_curses} \
-		$(use_with udev libudev) \
-		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm-sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable zeusminer) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}/rpc-examples"
-	fi
-	if ! use screen; then
-		rm "${ED}/usr/bin/start-bfgminer.sh"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
new file mode 100644
index 000000000000..462ec0a7d8d9
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE="
+	|| ( keccak scrypt sha256d )
+	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	alchemist? ( scrypt )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bitmain? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm-sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( bitfury sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+	)
+	>=dev-libs/jansson-2:=
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm-sensors? (
+		sys-apps/lm-sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			app-misc/realpath
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
+)
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -no-pie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses="--with-curses=ncursesw"
+		else
+			with_curses="--with-curses=ncurses"
+		fi
+	else
+		with_curses="--without-curses"
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable alchemist)\
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bitmain) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		${with_curses} \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm-sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${ED}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 7db8565fd587..08b99edb1d3f 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
-EBUILD cadaver-0.23.3.ebuild 1118 BLAKE2B 9accef5f15f857d137c41cc43f0c54c385396eb1e50c16db5340b7cd77ad01af6fe1d7ef9350ab1f6bea5a3c61afc0cff806803fb1ccf44e8154fb386c173d2a SHA512 b44254ea3d5d5e5f37854fe899ba4abbb7cee51009f5e2b1e063417a0f891611f3b0c338a5e823c885370956993b81216789ad09da764917f8d4910a0bc9440f
+EBUILD cadaver-0.23.3-r1.ebuild 1122 BLAKE2B d0fd999888ab00cbe9a7312fcaa8cac3d954cf7148e44c7b62ea464f8fab6ea351431c837a4f832893167c746a930784cc263fdab91514fc2c5ba7c03078c8b9 SHA512 f4bc5e9bc726079e12153fd812ecb105deb6b144448dc6a16bd2a90fabc0774f05fd2297811f673c49397eff1960ad488a40ebb77659a1575924ae4d539f5fe1
 MISC metadata.xml 360 BLAKE2B ae27ed2b7da27e4f375903df19c5a82e8fbdf2a4db8190f3e99157c8fe8fe54e181e45efef941aa9d16a413b8c95c0a42eea54d6e6272c02609b11e68bdf7739 SHA512 bbe65b8f140a7dfe870af1c97b8bc4a3f0b034a234f344fc4620965ebe66d9eea804806b43409a106ba905b29d74e8e7cdeff065a89f5beb751e7f70c1b54700
diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
new file mode 100644
index 000000000000..106581d1064d
--- /dev/null
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="Command-line WebDAV client"
+HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver"
+SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+IUSE="nls"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="<net-libs/neon-0.33.0:="
+RDEPEND="${DEPEND}"
+
+DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+	eapply_user
+
+	rm -r lib/{expat,intl,neon} || die "rm failed"
+	sed \
+		-e "/NE_REQUIRE_VERSIONS/s:29:& 30 31 32:" \
+		-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
+		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
+		-i configure.ac || die "sed configure.ac failed"
+	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
+	cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
+
+	config_rpath_update .
+	AT_M4DIR="m4 m4/neon" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
deleted file mode 100644
index 3b5240b2e504..000000000000
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver"
-SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
-IUSE="nls"
-
-BDEPEND="sys-devel/gettext"
-DEPEND=">=net-libs/neon-0.27.0"
-RDEPEND="${DEPEND}"
-
-DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
-	eapply_user
-
-	rm -r lib/{expat,intl,neon} || die "rm failed"
-	sed \
-		-e "/NE_REQUIRE_VERSIONS/s:29:& 30 31:" \
-		-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
-		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
-		-i configure.ac || die "sed configure.ac failed"
-	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
-	cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
-
-	config_rpath_update .
-	AT_M4DIR="m4 m4/neon" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index a6d5f03fc5f0..15f2b5791ea0 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,3 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
-EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
+EBUILD cgminer-4.10.0-r1.ebuild 2563 BLAKE2B aae006d5737fdf141fa315121584b9090b016b4520677c1d945e8e152a8d731b31fb85b1f56289518b7a16318bbd39b6658569b3ad8a5294c772ff709bd50317 SHA512 ae98851b1edbb87c59cd55f780b38f779608f2975afbd8cb6f469fb2fa994971b3444c91ef9790f99b9418529071ef2ca85d16a90f1095a6dd4eeb2a0852d15e
 MISC metadata.xml 2052 BLAKE2B c4fe4d3eaa47476ee0a871f6c0a247d581013c395ffba953b1c6189f402e8fa7a2a5014a9f10e9e9022eadc1de0ce15d22c50741e3bbdb9d533e9804c0e53991 SHA512 2e7cf4cc6c678a7c6b870c1a51f459c06bed247f14a304013a75d76e1683f10b8c1b51f78b23c43f28b60dc32e89dd1a92c7f20bed841a2e48e3159f0c50d381
diff --git a/net-misc/cgminer/cgminer-4.10.0-r1.ebuild b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..016755b9d44c
--- /dev/null
+++ b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
+IUSE="doc examples udev hardened ncurses ${HARDWARE}"
+
+REQUIRED_USE="|| ( ${HARDWARE} )"
+
+RDEPEND="
+	net-misc/curl
+	>=dev-libs/jansson-2.6:=
+	virtual/libusb:1[udev]
+	ncurses? ( sys-libs/ncurses:0= )
+	udev? ( virtual/libudev )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	use hardened && append-cflags "-no-pie"
+	append-cflags -fcommon
+
+	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
+	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
+	local myeconfargs=(
+		$(use_with ncurses curses)
+		$(use_enable ants1)
+		$(use_enable ants2)
+		$(use_enable ants3)
+		$(use_enable avalon)
+		$(use_enable avalon2)
+		$(use_enable avalon4)
+		$(use_enable avalon7)
+		$(use_enable avalon-miner)
+		$(use_enable bab)
+		$(use_enable bitmine_A1)
+		$(use_enable bflsc)
+		$(use_enable bitforce)
+		$(use_enable bitfury)
+		$(use_enable blockerupter)
+		$(use_enable cointerra)
+		$(use_enable drillbit)
+		$(use_enable hashfast)
+		$(use_enable hashratio)
+		$(use_enable icarus)
+		$(use_enable klondike)
+		$(use_enable knc)
+		$(use_enable minion)
+		$(use_enable modminer)
+		$(use_enable sp10)
+		$(use_enable sp30)
+		$(use_enable udev)
+		--disable-forcecombo
+		--with-system-libusb
+		--with-system-jansson
+	)
+	econf "${myeconfargs[@]}" \
+	NCURSES_LIBS="$(${PKG_CONFIG} --libs ncurses)"
+	# sanitize directories (is this still needed?)
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h || die
+}
+
+src_install() { # How about using some make install?
+	dobin cgminer
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		use udev && doins 01-cgminer.rules
+	fi
+
+	if use doc; then
+		dodoc AUTHORS NEWS README API-README
+		use icarus || use bitforce || use modminer && dodoc FPGA-README
+		use avalon || use bflsc && dodoc ASIC-README
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c example.conf
+	fi
+}
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
deleted file mode 100644
index bcfc4b2aa996..000000000000
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
-SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
-#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 avalon7 avalon-miner bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
-IUSE="doc examples udev hardened ncurses ${HARDWARE}"
-
-REQUIRED_USE="|| ( ${HARDWARE} )"
-
-RDEPEND="
-	net-misc/curl
-	>=dev-libs/jansson-2.6
-	virtual/libusb:1[udev]
-	ncurses? ( sys-libs/ncurses:0= )
-	udev? ( virtual/libudev )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	use hardened && append-cflags "-no-pie"
-	append-cflags -fcommon
-
-	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
-	local myeconfargs=(
-		$(use_with ncurses curses)
-		$(use_enable ants1)
-		$(use_enable ants2)
-		$(use_enable ants3)
-		$(use_enable avalon)
-		$(use_enable avalon2)
-		$(use_enable avalon4)
-		$(use_enable avalon7)
-		$(use_enable avalon-miner)
-		$(use_enable bab)
-		$(use_enable bitmine_A1)
-		$(use_enable bflsc)
-		$(use_enable bitforce)
-		$(use_enable bitfury)
-		$(use_enable blockerupter)
-		$(use_enable cointerra)
-		$(use_enable drillbit)
-		$(use_enable hashfast)
-		$(use_enable hashratio)
-		$(use_enable icarus)
-		$(use_enable klondike)
-		$(use_enable knc)
-		$(use_enable minion)
-		$(use_enable modminer)
-		$(use_enable sp10)
-		$(use_enable sp30)
-		$(use_enable udev)
-		--disable-forcecombo
-		--with-system-libusb
-		--with-system-jansson
-	)
-	econf "${myeconfargs[@]}" \
-	NCURSES_LIBS="$(${PKG_CONFIG} --libs ncurses)"
-	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h || die
-}
-
-src_install() { # How about using some make install?
-	dobin cgminer
-
-	if use udev; then
-		insinto /lib/udev/rules.d
-		use udev && doins 01-cgminer.rules
-	fi
-
-	if use doc; then
-		dodoc AUTHORS NEWS README API-README
-		use icarus || use bitforce || use modminer && dodoc FPGA-README
-		use avalon || use bflsc && dodoc ASIC-README
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c example.conf
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index cd2ab1236116..126be7ed8c04 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,6 @@
 AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a4869437d2d392274c0f0586153406480eb1614297420e161285d981eedf03a4e090a309dfe55163e13387bf4c649586847ccee64dd2e88f9c7263b6b66 SHA512 f4aa5a2473c1872d06fea2611594f63c888717cd93618587b020dcb6aaeb7889443358dbc74da5c7763fb6ef08a6ecf9345d94874c582c799abbf8db8957c790
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
-DIST chrome-remote-desktop_93.0.4577.16_amd64.deb 34074424 BLAKE2B 327dddfa0542c111d0ea88568f6b48d0b19a60b945f92cb07280b4d6727176b7dc4a85fd4ed67048f04b49ae1e3358fb6c48c8c170bd7b957ccc8b6dbf96511f SHA512 c46dd3f512531d06b149624f5a8d8314228695584937ab3256c83fb18fcafaa50613336b5679b4e105f27ae84c3f576ed12aa918c57d8309b6f4e05a78b2e4ea
-EBUILD chrome-remote-desktop-93.0.4577.16.ebuild 4784 BLAKE2B f3c4cacbd1293c8d5f79c8a1115cd3871cdae6244a8cccfc6a3a9134958eb72ad9d461cced109cb7f9a2fa7ec7040766ee47aeeda34d88c4881e913b06b940f1 SHA512 9138c318e04ad0515493dd653744d573bc000637eb8cfbf154aa413a9cc07b95a0b0f16d4c59467815dd3dfe8251c849451c9e23c5874010717c60c934b711b7
+DIST chrome-remote-desktop_94.0.4606.27_amd64.deb 56546400 BLAKE2B 20d2920b5090f44ffd2b5843e2e08e8073eaec32e30da03f904a73ebaf9ba80b6b08c3e23af4963bbc8d42611b264b65874c61f2ded386de524431cea01c95a7 SHA512 5a322a83fa4ebefa5597e87ff99b46c630f1386563f43ebdd1e891e880be06bf2974bbbe09b62bdb84778c5e5b71e4d0c31e76eab1985aba58404a43fbecd8f7
+EBUILD chrome-remote-desktop-94.0.4606.27.ebuild 4807 BLAKE2B 7fa6f8a5bd362b817b1dc018dcc9ac9d05ad3548815cd17141c8b234eb1042e1e0880d9cb3d761b0a15fab7f9e9ba91002320a5c664e87e423883cda3c8e652d SHA512 dc4a8ccee7866e920d90c3ba6082487ed2a3b7bd79e1cf8440ef28f9e839f12eeed9b0726bf153f2bda818d3b3a6ad5a8c4ee2a2f8396fd59d53d16847e41b92
 MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-93.0.4577.16.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-93.0.4577.16.ebuild
deleted file mode 100644
index df0836d47b36..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-93.0.4577.16.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi 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 unpacker python-single-r1 optfeature plocale
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523
-	https://chrome.google.com/remotedesktop"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist mirror"
-
-# Packages we execute, but don't link.
-RDEPEND="app-admin/sudo
-	${PYTHON_DEPS}"
-# All the libs this package links against.
-RDEPEND+="
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	$(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-apps/dbus
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-apps/xdpyinfo
-	x11-apps/setxkbmap
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb.
-# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before being checked.
-# - The Xorg invocation uses absolute paths with -logfile & -config which are rejected.
-# - The config takes over the active display in addition to starting up a virtual one.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND="$(unpacker_src_uri_depends)"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-91.0.4472.10-always-sudo.patch #541708
-)
-
-src_prepare() {
-	default
-
-	gunzip usr/share/doc/${PN}/*.gz || die
-
-	cd opt/google/chrome-remote-desktop
-	python_fix_shebang chrome-remote-desktop
-
-	cd remoting_locales
-	# These isn't always included.
-	rm -f fake-bidi* || die
-	PLOCALES=${PLOCALES//_/-} plocale_find_changes "${PWD}" '' '.pak'
-}
-
-src_install() {
-	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
-	rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; }
-	plocale_for_each_disabled_locale rm_pak
-	popd >/dev/null
-
-	insinto /etc
-	doins -r etc/opt
-	dosym ../opt/chrome/native-messaging-hosts /etc/chromium/native-messaging-hosts #581754
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-	fperms +s /opt/google/${PN}/user-session
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	optfeature "Dynamic resolution changes" "x11-apps/xrandr"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) run ${EPREFIX}/opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
-		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
-		elog "    (d) run start-host again, and past the code when asked for an authorization code"
-		elog "    (e) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-94.0.4606.27.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-94.0.4606.27.ebuild
new file mode 100644
index 000000000000..51e526f00dff
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-94.0.4606.27.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi 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 unpacker python-single-r1 optfeature plocale
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523
+	https://chrome.google.com/remotedesktop"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="bindist mirror"
+
+# Packages we execute, but don't link.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}"
+# All the libs this package links against.
+RDEPEND+="
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-apps/dbus
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-apps/xdpyinfo
+	x11-apps/setxkbmap
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb.
+# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before being checked.
+# - The Xorg invocation uses absolute paths with -logfile & -config which are rejected.
+# - The config takes over the active display in addition to starting up a virtual one.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND="$(unpacker_src_uri_depends)"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-91.0.4472.10-always-sudo.patch #541708
+)
+
+src_prepare() {
+	default
+
+	gunzip usr/share/doc/${PN}/*.gz || die
+
+	cd opt/google/chrome-remote-desktop
+	python_fix_shebang chrome-remote-desktop
+
+	cd remoting_locales
+	# These isn't always included.
+	rm -f fake-bidi* || die
+	PLOCALES=${PLOCALES//_/-} plocale_find_changes "${PWD}" '' '.pak'
+}
+
+src_install() {
+	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
+	rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; }
+	plocale_for_each_disabled_locale rm_pak
+	popd >/dev/null
+
+	insinto /etc
+	doins -r etc/opt
+	dosym ../opt/chrome/native-messaging-hosts /etc/chromium/native-messaging-hosts #581754
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+	fperms +s /opt/google/${PN}/user-session
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	optfeature "Dynamic resolution changes" "x11-apps/xrandr"
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) run ${EPREFIX}/opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 286629544b44..dde2652569e2 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,6 +5,6 @@ AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea710635608
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
 DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
-EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 26ee75040500664b3c20fb6f9e2f189a95f51095efc1c2844df9d88d59901a6a4b0a891feb4dd7476381e05d7e9f418178555857b701c56581ab475005ad4262 SHA512 56590e49f6db5644d85a9a75b4a3f03bc306694580967746be51ae953e33b43717242b55344bd85598e7023d72f64f4897128172abe7edeb213814f0744799d1
+EBUILD chrony-4.1-r1.ebuild 6639 BLAKE2B 6eaed55fdefe2f6e96933f13a59785058fb2547c6571da6af8a296731c20b52f89e7ea2336b54e8e373d117ed18a48cef5cb359d1de4d31135932c1382979764 SHA512 c7239dd1c7b4c753a05019c31b120022e0bc4b493ef80d8528ae379105d8a0ba553c93ac429ebbff9acc9a77f1e4b312e7ed5f8ed4d48c861f226a2e6c7bcfbd
 EBUILD chrony-9999.ebuild 6639 BLAKE2B 0cba522a8f0ef1addaf4c05ac05881ba17fd24b727b9117f31b835680cace7afaac872c1ac84a56d000f68cbf6aeb092c7bb7236b1f3a3a0debeafb10afe10d4 SHA512 5bd344725e7d9704a6f046e9ccbff9fe1ad6d3ebe4af1380b687f493d9e8ca36cd879537c89580d914fac5c55e3663796e7fe8f4361039aae16b5ab969827240
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.1-r1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index 8bbf54dc2baf..600250a5169f 100644
--- a/net-misc/chrony/chrony-4.1-r1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 514ecaadd266..dbd92bc1e1db 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,5 +8,5 @@ DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557
 EBUILD curl-7.78.0-r1.ebuild 7962 BLAKE2B 22e11af875ee637a45cb4af83d295aa7cacbcf3fac349bd3f7ddefd03f0fa3b1348d2356cd2547fb8891ff1f47ebf1fae6ac3d5e214bb74a7d16d85f55e7b944 SHA512 9fff1fdddf753e8ac210f01cb24e48dd87a9f603f2a3f5c0e4836177f827636940ff796e06bd3d4276fb3debad7168704047c0993bdc8fa67278f4706dc99653
 EBUILD curl-7.78.0-r3.ebuild 7969 BLAKE2B 02cc15b20edb0f2102dfa3fa7cf43d04181a86af9690b24781607a08067b4ad3312c5fdcc3b4bf92373512ee8f5be3c7beeb63128042cd6a555f18ad490a250e SHA512 80aa6a4a1190a9fd0c6af379c8a58e10e5c9c05eaa8307c11a7e10307c7cd91f4732c33ddf7838cc4e8d9a9aabc5bc3b3aeb0af034755e715457d4852f836c33
 EBUILD curl-7.79.0.ebuild 8101 BLAKE2B 6a0e710d1e8d6214d096f4e693278f520336e68e18714df27f9f259f1b31569c1adeed83ff47bcc851511e084aed0688e698a0d5306964499a0745904245f6c6 SHA512 243bc5b883f1d0231d0db376e3fd4034f5c5328c6009f5711bd5d3dc9481303a30142e191da40e9815a13aacb42ef7df359c603e92243f2d920aae6f32cbe12f
-EBUILD curl-7.79.1.ebuild 7964 BLAKE2B 5839f5f418224b78090012eae1b16661e1c6e08165671769910b3daa1ca8fea5b1d2cfda32b1b849b35f5875d9021a87776250cb5353b2dcc726e9d999482efc SHA512 26a87695d9295cdca045ababf9f844d0b2ded1ad42ebe426806e6ba99eb072933badf28be5bd952ebd7335d35d86334b89d66870c8c41ed8e797ff9d997f96bf
+EBUILD curl-7.79.1.ebuild 7963 BLAKE2B 4cefd055870715e78614ccf362adb8915c7374a83517ab5855a130fddf7520ab3679f20952dfbc96de04ab9b1ccca2f3003979b87d7488b1dcc5f80bc5a68e1f SHA512 fdc7b2a51993a98d4554a076c49956f00d2dd47086fe554872a46663775f9f37870632c9967da6fe5ceb5e82a999530a6f1a7698679e3be9531768b94b6648f2
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.79.1.ebuild b/net-misc/curl/curl-7.79.1.ebuild
index 952b25afe63d..8881f8c3faa8 100644
--- a/net-misc/curl/curl-7.79.1.ebuild
+++ b/net-misc/curl/curl-7.79.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 7406e083493d..197f6e320a80 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-130.4.4978.tar.gz 99316040 BLAKE2B 2760b2f94e0c5308660698b3887df062518f950e145499dd8b082a547a75415ad6fe60c5a505c2c4486a579447f6f9656e7f2306e7dfa51f8f300df989a2cc38 SHA512 160f1e7cb9f91ead905e35f79cccdc08c661053143c681a3766c57384bf7b61015fd4c6521aa0a8bdca5c1e6ae88f2dc997a6aec6024f6309c785d5a6baa48dd
 DIST dropbox-lnx.x86-131.4.3968.tar.gz 99373510 BLAKE2B f9db71b392218b09d1428729af8ad83353c9c9b045342af7fcb19d63e318d260cf35ec8ce52ab14eabd6f5c5e094f9f6fb14517fed806381ee5d6f1f61e16ae8 SHA512 3b220c9768199e7cafafde5b73c0ea5a976aa73ed2b9bba9fcc116c25a0da362b1cff65d86f71c3c75a7ba82337c4d4673abf56934ad0e4b4a6c797e7664f4c5
-DIST dropbox-lnx.x86_64-130.4.4978.tar.gz 101155639 BLAKE2B 097802a707049c2c5eea8cd66c950c9f7139b9e53119269714d8b474bcdc6746b7de3fd57c79411208bfb8ee9015ba47ef0ab2b836adae621f78f26c3974d928 SHA512 4a317bb15bcf7e5b02bc3da4a23cb34dd52c353c667f3290eca1206aaddfe7ef8885296b97c2b7619aa74f85d64f51133908510436eb0dfca011c8cde5fa6ddf
+DIST dropbox-lnx.x86-132.4.3800.tar.gz 99450051 BLAKE2B c765236721e462a1f0a1b1d48bfc1bb80c8347a0b64b0fb37a68a03fc10ff69274e84065802d31419d5810324a41e638eabeafc1563b2b464770fafd40b5be1d SHA512 8a132623b4dde39e0e39d88a4ca90c88c6349236a7e3941be77f1784fd1a289a803a211f532b78d7805c5e765d0f358a20745a6300ad4c1e16f385fb82b01625
 DIST dropbox-lnx.x86_64-131.4.3968.tar.gz 101176952 BLAKE2B da7470b1f401792874e6fd1c0fb2546d38f111f0db232f20adb9488ee844c7cbe469362f1ccb74b8708da43fd7389642ca5ba5579de60ae340c13f833add63cd SHA512 1a6b9262f31f540c4aa718058106dafc990694ef26f247d0f43e32592a2bfcc831dd2f1009feed634299546034aba4451fc7ce621f8574bb83510b783011b78e
-EBUILD dropbox-130.4.4978.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
-EBUILD dropbox-131.4.3968.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+DIST dropbox-lnx.x86_64-132.4.3800.tar.gz 101246481 BLAKE2B 9ad48da71e42810dcd898fb3f52e5b0a6c0791be03a41ab54a5a97c88c635542ccfb528e2b8d6165b9d8497ac48002d62139eaad649fb4fac694975542dc295a SHA512 e4b7fdcfe8aeb67f523f2ce320dba7e689e9947d741f2ae21a0a12a3f25dab6e3e9a67394d312149b5e181207d0c2b28d417684b739d3462c9984ccca3fba3c3
+EBUILD dropbox-131.4.3968.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
+EBUILD dropbox-132.4.3800.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-130.4.4978.ebuild b/net-misc/dropbox/dropbox-130.4.4978.ebuild
deleted file mode 100644
index 83389e2d0ede..000000000000
--- a/net-misc/dropbox/dropbox-130.4.4978.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-131.4.3968.ebuild b/net-misc/dropbox/dropbox-131.4.3968.ebuild
index be2fed244fff..83389e2d0ede 100644
--- a/net-misc/dropbox/dropbox-131.4.3968.ebuild
+++ b/net-misc/dropbox/dropbox-131.4.3968.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/dropbox/dropbox-132.4.3800.ebuild b/net-misc/dropbox/dropbox-132.4.3800.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-132.4.3800.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index d1a8196a0ec4..42042f5b8beb 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -3,6 +3,6 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
 DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
 EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
-EBUILD ipv6calc-3.1.1.ebuild 1532 BLAKE2B 94dc5e9c2c3567f8f838e750c5e8ff5bc2deb9f72d6893252a3eca1a29bd647936a23e972979afd28c6888e3e48a203dddac7f21ae2d78713fb59aa23ad9dafc SHA512 4b613ccedda6b597f7bfd226a62a5a5d87efad5213a83940779ba30fac030e792ebf735ebe69867619cfee3804aa616d808f8987242d7cf42bad73eae735e2fc
+EBUILD ipv6calc-3.1.1.ebuild 1531 BLAKE2B 6ec62ec4b7b14c5ac33672c35b2699f02d1c0d07e71c3718cbfdeb3b5c577bd8897c2803239c600edaa580c8b472bf932855b63c3af607de16fd7edb446a90dd SHA512 85189a0d6df24ae0c09369ea7a0a1fb567c77bee782443f633fff509fc874101fed583cb0991c59e55c4e5138449ba30874134a3ededb64264c60ad914e3809d
 EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
 MISC metadata.xml 335 BLAKE2B 80a2b9fa130b3475f0045dc1626eb166078e1f091632013bcb48af829da11ab8f8c6fa61e107ddf1636eac2282493d370eb639669383f7f00e56cbbdb8ce5028 SHA512 a95df3df487415da7ba079eb8de0466bda61770e128761b8d8a9158aac7b22727287d2f35ba7bc6ad00c2e80037892dac6c9e2ce7ad1beec2bc9b2329e14688c
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
index 434e03208517..811fa957aae5 100644
--- a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 5e062afc5cd0..0866e535b9c9 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,4 +1,4 @@
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-4.0-r1.ebuild 657 BLAKE2B 3a6afdd6c47d6821f8404f7ee25159037311fb4473e0a0547a8c644a8a67c11cd24ad3a34631f9182b8af99ca315b9944f34cef7fa85d4b0e3cd363047606c81 SHA512 6187f5c991fe6a97d7bc38fe5682423e8bbd4b910389170e26cdec3a2c6b3023e5a6fe833263e65ce3f325de86f75682790d737b207c117cb445846d2db99dc8
+EBUILD jwhois-4.0-r1.ebuild 664 BLAKE2B 666303e775b637fef393fea99934c39b55ea91815bbd0913aa40cbb5575351753577798b9e2f0156d79bcd1db1fbeed1462a3ca06603cdf4e0c7238f3c3ea562 SHA512 d638232665d795b390bfc1b00c2cf7bee128c28419d7c5d9536b277ecd6b7ca8f1238d385da8e0f5622ed5219ab15cb4752c56b27be19ebbed75315e32b3d221
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
index 1295e7ccaa1b..76aed521cd1e 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="idn nls"
 
 RDEPEND="idn? ( net-dns/libidn )"
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 45cba4dae865..717130620a7f 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,4 +1,4 @@
 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
-EBUILD libteam-1.31.ebuild 1376 BLAKE2B bbe7da39ee1b060d9448bd896e5647e19374385d3d2f8d357bda4765ff21da54da1ded48cfe4524ab6c52b3e3c9495c219eaa23b74c8513714f7c7ae97498d3a SHA512 6b7de214291db783da00efd4961db75a2ac3cad334a468e9522073413bd6481d84bb051609ed5bf0ed13ea2f8dce1278eaa714cbe7a2699a6d7550abeb6d8baf
-EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
+EBUILD libteam-1.31-r1.ebuild 1378 BLAKE2B 61109387a3006a1920cd601fee8d7e3c3e25b401663b0d88a0d5c5626227e1ebd969cf42a43ead9accdd18c4d5f6bf6f1bdea73bebd033811d85ba309046c0b1 SHA512 92d5397e28164a39cae8dd0b27bf071cffe2950ffd7597773f17458f80c08e1cd6d96eca1dc44d134d8b5574efb2d66f3e8f862eb096bf0eb8c2bcfe16270e70
+EBUILD libteam-9999.ebuild 1376 BLAKE2B 5fa7c1e920e3da20202f498aec02c06c065a02d1f7f7b728e4ac2a72b848ddf4b78502301c405e577695f5484f228bc1430e2b27ce00c710f3a0669a53e8080d SHA512 0f2bea1d19f697edc7ad1e881f19f6eb6bfb77cbaf8bd946c4b00be5f26fee2281142f0d4f8f01dcfef97fd8faa4f7ea435b15e9dd4952ea52a063ad57a8e075
 MISC metadata.xml 335 BLAKE2B 481d37450ef0da0cd8a77fd8b73d67fee888f13bd984d52764c8e1694f5e128ad0dafa76c2851780ebc14a72d32a31cf0e598dee6960e9b10bfeca443dbb58ed SHA512 a6cb9893ad138246b783e91995b343d5b99d2becf776917bd413e64946373bfab7389fd958e8096061e1a8f2c52bb35ad69538bbddc6a0a9cba42ccfc1703c00
diff --git a/net-misc/libteam/libteam-1.31-r1.ebuild b/net-misc/libteam/libteam-1.31-r1.ebuild
new file mode 100644
index 000000000000..11ec2522cd21
--- /dev/null
+++ b/net-misc/libteam/libteam-1.31-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Library and tools set for controlling team network device"
+HOMEPAGE="http://libteam.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="dbus debug examples static-libs +syslog zmq"
+
+DEPEND=">=dev-libs/jansson-2.4:=
+	dev-libs/libdaemon
+	>=dev-libs/libnl-3.2.19[utils]
+	dbus? ( sys-apps/dbus )
+	zmq? ( >=net-libs/zeromq-3.2.0 )
+	"
+
+RDEPEND="${DEPEND}
+	syslog? ( virtual/logger )"
+
+CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
+ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
+Only >=3.3.0 kernel version support in team mode"
+
+DOCS=( README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		$(use_enable dbus) \
+		$(use_enable zmq)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dbus-1/system.d
+	doins teamd/dbus/teamd.conf
+
+	if use examples; then
+		docinto examples
+		dodoc teamd/example_configs/*
+	fi
+}
diff --git a/net-misc/libteam/libteam-1.31.ebuild b/net-misc/libteam/libteam-1.31.ebuild
deleted file mode 100644
index b1e39576ac21..000000000000
--- a/net-misc/libteam/libteam-1.31.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
-		$(use_enable zmq)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild
index d4c4a38f6d61..a5a895f1bca1 100644
--- a/net-misc/libteam/libteam-9999.ebuild
+++ b/net-misc/libteam/libteam-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 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
-DEPEND=">=dev-libs/jansson-2.4
+DEPEND=">=dev-libs/jansson-2.4:=
 	dev-libs/libdaemon
 	>=dev-libs/libnl-3.2.19[utils]
 	dbus? ( sys-apps/dbus )
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 31c64f201d76..93fdc732c46e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -6,7 +6,7 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74bbac038db329d84f2b9229e6db8204c2c0b55075ef238a5c3fa3751de5a0fb843a2ee0e71a648a194aed832d6dd36 SHA512 46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835
-DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
+DIST memcached-1.6.12.tar.gz 618614 BLAKE2B 45de1c9610781ed6ab27261642db62b65a846651df64d9db2658ce8bc1cd96a798add6099340281c9dadc470e81b86976b855f4bece29189cfcfdb9b4e3a8991 SHA512 6cf41f14679ffac096195c29cf79741f28069e92d8ceddd5039061f1b8d3d4018f2983a6e43a27306ff299f9198e56f9ebd8ee8b62aa4882b38a0aa712ab1779
 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff
-EBUILD memcached-1.6.9.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff
+EBUILD memcached-1.6.12.ebuild 2868 BLAKE2B 637e796bac6f590459dbccd3c6068b1d7bdef9bf92595f6b3def557a4803d8f32e8a391c582a3b824110a136d557247227190ada8d78184c76e05e57b70d4d94 SHA512 d9c61fedbe070116105346ac78e9a310fa4f0a0da7d070387a6477cb0340205f795f5bc4cee283a5bb6faf012c8b4aadb56138df57bb4c9ed6a1ffb0a5b7a61c
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.12.ebuild b/net-misc/memcached/memcached-1.6.12.ebuild
new file mode 100644
index 000000000000..16eba892a140
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.12.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
deleted file mode 100644
index 4126566cc8e8..000000000000
--- a/net-misc/memcached/memcached-1.6.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-
-	eautoreconf
-
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index aef0b2c24d06..f2e3e5eadfe5 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,7 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
-EBUILD networkmanager-1.32.10.ebuild 11698 BLAKE2B e45673bb8ce592470e5ac16f3b567b532ed86cde0410c2c34e76a118a5e273e8474354dd0fec89713910f742471586418da9906d4cfe5029a026a226f8884701 SHA512 50e90563b2a4e5e14ec91c2f6ac5b65272a644a70cf365e2e8fd3ab43742c7ba1133bfa525bbfa63c4b278550dbd996d67c3b2d13c29cd05ba3275a299309f54
-EBUILD networkmanager-1.32.4.ebuild 11367 BLAKE2B 3e06b9f6ec8c4d21536e7befee437a2f18abdf86bccbe8ef1151297f14f676141687b38884310ff10039000583d110c5919a58d443e79f8400c82ff1d324bf6c SHA512 61939b3e2e5e55915b59eec4701882a6037d80e9c546bef3ac126eb8a7a732874d1b153b315f2a51514190a8ba6a63dfeff9cf8b7de864d8faa8688aac0e0fba
-EBUILD networkmanager-1.32.8.ebuild 11380 BLAKE2B dcbbed663f29fa55d547ed0bf96ca34c2f3db56b6090d45084d9083254c1e9abd72fd2cff37289d5b2e82477d43ce70556da82b4583b04f9b4ea23c543735856 SHA512 4ac72dd4be5e7a1bdc301fc9c47411001520e3409fc6bfa75621cfffa4a6903c7ae61693ac7d7ba46db1d6e125e7d144e3140c29cb1de1149237b2c6738fa36e
+EBUILD networkmanager-1.32.10-r1.ebuild 11702 BLAKE2B 1cf59b4a1f897e8f90627366e25c1968a86d39eb53abb3a7c9ebb215cfbfcc119d4567fa79f61e1aab552f556e941dd3d9a222f5fe41f2f775f58e704b968d24 SHA512 c75aaa71f32e2cb141419b66c107cd5dbff5ba218849dd7e9cc7a953a3915b8ebc1f6b3bc823eb20785ee36be2b6d2208820672b7f7360bbf0ca65142bdaed20
+EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
+EBUILD networkmanager-1.32.8-r1.ebuild 11384 BLAKE2B 8ba69b4605e75af3d6ae5cdded420ab18aba256b9ea4dee03885d068f0715e405c8fa6698a7c8bce9f6578293d37ca357829f801cebcef55cc3982c197b22648 SHA512 01ef6f7183dcf8d0876a725f729d8d064b492c295ec12345465fe74823d26a14dfd03a4f0331283dcd8d98c8606bc46ca2c8d1ab10385b5516ac1f02a8904667
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
new file mode 100644
index 000000000000..b9e3074cd696
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org linux-info meson-multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? ( sys-libs/libselinux )
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5 )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		sys-libs/readline:0=
+		>=dev-libs/newt-0.52.15
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+		#-Ddnssec_trigger=
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+
+		$(meson_native_use_feature resolvconf)
+		-Dnetconfig=disable
+		-Dconfig_dns_rc_manager_default=symlink
+
+		$(meson_feature dhclient)
+		-Ddhcpcanon=disable
+		$(meson_feature dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_true docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -rf "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var}
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.32.10.ebuild b/net-misc/networkmanager/networkmanager-1.32.10.ebuild
deleted file mode 100644
index 86e790b61b6d..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.10.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		sys-libs/readline:0=
-		>=dev-libs/newt-0.52.15
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-		#-Ddnssec_trigger=
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_native_use_feature resolvconf)
-		-Dnetconfig=disable
-		-Dconfig_dns_rc_manager_default=symlink
-
-		$(meson_feature dhclient)
-		-Ddhcpcanon=disable
-		$(meson_feature dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_true docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -rf "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var}
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild
new file mode 100644
index 000000000000..b023b5c78bca
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson:= )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson:=
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-nft=/sbin/nft
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			src/libnm-client-impl/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.32.4.ebuild b/net-misc/networkmanager/networkmanager-1.32.4.ebuild
deleted file mode 100644
index 3d7eb43a02fb..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.4.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
-		net-misc/mobile-broadband-provider-info )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-nft=/sbin/nft
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
-		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
-		# (There is no off switch, and we do not support upower.)
-		# bug #747358
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			src/libnm-client-impl/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild
new file mode 100644
index 000000000000..fbad986ec7e9
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson:= )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson:=
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-nft=/sbin/nft
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			src/libnm-client-impl/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.32.8.ebuild b/net-misc/networkmanager/networkmanager-1.32.8.ebuild
deleted file mode 100644
index 65d9c9df00d6..000000000000
--- a/net-misc/networkmanager/networkmanager-1.32.8.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
-		net-misc/mobile-broadband-provider-info )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-runstatedir=/run
-		--disable-lto
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-nft=/sbin/nft
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
-		--with-crypto=$(usex nss nss gnutls)
-		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
-		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
-		# (There is no off switch, and we do not support upower.)
-		# bug #747358
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		--without-dhcpcanon
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		--with-config-dhcp-default=internal
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			src/libnm-client-impl/libnm.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libnmincludeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index b96d2b9e215f..62141f8555c4 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,12 +1,10 @@
 AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a43151c5bd8ffb7d231542abc3ee42f450fad2eeed4e1d3e641ee4ac246d43174d69de4de7384516dd9a22c26a1c878ab0aa06f7e SHA512 0a92815371923bce701edd362583e11977556f17866fedf13ea48ed26e409610b80eb7a6b6181702b59250fa3868319624bdad34911746490f5a8330ad94b4a2
 AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091
+AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
-DIST nextcloud-client-3.2.1.tar.gz 15234115 BLAKE2B 2fcbaab4e73db3cfbf7dea750a0e0782c6cb8bb03c867653a47d2f21cfe369da8e4eff8bf1f0ff548c62909e770132799a927e18f9c732a4d551b97ff6362572 SHA512 bf2b4e1c85e07ad32ed00efa4a56d6b4195b42f4d95c7cb32d8c43d2c5564ac1512155a9f51508d522366c5ce44104f1b076f1addef1147a77ace5a11bd500e6
-DIST nextcloud-client-3.2.2.tar.gz 15398900 BLAKE2B b91c814977486db57b1864f71d3763c64f676449a5547f21bb379154f66a38bc4db355bb16cc6a70781cb45d4a4704f55238dd570f123b450c512bc3e0ce5b3c SHA512 ce6adbb09ee8495448b7da0c5e9637b3c775d28b8ee1656864843264bdacffbc402c9f507ced3e3943896ae25ee73975054b8ffa1577bdd3d32dc453c3f94d74
 DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d
+DIST nextcloud-client-3.3.4.tar.gz 14032214 BLAKE2B 2d5a4cb8ed2aff6166e13c5e7ea5450d9b9ba1f385eb3cb99588584d1ccaf114ecdd4ed2fa0bdfcba6e5582df8e4bcdee371ef0de8c023fde131f23828d30fbf SHA512 c4fe2d032161fea556610396c5b51d6745f41de76d17e21fdd93ed0163f2079d1abba997a3184842403041cc25a303c5844fbd2213717b27d11ff9612f364151
 EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
-EBUILD nextcloud-client-3.2.1.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
-EBUILD nextcloud-client-3.2.2.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
 EBUILD nextcloud-client-3.2.3-r1.ebuild 2175 BLAKE2B 9f3c68d6afd38a786b1808860b77b2f05c53361b7dbfae0a52bb0f46114c56f2f6c510b3d339179549af132b34478ae84e361313e47362ca53677dc0025b62ff SHA512 93364128839e839fb76752cb753301652dec39a6ff936dac43e90ca636180703889b1e48c79a0f9e814a9c094534e96d474583d2aee3222eabd3b3b4410a8797
-EBUILD nextcloud-client-3.2.3.ebuild 2034 BLAKE2B 6b5c122bd2c5d519ee1945a175298b723d5198043b00780d1cf937110a0c016014d34f8f66bb23bdeb4e5cb2aa8b82abe6a4a4397b2ccded916e34ab1217377f SHA512 6498817e25c0b7155afdf7a53fcfa0ca52cb7a3096645efdf72f8f35df7d5247db55677abd7524f78ea795813db23af7ae6d932c5adb5c6bc6c352eeb7fd25b2
+EBUILD nextcloud-client-3.3.4.ebuild 2166 BLAKE2B 81877061305f13dd5fb75bb56c39aaedc49b63624b35a536fd1ce711468c2608da0c1d4e64d26af729ccac65b44f8f2bd087bdd1b61403f938986940242c1c93 SHA512 9cc5ee0c40d68b797aa83cedd7c2347bf446d187eb3435d91ece998e22684b7dd25467d83656e3cc8e1d7a6f0c3661c30b5cde105b53bdba7574e4dc8decd937
 MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
new file mode 100644
index 000000000000..8e5510db04d5
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
@@ -0,0 +1,54 @@
+From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
+From: Heinz Wiesinger <pprkut@liwjatan.org>
+Date: Thu, 26 Aug 2021 16:07:25 +0200
+Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
+
+Signed-off-by: Heinz Wiesinger <pprkut@liwjatan.org>
+---
+ src/gui/CMakeLists.txt | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 970d2fc165..efe1b1c349 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
+ endif()
+ 
+ # Generate png icons from svg
+-find_program(INKSCAPE
+-  NAMES inkscape inkscape.exe
++find_program(SVG_CONVERTER
++  NAMES inkscape inkscape.exe rsvg-convert
+   REQUIRED
+-  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
++  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
+ # REQUIRED keyword is only supported on CMake 3.18 and above
+-if (NOT INKSCAPE)
+-  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
++if (NOT SVG_CONVERTER)
++  message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.")
+ endif()
+ 
+ function(generate_sized_png_from_svg icon_path size)
+@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
+   set(icon_output_name "${size}-${icon_name_wle}.png")
+   message(STATUS "Generate ${icon_output_name}")
+   execute_process(COMMAND
+-    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
++    "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
+     WORKING_DIRECTORY "${icon_name_dir}"
+     RESULT_VARIABLE
+-    INKSCAPE_SIDEBAR_ERROR
++    SVG_CONVERTER_SIDEBAR_ERROR
+     OUTPUT_QUIET
+     ERROR_QUIET)
+ 
+-  if (INKSCAPE_SIDEBAR_ERROR)
++  if (SVG_CONVERTER_SIDEBAR_ERROR)
+     message(FATAL_ERROR
+-      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
++      "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
+   else()
+   endif()
+ endfunction()
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild
deleted file mode 100644
index 7e82191086ca..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	>=dev-libs/openssl-1.1.0:0=
-	nautilus? ( dev-python/nautilus-python )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DBUILD_UPDATER=OFF
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild
deleted file mode 100644
index 7e82191086ca..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	>=dev-libs/openssl-1.1.0:0=
-	nautilus? ( dev-python/nautilus-python )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DBUILD_UPDATER=OFF
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild
deleted file mode 100644
index 4bf713797b35..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.2.3.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 cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	>=dev-libs/openssl-1.1.0:0=
-	nautilus? ( dev-python/nautilus-python )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-inkscape.patch )
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DBUILD_UPDATER=OFF
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
new file mode 100644
index 000000000000..79fbb809fed5
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	gnome-base/librsvg
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-inkscape_to_rsvg.patch )
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 772cf407df02..2694dd4ca55a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -18,6 +18,7 @@ AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb6
 AUX openssh-8.7_p1-X509-glue-13.2.1.patch 1679 BLAKE2B 2f79c3bc5b3fd93cce0aea23cd16b98fd8031b2ebed21a5360ec84e43ec02565e464fa47db99421f8b94994073823e4dfe590bd5374bf803c8065f1a8c065d6b SHA512 05796a8c6e01456d4e6ad0cc66490b7a9479f8f36854532b392b49c20d3a62e77e13f067b77460b2b3098a6ada3944f821220aa663d6a766cb9d9e1f9bcc6b9d
 AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154
 AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2
+AUX openssh-8.8_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd-r2.initd 3197 BLAKE2B b992cc2353f23c0f343bd914e6745d0e2b82364450f2baedc5c96b00e181ad7decef609ca41c1dbc57d53894492e98975a00329207a4696a278978ece66f7acb SHA512 bdd908a604f1ae460cb225c0753325381e638d68eeaea4a30e789192ee7d08d690ddf6ae0db5cc8bfbacf35151cfce975b97ccb6e81d22b2d01555f117342d34
@@ -34,10 +35,13 @@ DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c8683
 DIST openssh-8.7p1+x509-13.2.1.diff.gz 1073420 BLAKE2B f9de9f797f1ec83cd56a983f5b9694b0297a60e586898a8c94b4aaa60e5f561bb3b7730590fc8f898c3de2340780d6a77d31bfcc50df0a55a0480051f37806fd SHA512 dd7afd351ddf33e8e74bceba56e5593a0546360efb34f3b954e1816751b5678da5d1bc3a9f2eaa4a745d86d96ae9b643bd549d39b59b22c8cf1a219b076c1db5
 DIST openssh-8.7p1-sctp-1.2.patch.xz 6740 BLAKE2B 468a455018ffddf4fa64d63acb732ad3e1fb722ae8b24d06cf3a683167a4580626b477bbc286f296c83d39dd36c101ac58597a21daa63de83ad55af00aa3a6be SHA512 aa9067c9025b6e4edfad5e45ec92da43db14edb11aae02cbbc296e66b48377cbbf62cdafcdd5edfd1fd4bf69420ee017223ab52e50a42b1976002d767984777c
 DIST openssh-8.7p1.tar.gz 1814595 BLAKE2B 9fdb8898485053d08c9eca419c15d0d03b7a60152cf6a9d7f1beed3a21c9e6ac3bd9f854580e6e474fb0c871f3d4be9ef4b49bee8c355d9e5769a5505f4e6ea9 SHA512 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2
+DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0
+DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
 EBUILD openssh-8.5_p1-r2.ebuild 17581 BLAKE2B a971d17ec56d3a6217174c14cec3b273ce0a2d1835cf1ea7e7ef32f8769bd69b7fddc77ec59158744fe8d1463464d33813e4c361cfeafc3935afd4260df136f3 SHA512 07bee99c1b3c40d3b82a640960494b2f92ae1f47f7af3acb04507f5a5e3db35aaaea5d530d59723256b9952cedb8836a0157dd9f7101b2f94aafdcc7c1765944
 EBUILD openssh-8.6_p1-r2.ebuild 17655 BLAKE2B 51c2e441eebfab62ebb34eb83ab11ca024ff50a8a3444db82014e554c7d89de10757a45b0f81f4d704977cc7c75a55bae46dbd32bb88132950b72c8cb583073e SHA512 5014bbcde62554e03814906c13521a2db2dcb8df1107d1b2825a9296c85fa76a68c70f07317e57145b46f28b0d5a772aaa03b9e3f6b42db2b3fc0f3be416e527
 EBUILD openssh-8.7_p1-r2.ebuild 17549 BLAKE2B 00b3970d5724d32f81935906c8d63be1bae00a2dc5e753c039cba60ed0f1fba13c6de4a34202c34581ddb4ffe04e9a63f1268880ba2528b8f184db50276a3dd8 SHA512 ef26ff570235d2f0557ac98471f8d9eb9645d925e45d426f89981d8ace599257e5e479d920280a7bdb35ef74918fb629f6a3e5bbb6a26a265cbc667687875bdb
+EBUILD openssh-8.8_p1.ebuild 17550 BLAKE2B e031c0013cdfee8563b7b0e6a5cfc2f53a7a250a6ab8777ac16ed90d172679facf8a36c1e32ab0a997dde49343faacd1b5bfa36713bddac413ac41510d1863cb SHA512 7100645d6fcd512e8b4648c92c22e1d5b5a1f706968617e64aa92fa8723a886b0a63ffa9fc67ca18a0619e336ee54a34e84a7beff8dce162b4d82e1da53193d5
 MISC metadata.xml 2102 BLAKE2B 4b1464bbe657cd70e0787f1030354bf5cd87d43f4e19fbaf3686ffdf4c001449511d93d2549a29b4f11faa7901476d85ea7e2555b31f94a97bf73b7912230439 SHA512 ee3fd9db64eced5ef136dec87e5fe965381d2b83247af6e65c9f205adc8758b7bf90a3e45c0fe15dfe82e9aa0f6f25411b58183b8a56ef0ad51026cacbcd89a1
diff --git a/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch
new file mode 120000
index 000000000000..7037b34b4e57
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch
@@ -0,0 +1 @@
+openssh-8.7_p1-hpn-15.2-glue.patch
\ No newline at end of file
diff --git a/net-misc/openssh/openssh-8.8_p1.ebuild b/net-misc/openssh/openssh-8.8_p1.ebuild
new file mode 100644
index 000000000000..a0557e249c1c
--- /dev/null
+++ b/net-misc/openssh/openssh-8.8_p1.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+#X509_VER="13.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+"
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	hpn? ( ssl )
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl !xmss )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist(-)=]
+					<dev-libs/openssl-1.1.0:0[bindist(-)=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist(-)=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+	)
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( !prefix? ( sys-apps/shadow ) )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "Missing requested third party patch."
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
+		use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	if use elibc_musl; then
+		# stackprotect is broken on musl x86 and ppc
+		if use x86 || use ppc; then
+			myconf+=( --without-stackprotect )
+		fi
+
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
+			SUDO="" SSH_SK_PROVIDER="" \
+			TEST_SSH_UNSAFE_PERMISSIONS=1 \
+			emake -k -j1 ${t} </dev/null \
+				&& passed+=( "${t}" ) \
+				|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	# https://bugs.gentoo.org/733802
+	if ! use scp; then
+		rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
+			|| die "failed to remove scp"
+	fi
+
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 7a173385cdd5..07d392edece9 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
 DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
+DIST ownCloud-2.9.0.5150.tar.xz 5775740 BLAKE2B c43044dd383d66dd212bcd3efd818fad289ac51b082eaa7b47db03778cdfc87725efbdffc567e416bf5444d7e58f795606f093a782ca783cefc2d4994df3fb2a SHA512 c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57
 EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 EBUILD owncloud-client-2.8.2.4246.ebuild 1859 BLAKE2B 424772bdbf79268cd0f5fbd26fe3fdac8cfa2d39407a6d89ee787c446ab8f0ceebf742dbbfa395beddc06d52f6768c1433fe70f19a3ffa6c5bdc6877f3d3fea9 SHA512 75a68396594feb6f1e4cedcea377b90e9b4c1e2ac0926985632e5d1b0473a60885f3ecd545518751b1a738b4fc1563b74468aba6e0793bf36b44791362aad0ab
+EBUILD owncloud-client-2.9.0.5150.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild b/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild
new file mode 100644
index 000000000000..ef8aeb7b1ca8
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+MY_PN="ownCloud"
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 08eecc55466c..b944e1535f67 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -2,5 +2,5 @@ AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153
 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
 DIST radvd-2.19.tar.gz 222794 BLAKE2B 1c877d5a9eda6bda41b5c20ac9c1e28a26defc192fe14fc2d65888280bc96fc1ff6f4212ccaeac5f7e899087b2805772ed4c0cbbda163b2a87c79a2c178eda2b SHA512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233
-EBUILD radvd-2.19-r2.ebuild 1575 BLAKE2B a886ae9a89a652b39154cb19f6e3a8973cceee240a1fca61a68029d1dddfb866c7d6d3dafaa84b56d08185ca2ae9b93f84d12eb5f9b85d01746b52bc1e473925 SHA512 f203539fd5b7f235040f1b36ebc5293120f576a726c8c4e83d0ef88f45c542a1e1e5cc9c6cf49d9141d48ab3bac75adbee31aab375baaf528e2d3a0e2b3e87eb
+EBUILD radvd-2.19-r2.ebuild 1582 BLAKE2B 918806b36fbdb400622432698ce3dd7f7adb388c3221c30aa046ecf3cc7f20257334098c2a2ece7c29daa25269e96a84c4affed844a0e71e014580071ce9c82a SHA512 d0deb8445787ac0e22cd4da4092b59b3cbde676ecae7bf2e3c079807740723257e4d2f1f0cbf7364eb3a5131c3490ec6db815b3345e9a5cf43d4b3c0ded8b921
 MISC metadata.xml 358 BLAKE2B 5f1038575e0e7de2f051f77b0bc7a502f057755ba3799e4aa44aebd910fec3ac9b887e145ccf2249c66e7fe47752e0fec2497d8bae799edd0cb9a050290ebd49 SHA512 b1d0d3d86cd842c9adcf20cfd50aff074cd60699f3e03664ca32878f69310bb6ae9a9c4d36a94de121f1edf99d3735018dca81603a50c5cc17499cf8928f9783
diff --git a/net-misc/radvd/radvd-2.19-r2.ebuild b/net-misc/radvd/radvd-2.19-r2.ebuild
index d8c38b79fb26..151ad5c9031e 100644
--- a/net-misc/radvd/radvd-2.19-r2.ebuild
+++ b/net-misc/radvd/radvd-2.19-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 IUSE="kernel_FreeBSD selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 2a5c5a858f33..feca18792514 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -4,7 +4,7 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2a
 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
 DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923 SHA512 f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4
 DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72 SHA512 944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff
-EBUILD seafile-client-8.0.1-r2.ebuild 1146 BLAKE2B 61746261b7ea89b3f45fcfdf95c9114ab29affa4a551746430b35a90b0c5f05e9ad16a4894ef4f5e59b5c389d7ad674410aff8089b184d155d4b4f1628eac95e SHA512 d58e0520fa06b12d766e7e48daaf68f69c7414bd4a5e6b31af62d38ae05d77aea6c3d2a3320da406615cfdce00ffdb5879eba545cb0326017bccdc0287027cf9
-EBUILD seafile-client-8.0.2.ebuild 1263 BLAKE2B 0d293f786252d154cf81d61b5aa9b0bfbd900f5c9f4bf62c2cdfc90e6ead040f3dfc8198b7069a71b175f73f97e360606ffa1f517d658871052ed4ffadbe088c SHA512 ccef621cbb52a8cf19df43a23f3f26b727920acaff3feb36cfea4170de612bd9f328b9eec66c8c8ae522b2ecab2950991ad0a19aa25a48906fae82d7972161d7
-EBUILD seafile-client-8.0.3.ebuild 1160 BLAKE2B 637ac5fe20f7bf4bc8fb3b2087e9aeb724beee1479ce8e97d041fb2d30b0fcaf10aa875d94f35e901d22d1a670bd0bc6996785208795bdfab2f97425d9ae1aa2 SHA512 be5fbfe7783c28070ed4ac608e22f16d334fb818d41ee8d80e1f590e4fdaabce69e2382e9271f18baa9386dd03627a3cc556daf8399a62b5f50aebd17e3d3b19
+EBUILD seafile-client-8.0.1-r3.ebuild 1150 BLAKE2B 83a6f759ec8664f219d2d121e9385e1c65f0e372f83df526261492eb32d1125c3a362694b9263a960719dd2a0cda1ef50d097c1916c9865383e135b37544db59 SHA512 0382087bc129926c08e31c45a1d503d8b49c3eebc218e3e1ec3bbd0b7a0838e35003293ceffa217d38a134763cdd3aea9a8a9fbdd3413d21d58e965fc18b6d92
+EBUILD seafile-client-8.0.2-r1.ebuild 1267 BLAKE2B 630d1bb6c899dfe153be4ae7389c2b772580de86ad237dd0a0454833b64302dbd4fc5d71fa9351ad1bf231093557ca739588bcd2dda17ec5360a581fb973f6a4 SHA512 153a47665cda4d5a52d106f70443aa31411e8de7c01d327a1ccc76173d3534058d5f36d32a29a13a292d726d968945d2812998791dbddb51ce2b1787cd1a0845
+EBUILD seafile-client-8.0.3-r1.ebuild 1164 BLAKE2B 14beea7340a9fe04b5ea753e3b00365ca56a715eb90ae0f0d12de04633128ebc1c1cd43cfcf31f3d02c1e3ac6005de9693f075400bfe67bb4449a578227828ad SHA512 8d4ad22b990aa902562eba2aa52f8a8fdbb74646957448cfbf3e6cd533eb3d9c26fde8cf17b62562ca5d49f6f1092ef9c82e1b61d88830275bda8a394db3d3ab
 MISC metadata.xml 577 BLAKE2B 2370893b5c79210e63c40cd24532db7f376f57bce60728359b8645dc77717e4453fd9e2abf95d7c67882104a88c402585c0493c0a52ca0f84eceafb2928d338a SHA512 810d37c18e32318a1e9797186d2d1f3c74adfb6366fa8d9ffc966adc46779e352550d5e01ac73a9fd259d14fe0d931e37835f2ccf5f42648e3a6a40c3029ad10
diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild
deleted file mode 100644
index 9ee3c41a6665..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/jansson
-	dev-libs/libevent
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:=
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-	"${FILESDIR}/${P}-glib-2.68.0.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild
new file mode 100644
index 000000000000..ffac16697ade
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-libs/openssl:=
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+	"${FILESDIR}/${P}-glib-2.68.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild
new file mode 100644
index 000000000000..d2c2f9add43a
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RELEASE_COMMIT="837be8efd5cab4aea8fc1138ab91e93539a4e010"
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-libs/openssl:=
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+	"${FILESDIR}/${PN}-8.0.1-glib-2.68.0.patch"
+)
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile-client/seafile-client-8.0.2.ebuild b/net-misc/seafile-client/seafile-client-8.0.2.ebuild
deleted file mode 100644
index 196f57303bab..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RELEASE_COMMIT="837be8efd5cab4aea8fc1138ab91e93539a4e010"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/jansson
-	dev-libs/libevent
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:=
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-	"${FILESDIR}/${PN}-8.0.1-glib-2.68.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild
new file mode 100644
index 000000000000..0173c0bb30e0
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RELEASE_COMMIT="c49c317f3bf19001c06f189d0706b6a3a2d6533c"
+
+inherit xdg cmake
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+)
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/seafile-client/seafile-client-8.0.3.ebuild b/net-misc/seafile-client/seafile-client-8.0.3.ebuild
deleted file mode 100644
index 9ba6c63bf908..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.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
-
-RELEASE_COMMIT="c49c317f3bf19001c06f189d0706b6a3a2d6533c"
-
-inherit xdg cmake
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson
-	dev-libs/libevent
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index af205ceb9cfe..fd029001a9c8 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 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
+EBUILD seafile-8.0.1-r1.ebuild 1103 BLAKE2B d42714f2b4909223f994678edfe2cb9ec032f50592575d5a22247a38cb1b02094f3650595f04d75afdbfe8300c2af9ec26975427c98b90516994eccdceb9f803 SHA512 7521111e276a83f550f3e379988c04a70510d4ed339afab5c066f166d8cbc236809edd49d6f24e10e0aa63958c6627fce977433bcb034c81dd83df6444bb67f4
+EBUILD seafile-8.0.2-r2.ebuild 1213 BLAKE2B 5614d818e2cf23103c5a1db6b0733da04a1abd7498debf42b3ec94111f24897dba5dfda293afacea167f5c5392ddf5af2de40886bac66c0ea7cb8bf49f175582 SHA512 d44eda5ac83330359c3d0156bc5b10001a28be620d213df701ab66679da7bb039e6685d2ea1486f4338583a10da935cab4ff074a04f7afcf8e38979ae4550956
+EBUILD seafile-8.0.3-r3.ebuild 1267 BLAKE2B 36e73ad7e54f736245ffbb1236eb06d5aa186c1c0ed3e81bbc484132d9700c874d6bff4b26e250b432b02fb4c766946fc10bb9a2b812ce784da0482590d03eae SHA512 056cff3ba8bc18c7be70c199e29e2a8f3cfb2c32d690d11daaf13e2a2303754dfb8680fb16b8b19a42a0813bb0f72ddd6d7f134fa97296d8ba0d7d32f68f0f2e
 MISC metadata.xml 478 BLAKE2B 2c1506537c1d19f3aa9f731cecf2f53181bdfb92c33d3100e8338e778e222b396ebfd5c7f5745e133583615ca61be625787792d39d3772cede50f8b923ab1a4f SHA512 20620dd548eec869bb219011b157d821cc3fd939602d2662c26e1148582c2a593375b36085fae939880e01d76a251e91f35b9ad657cbad0a1e27bdfdc46b932c
diff --git a/net-misc/seafile/seafile-8.0.1-r1.ebuild b/net-misc/seafile/seafile-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..46724483ffce
--- /dev/null
+++ b/net-misc/seafile/seafile-8.0.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_{8..9} )
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/future[${PYTHON_USEDEP}]
+	')
+	dev-libs/openssl:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	net-misc/curl
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild
deleted file mode 100644
index ddbfc88b379b..000000000000
--- a/net-misc/seafile/seafile-8.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson
-	dev-libs/libevent
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-8.0.2-r2.ebuild b/net-misc/seafile/seafile-8.0.2-r2.ebuild
new file mode 100644
index 000000000000..16d97a5b08c3
--- /dev/null
+++ b/net-misc/seafile/seafile-8.0.2-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69"
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/future[${PYTHON_USEDEP}]
+	')
+	dev-libs/openssl:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	net-misc/curl
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/seafile/seafile-8.0.2.ebuild b/net-misc/seafile/seafile-8.0.2.ebuild
deleted file mode 100644
index 80abc7522a43..000000000000
--- a/net-misc/seafile/seafile-8.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson
-	dev-libs/libevent
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-8.0.3-r3.ebuild b/net-misc/seafile/seafile-8.0.3-r3.ebuild
new file mode 100644
index 000000000000..a73082ad7ff6
--- /dev/null
+++ b/net-misc/seafile/seafile-8.0.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b"
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/future[${PYTHON_USEDEP}]
+	')
+	dev-libs/openssl:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libevent:=
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	net-misc/curl
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	$(vala_depend)"
+
+S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin/seaf-cli
+}
diff --git a/net-misc/seafile/seafile-8.0.3.ebuild b/net-misc/seafile/seafile-8.0.3.ebuild
deleted file mode 100644
index 3e0048280aff..000000000000
--- a/net-misc/seafile/seafile-8.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson
-	dev-libs/libevent:=
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(vala_depend)"
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"/usr/bin/seaf-cli
-}
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 7dc392daf142..80eef648e6f1 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -3,10 +3,10 @@ AUX sitecopy-0.16.6-02-french-po-fix.patch 689 BLAKE2B bcd8670b87c11f46755e9e1d3
 AUX sitecopy-0.16.6-03-wrong-memory-397155.patch 654 BLAKE2B 84f73f4433389dd2dd27c1a2269530cfdd1e545dea000a6c8bbe40ae1776a7443a6e4169cd42f3fc49bd2c431156b90b23e3ff0feb9b4530faab417fbf60f143 SHA512 7e21f225fc6760ab07e56658b5cdadd0f145fb15efe592b18052f02713a91bf4f2c2ff6354cbc65e8188f30546115f6aaae1f1b4c7150ba691cf4a2de7849ed9
 AUX sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch 477 BLAKE2B c71d4e75eef27b87b0b7d09a201fa4c5f81b6ff3e0b191f1c3c259ff94cb55595d2b7e7ce4ab15c59ef2031af44b40d870c5f058d2e7bd4c2298e706513f4d75 SHA512 496580538b88619d3f7f3bd76140f573101df8176c62273676db58512b759746cb9c5a3685b3e0f9236148a0132e8b77b17ce3ae7a4adfad4afbbd38a43a7eb2
 AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 BLAKE2B 1847efb5fed4e5cb2d6580d172a662e1af48de607d07218be5c450908689374ffdb9674b00b4cecfd2124fa98e4b8277b42d47caa4ef1c0205208aebabd6372c SHA512 16f4d27df6c0e44491529c721f93cfc8686be6826d1132c3ae90de3b49f1964de4ec9adc1e03564e6213135ea38d40641039c40d344555888f3cc7746be611c2
-AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 BLAKE2B 7e9c1d30fef853431323e09ff186d207c7820c4773f6924579b9ce32cb795295104c75aeaefb79eeb2dd2275ae4c44c5d55c532bae7e0c6b4f69b2e8a1fb5ae6 SHA512 369fac53c1713a009578f7ee6c53b0d66439cd73c705d38897634251992abfc2743fa113fca807c3bae26ad0a155ebfa085b4f156b4a48882fb25520263f11e0
+AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 555 BLAKE2B 6e51ed4d345fe29d56ec4ec2d4e03fef1779103bb5b1ca0bf9202c5274f1703a0dea8253492778c6d0626d1552bbfc1b1a14e1df5f2f14d458cd2f55521bc524 SHA512 28f27d6ccf526a6c4553236b840c2be9430e72ab1f338242737e06715ea01712d75ee030804a9a2df4d5c45728c5909343e4adf435636db968868e86e27551a0
 AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4
 AUX sitecopy-0.16.6-32-neon-0.31.patch 346 BLAKE2B 7140d51c507ce81e568806e6c3ac3a00cadc0fcc00cfa55150de3718039365b7ca4c79f757331b639c1c182c979288a308241def2c7d03ac7d3b0e64091b6bc0 SHA512 87b2d063b463109351789c259c0d879a96144bf9c27c8a6bd3ddabd21b6b152d73a04a7311e3b17266b42b5c0f30028402b4a8e929154b867a055743a275623c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
-EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 78cd9aeea12a3deb670a07b92520722800dfe1bdd508805172bc88e40a55fffeb41bdab4354abc4090e728acbf03658953c60b90abf22502e65c29a53d8471fd SHA512 4159d5f8ab37da5d67e06ca0e75cf77653e3183187cc476982853b44ca7a4bedec06e6adc009aab1c6a0fc70428facc3fc0f86dc338b929270a1dc924a768e01
+EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 2a0a279bfe2359f42ef82f728d3ed6331f1a1d0198148e183326e12a0dcad8a9e5b4bea59887eb1207f5c3a368c48e5d00460da52f0bdfeb93eb48eb066fd170 SHA512 b70a87ea91ff7f1a673bb2e173b61be38d36d1e4fef7ac40cb9a7fdd8048fed8caf8d2c6d0db53cd16a4efeb7561ece0a189366a63a2a3b6292e40e7e4bb3003
 MISC metadata.xml 612 BLAKE2B 0c206ae7b2894a24efa3c7bf0c98a6d8bc2a4eaae0a4015fd55d793e2cd2462a82c4a0ab4983de7f0dc3ee85eb216d997c73e1fd769d36814ce6393600ae0581 SHA512 026dabe1f9f701a737affa9da967118ab722d49f5ef289fd3ea55147b09326c7223711887c2c8258fcf9fdab775e24f687f773a732c502f602a53184de239dec
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
index 0b53e2e4e395..cc40b5b6e92a 100644
--- a/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch
@@ -10,8 +10,8 @@ diff -urNad sitecopy~/configure.in sitecopy/configure.in
  
 -# Support neon 0.24 through 0.28
 -NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.30
-+NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30])
++# Support neon 0.24 through 0.32
++NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29 30 31 32])
  
  dnl But we don't use zlib or ACL support
  NEON_WITHOUT_ZLIB
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
index 3b63980075a6..5238f148719f 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
@@ -17,7 +17,7 @@ IUSE="expat nls rsh ssl webdav xml zlib"
 RDEPEND="
 	rsh? ( net-misc/netkit-rsh )
 	>=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
-	<=net-libs/neon-0.30.9999[zlib?,ssl?,expat?]
+	<=net-libs/neon-0.32.9999[zlib?,ssl?,expat?]
 	xml? ( >=net-libs/neon-0.24.6[-expat] )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 9a5fd1bfb5ef..9a3b299a2abc 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,5 @@
 DIST smb4k-3.1.0.tar.xz 3177236 BLAKE2B 17d1fb32acbadd3af2447aab1c1e49c40c1a1b25204f31e366831e380e2a16f4b637f242afd5dfa41cc991e76570bdc0f8a804b1374290c44c417ed07f33f4ba SHA512 b12d054ccd4d8fdf3d975503c07b4c17321201651f68be03be6384e9c2ff127384737d0d5bdcb8d845c6edc21e20d7fd6a06cfe60af31ea6bc0373159771b5d1
+DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf
 EBUILD smb4k-3.1.0.ebuild 2033 BLAKE2B 78645a0f69655b4023cb6e8e2d7372c0521c55ba3a2f65ba11f3ae66d6b7a81311dd6bd3df775d21ec522a8d216968b063f8d9877dbb67027a69818625b8b1e4 SHA512 f00862ed637a232ccfdd78fd24d4af9e0a768d3269bf9fa7268b6375f7bb1e1bff54f2f9553f4e9893f4e39b3c431076ef84dda18a2fe50b40f04f417f3264e4
+EBUILD smb4k-3.1.1.ebuild 2035 BLAKE2B f9112ff51d71e7a2dca73bc2d8c6d0a4e707aac93e113309db70d7a6019967bb7bc44d7552b66e229cdeab0ac589590debbe8d0a1ebf0ad33690d4500b28b048 SHA512 2b19c87ed98e230638efca06ca8d6e0de8188b33dd02f43c505c3a53718947b536044e90b31b7be30bcf26e2ceed056e3cda8cda7ea7b6e35841c038c55368a7
 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b
diff --git a/net-misc/smb4k/smb4k-3.1.1.ebuild b/net-misc/smb4k/smb4k-3.1.1.ebuild
new file mode 100644
index 000000000000..3e9d26215437
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+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="+discovery 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/kdnssd-${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]
+	discovery? (
+		net-libs/kdsoap
+		net-libs/kdsoap-ws-discovery-client
+	)
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
+		-DSMB4K_INSTALL_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/stunnel/Manifest b/net-misc/stunnel/Manifest
index 7bd0626cdfc0..740bc37a0efa 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -5,6 +5,6 @@ DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
 EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
-EBUILD stunnel-5.59.ebuild 3000 BLAKE2B 4ceec56ff378cb02dacc41004da9d8ff02b7c3bea6b54ae3ab899022c69c0ea3cb456583f47dcf2b71f59e4a0d10bb2bec8b524495379caf4a8e07d1c13a32cd SHA512 9fbeaf1d9397904340f92c5a1fbd91f4d188671b9381efdee339819c0d3c2137bcb2ff0bd252ed9fed26b5acada830b3e60c5be0b5734733d9d6bbceb31b7898
+EBUILD stunnel-5.59.ebuild 2998 BLAKE2B c3421d1466ef1c50be9a0080b0fcabc4a0dc1d898fd3b9981adc7a80d5d6fe74c8cd883447f6fe2c46d89cf8e4fe1cb3b9ee6c920da652f705a3d55f5f1567ff SHA512 34491f45e231755ca5fed2a84c08b3e74d67ec125b12ee3ef3d111fe7e4df9966812052f402502b23935b514296c168d6bd4966bcde32edc5d25f6a02c63328e
 EBUILD stunnel-5.60.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.59.ebuild
index baab2f384b1f..232fd40bd0b9 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 5b4e19b9e39f..de7f4d53e4ec 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -3,5 +3,5 @@ AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a4
 AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
-EBUILD x2goserver-4.1.0.3-r1.ebuild 2524 BLAKE2B 5e788c529470b0e79259e6f6250f4bfaf6a552054276d06267c0a5baeefd42e9d903ae96c224aac7afae531dadf85299a0d1e483f39bc7b69ccecede5d16bd0f SHA512 7cfe8711457cbf38e6061b95e10395399b53112ca271a30636036249dacb74c1b0b5eb4bc73d5830c27722738419438f5e854a9ad853b635a50251c8b963fc6f
+EBUILD x2goserver-4.1.0.3-r1.ebuild 2570 BLAKE2B 1a6a443cc0e99ceb32412fdcf50a1f663a57ce28b7829c46ac59f3fcfda3633c32d61591e94d95193a99d1924cfc340519927e5127905e2de16d900d3e4b51f0 SHA512 b0aaa74b25f77fbe7feb8d0a4c2fb72e7c1d315c02d82591e2215e7607cfa07741a3bee90d7a56f9ac4eb6a78e4a1bd574c36afde37c25425ad20b54cafce2db
 MISC metadata.xml 347 BLAKE2B 0049573365d07c584439ec94fc6e914a7de76325daf1ac951b765f4b2bff0968c1c0ef1320525d0912d2e09e45733ceaaf7d46da3778f7e5833e53a0c29b9588 SHA512 ad22f31dd176be856023516ee7c6c500567dbce33f534b094b60093f293a81a3a0a3c69f5b7d2c65efb671dffa223de3840bc23c47dd63f8deba242e349b1a79
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
index c702e328a829..78bc8c8e9fb2 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd toolchain-funcs xdg
+
+inherit systemd tmpfiles toolchain-funcs xdg
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -78,7 +79,9 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process x2goserver.conf
 	xdg_pkg_postinst
+
 	if use sqlite ; then
 		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
 			elog "To use sqlite and update your existing database, run:"
@@ -89,6 +92,7 @@ pkg_postinst() {
 		fi
 
 	fi
+
 	if use postgres ; then
 		elog "To use a PostgreSQL database, more information is availabe here:"
 		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 767e83a4eedd..5d0be2ea9612 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,7 @@
 DIST yt-dlp-2021.8.10.tar.gz 1807968 BLAKE2B 664f9f5680c18531bb1c194e6e26a31b6be62894a88c6748bf146fbba79164fec6f5e6db017785daf6c8f5a2c1b7cfc0c2ee6c0d437b9d7bb4e1835eff73650f SHA512 fb321d308e634f6358f046762cc3e827b036083b4764d495bbcef253d06ce445152f4a330c51b5aac1eb3b21a8a345fc791f0fdbdc01089ea2a414b1cd457f20
 DIST yt-dlp-2021.9.1.tar.gz 1846252 BLAKE2B 2cb056b89d1c3f5dfe442c96e983b2500185ade621c285669ef513d0fe9af9aabea3ad121344d1c521b6c89eddc77bf7698edb48d92f6f5f7b58b8939c80817d SHA512 26f778bf63b9be9e487b96f098e56abf65c7c7a89e9c5754755cf73d55e441638174d7b0e7220e994e40c0740edbd792e1fee28b44946cab8197dfaae2eee26e
+DIST yt-dlp-2021.9.25.tar.gz 1890559 BLAKE2B 9573fc4214fa8654a4b1ca44dd40b81f590f08ffe56225d8ad9923e4c3d188be406a59443e9ec134a1eef523e39e33cecba9ba76ef05edb908713d72d1ac233d SHA512 2c1fc18f05108420caaae9ca4072fc1ee0c67932ac144ee69c3e412850e1f1873938e302b9e0953bea29678bd2c512e58c124088243818ce0662449bcfa92175
 EBUILD yt-dlp-2021.8.10.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
 EBUILD yt-dlp-2021.9.1.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
+EBUILD yt-dlp-2021.9.25.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
 MISC metadata.xml 331 BLAKE2B d8b22c2f9ee7d9ad61dcdef8335fe14a1324de7131930eda4306e450077a25da2cf7e038131e16c01e3a0ed80fcdca22dab5895dac823cbfde48dcc3ce5597c5 SHA512 c7fa3393bdaf6e2c2d8ee37842ae6091e2c06f94b15776e6e0c434523eddb38856d2d9f654f0c9d24072b36975877a7e2cd13ae7d4bf0325024fb137b4984728
diff --git a/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild b/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild
new file mode 100644
index 000000000000..4c0bfc7cd619
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	dev-python/websockets[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+
+"
+
+distutils_enable_tests nose
+
+python_test() {
+	# make_lazy_extractors.py tries to rename it out, so fails if it does not exists.
+	mkdir ytdlp_plugins
+	epytest -k 'not download'
+}
+
+python_install_all() {
+	doman yt-dlp.1
+
+	newbashcomp completions/bash/yt-dlp yt-dlp
+
+	insinto /usr/share/zsh/site-functions
+	newins completions/zsh/_yt-dlp _yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/yt_dlp || die
+}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 1152d924ee40..b24db7cf2667 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index de24ff9f6053..e409138d2a97 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,5 +1,5 @@
 DIST rssguard-3.9.2.tar.gz 13607587 BLAKE2B 45b3dd406e64bb13a19580255971b0d5eb1fd90d70d8559c736366af7792e7fc0627ee254dce79936ce6a179399271958b7795279a359306e345ec086081fc37 SHA512 30d2524f4ca42d903a047fe39de925268a1aac65192a8b1089b6ec0ec0a9dfef09c535fe391f750149063c06e3275b2632cc2ea2c24ded178760070abcea4958
-DIST rssguard-4.0.1.tar.gz 14417555 BLAKE2B 14689444eefefe0827d22a6886cd422fcbbbace83125fd28599fd17e2762d63f5e5d8b1b472de46282e7471d84195fb56594f9669bcd1432f595f354268241ad SHA512 1c791a85cf3b43737c5232dd4c63855bf8d6ad324c799d1abbfc0aa9392b0af3bfef6221d31b6ded5b512bec9c8ad82b2fbcd10330c7768420432363517709eb
+DIST rssguard-4.0.3.tar.gz 14427592 BLAKE2B d01969e10eddd837d9e6541e573e6a5bd353eed8cc78508591340ffc354de877b392b79c80f4df725d06be84363412615fa941cc0895fddfd6c9b2e9751bdda9 SHA512 831b99d0b320338bf497ad1ca67120c5b2ee806c61fc1b82b08debc1904222757c3bf3aa068ea7e37bee93be061d444204e6982d2fb0ece2f26f8b4004f7132e
 EBUILD rssguard-3.9.2.ebuild 1214 BLAKE2B 9cfda6ed8baa35badd04d80a679cc64b18bc29852b6f96d27182ffc537ed3e52a3a5bb3f5c025c74c312ee6a445306f5d23a619807f67262b614b746f784e88d SHA512 c674acf1c20cb8f3ce162b11231d9e42265b818dcfcd46874516571af2e3538c8c5227417271020c5909b1d06e32103d43bf2772e00d51ddc49b45036c33525a
-EBUILD rssguard-4.0.1.ebuild 2000 BLAKE2B ffd1d91fc5eb3314f452d840198fa50242aa36956f199b66e615f0f931ed169f495d345bc892afdadf889ad35972ad255baacb98baf585a1eaa8a128a85244a0 SHA512 d6b8d8fb7c99a304cfc1d01a5701884ce750a2a9fff560801a932f72d99e9d2a7ce2314b527e28a7b5e747f12a806e796602eb1e09ba72c4a2774303c1aa8d68
+EBUILD rssguard-4.0.3.ebuild 1975 BLAKE2B 0abf8545bf2a5823dd7b58580a8cade1ac685b0b0dbe595b9f5f842fbba8f93faf46593162e34a1862c546da6fd0f60d6d09eb891819596a7b68167371259af4 SHA512 5e276a2b5fef81e9fea453e9d319125d850fd826ae26c894e352cb0c4d838ad6a07d5afafc60406134010dca4c2b64dfa5fabb279b994996c658c800df32df0d
 MISC metadata.xml 736 BLAKE2B d607ab8fb90cb5146807e306ba77c4784b4abc4b38e7b55d10b772be9866ea9cd8883e14dd9ebab5e36f44240b4e51802ca2c742c12afb39de61970c9458b356 SHA512 ac0e86dc29d5171dee5eae0d05aa6d7fda1a01dbd5d31314f7d691aec5c77dc150ee8ac6a8239750ca50db08eb18da6d3ff1ede2b8597d38f5b4a1ef79ebd362
diff --git a/net-news/rssguard/rssguard-4.0.1.ebuild b/net-news/rssguard/rssguard-4.0.1.ebuild
deleted file mode 100644
index d78e81920014..000000000000
--- a/net-news/rssguard/rssguard-4.0.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic optfeature qmake-utils xdg
-
-DESCRIPTION="Simple (yet powerful) feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug webengine"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md resources/docs/Documentation.md )
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.0; then
-		ewarn "RSS Guard 4.x is NOT backwards compatible with 3.x line."
-		ewarn "You have to either export your feeds in OPML format or"
-		ewarn "manually update your database.db file to 4.x.x format:"
-		ewarn "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migrating-user-data-from-392-to-4xx"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die
-}
-
-src_configure() {
-	eqmake5_args=(
-		CONFIG+=$(usex debug debug release)
-		USE_WEBENGINE=$(usex webengine true false)
-		PREFIX="${EPREFIX}"/usr
-		INSTALL_ROOT=.
-	)
-
-	# https://github.com/martinrotter/rssguard/issues/156
-	is-flagq "-flto*" && eqmake5_args+=( CONFIG+=ltcg )
-
-	eqmake5 "${eqmake5_args[@]}"
-}
-
-src_install() {
-	emake -j1 install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use webengine; then
-		optfeature "ad blocking functionality" net-libs/nodejs[npm]
-		elog "Adblocker module requires additional npm modules to be installed:"
-		elog "npm i -g @cliqz/adblocker concat-stream tldts-experimental node-fetch"
-	fi
-}
diff --git a/net-news/rssguard/rssguard-4.0.3.ebuild b/net-news/rssguard/rssguard-4.0.3.ebuild
new file mode 100644
index 000000000000..8f40201072bc
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.0.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic optfeature qmake-utils xdg
+
+DESCRIPTION="Simple (yet powerful) feed reader"
+HOMEPAGE="https://github.com/martinrotter/rssguard"
+SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug webengine"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md resources/docs/Documentation.md )
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.0; then
+		ewarn "RSS Guard 4.x is NOT backwards compatible with 3.x line."
+		ewarn "You have to either export your feeds in OPML format or"
+		ewarn "manually update your database.db file to 4.x.x format:"
+		ewarn "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migrating-user-data-from-392-to-4xx"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die
+}
+
+src_configure() {
+	eqmake5_args=(
+		CONFIG+=$(usex debug debug release)
+		USE_WEBENGINE=$(usex webengine true false)
+		PREFIX="${EPREFIX}"/usr
+		INSTALL_ROOT=.
+	)
+
+	# https://github.com/martinrotter/rssguard/issues/156
+	is-flagq "-flto*" && eqmake5_args+=( CONFIG+=ltcg )
+
+	eqmake5 "${eqmake5_args[@]}"
+}
+
+src_install() {
+	emake -j1 install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use webengine; then
+		optfeature "ad blocking functionality" net-libs/nodejs[npm]
+		elog "Adblocker module requires additional npm modules to be installed:"
+		elog "npm i -g @cliqz/adblocker tldts-experimental"
+	fi
+}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index c6b3c2f2b748..6226e4250b9a 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index ba59f8b86492..ef1ad6e5d25e 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,5 +5,5 @@ AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e
 DIST SABnzbd-3.3.1-src.tar.gz 2786705 BLAKE2B 1ce58c2fd51304395402e2ad4379556e9f1a1471d524d1b3b969b9b201edf15dece1f12d9891695e9dbb02664014c2540ed9fce02b4418fc3100cd3bb2717983 SHA512 0ab7001935f19c8e1829051949965977b895456b83ee26b6379fd9c7024d114d5bdd0701d747c8935bb46a829d46379e4406012007a9039c43fb99e4db3ee920
 DIST SABnzbd-3.4.1-src.tar.gz 2978066 BLAKE2B d7fc9df71ccf0ee8d9282fb7ec7a088e5f9d4cf99f07d120a1e89ae18f1f3c5e34bd4717bdb79dd097f219021e10c56150b95faf6a43bc896060c1249f63dcaf SHA512 befc5d26860702d0a0b945e0fde35244869e2a766ae6819aafd642bad0897ff439830b5c72f914c139c3f8bfad7fccd9bced9bced8db6349a341f9c3be302fe8
 EBUILD sabnzbd-3.3.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
-EBUILD sabnzbd-3.4.1.ebuild 3116 BLAKE2B 5bec9e925789a259006be95cd650ffbddf3b471b9c2aa503ba9600aa94b45a0a4bc587ad19746111542bf849d84479cd0da9cd7cde2849b842aa13453fe6e360 SHA512 0d60ab3f05c657d320d7129e9463bcd3f631a0f31efe708f28a0769caac6c702846ea3a31067b989f4fe6864e16bfd8e426e6d38324319609e2d949a80b2b933
+EBUILD sabnzbd-3.4.1-r1.ebuild 3163 BLAKE2B aae8176e1e6db9708af9379681afe1519ea5354dd6f14bae87fdf5fcde13e663cccb3e021efb2799bb70e7297250cb59039c63d2deb08e947a790f6ce45e57f1 SHA512 e653642dd76bbfb4682a15cfcb5612213584e58583a969c010194c594604c410f27e96edab80ec85757b1c901bb6189ebdcbce9a48e9edfc4040f5818d5952dd
 MISC metadata.xml 538 BLAKE2B ea127a1fc7ca13e6642703a0cdacbc9dc20b341f24906f704a1ad5a501b01fe9a8fe4ec49b965e0f6abd5952c85ccfaf943554cce9d864e23addbc59fdb5b345 SHA512 94f241c468bec52fad72ce3bec6caf926e72d398df3dbcf142818276737b60a4da2669ac100325bec6d4f831f843851e0ab972937ac8bde10176d485efcab712
diff --git a/net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..f491417916f3
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+7za +rar unzip"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir.  See: https://sabnzbd.org/wiki/advanced/unix-packaging
+
+COMMON_DEPS="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
+		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
+	')
+"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="
+	${COMMON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MY_HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	local d
+
+	for d in email icons interfaces locale po sabnzbd scripts tools; do
+		insinto "/usr/share/${PN}/${d}"
+		doins -r ${d}/*
+	done
+
+	exeinto "/usr/share/${PN}"
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED}/usr/share/${PN}"
+	python_optimize "${ED}/usr/share/${PN}"
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o "${PN}" -g "${PN}"
+	dodir "/etc/${PN}"
+	keepdir "/var/log/${PN}"
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc ISSUES.txt README.mkd
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: ${MY_HOMEDIR}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 3; then
+				ewarn
+				ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+				ewarn "is started for the first time. Job order, settings and data will be"
+				ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+				ewarn "fetching before the upgrade will be lost!"
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.4.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.1.ebuild
deleted file mode 100644
index 13de3d3ecc8a..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.4.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="8"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+7za +rar unzip"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See: https://sabnzbd.org/wiki/advanced/unix-packaging
-
-COMMON_DEPS="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
-	')
-"
-
-DEPEND="${COMMON_DEPS}"
-
-RDEPEND="
-	${COMMON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MY_HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	local d
-
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto "/usr/share/${PN}/${d}"
-		doins -r ${d}/*
-	done
-
-	exeinto "/usr/share/${PN}"
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}/usr/share/${PN}"
-	python_optimize "${ED}/usr/share/${PN}"
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	diropts -o "${PN}" -g "${PN}"
-	dodir "/etc/${PN}"
-	keepdir "/var/log/${PN}"
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: ${MY_HOMEDIR}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 3; then
-				ewarn
-				ewarn "Due to changes in this release, the queue will be converted when ${PN}"
-				ewarn "is started for the first time. Job order, settings and data will be"
-				ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
-				ewarn "fetching before the upgrade will be lost!"
-				ewarn
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index d371de067c1d..ef9eb0a934da 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 8021c8372814..5a054d2049e3 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -3,6 +3,8 @@ AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
 DIST airdcpp-webclient-2.11.0.tar.gz 967326 BLAKE2B 47d257e47c332b4fd5351a680f0585360cb7329cd1bcf3c478d0a7847adbee68c024af7136eeb3b551188d3af7c4a6db2257eefaca7f82ee4670667a4a6e3e63 SHA512 926457e76b6bd29e0124c519b67d9e0f3cee48192c1b56e073b84d65f0171d53a7a4dbaf55e100f0685e01116935f4e4e2c193dab0ef0bed08d8101e12c33b82
 DIST airdcpp-webclient-2.11.1.tar.gz 967966 BLAKE2B d95760f3ae945255a396f20504995a2ea8843071ab19574a6faac919fb411a0a4e44ebcb005afce0056d960729d6b8bdd9df4ca457cea91931eedb1d329c7a12 SHA512 03f6ce82467f824d1b4e10075bf9e28b45282fb977b3feb67fc948044ed592672a83182d4716d0c10591c0b7568417997b335e25827d8e78fbd3735605cd052e
+DIST airdcpp-webclient-2.11.2.tar.gz 978294 BLAKE2B cb15e02dc5381cc5f0ecb1b4d65cdd1c4a3d007f3ea1e78a159b8a62af03831318b8f6d8c0692c5a9145dda616627ea97f4bd3eeb1270a7452c7d78bf01d147f SHA512 281d4a9da88f23a4c02eef7f09c4fc2c91c44ac93d932ea4bfe097029b45dbd12a8d04d4ef8b493d261f5dade15b62ed4d564197fbfb2d9d98b9dfcc9a9e6379
 EBUILD airdcpp-webclient-2.11.0-r1.ebuild 1373 BLAKE2B c6bebaf300f527c18f91c6139c9856597186f24b3fe5de48816768fff0698534bf41d3fe7331593e5c4156f57189f7d301d02a5c54d7e8d32ff411bb2163bb3c SHA512 faf36f8eeb9dfe6a4a33855996382bcae0186e7e29920aa075b1b59815daed4fbaea530dfbc5e63ee407c9bc0cfb4a1bf13e48f71a9d090fcb2338d25a0b9398
 EBUILD airdcpp-webclient-2.11.1.ebuild 1376 BLAKE2B 47d2187db6f8f01de207a8337f4886b56ef0741ea120cf5d49b109ff1d5f55ef3269e9bbfb28e85afcf97ebbf8e102ef07d90384b31ef8ba755c8d68084c9437 SHA512 68a72d07ffc123c6514333d8bd45421923bb7e2d5f47c162edcef0c01457c3138995591e723dbb51ab84b8738df92c8c1e18014b849fe02c59f8d36ac2a7f5ad
+EBUILD airdcpp-webclient-2.11.2.ebuild 1376 BLAKE2B f9e55574cf07c7769b8789813e95f61a58d1e2f98c090a5f76fdfc9e1c5715a285fb079c5113dce3c8621d82510ce38fc21c9bea8cb283f6c13d944854c5165e SHA512 450415512c0cc493bdc31fd6f89eabb5099012639f0d43b924c3fe18cfd7463dbf748297ad880101a43d00b7c13423702c94a87c36d9678f3315745583db9868
 MISC metadata.xml 805 BLAKE2B f62a540005c5d447e9ddd18b31eb88b1e875161af3b54e8c8753034700a70f28b3d4059d34988a8cf9225c2588ac921b39293e30ed2abf65a2bd0970b75a4628 SHA512 f8ff1e2d21ad685843abdb11672450b08c190203fbaead9170985dcf14332b7deebefb1565df6ce88671a87eb5e22ae80df5eaccf4c42ad49e882dd00b7ec81d
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
new file mode 100644
index 000000000000..48c674e1b803
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
@@ -0,0 +1,61 @@
+# 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 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/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 8e884d9d010d..6b772a2bbe12 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,9 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.16.4.tar.gz 1830534 BLAKE2B c9fa07c36b634b0d1250b847baa4a971aad0b249aaf7792b4a69c42c5c98cc6b3e4fe20c95fdab9884520decc6e9d7071158a641863f1c0d2443dd096e372f2b SHA512 7459a9c6ad7afd85fdb8f7ff62c9deae2a2fc8341e3cf39da0f72e81bff8829e094bb830fb614fbce9665bbb259d764eb64b6d2a44ac45ecdd9ee870190d6539
 DIST cpuminer-opt-3.17.1.tar.gz 1840571 BLAKE2B db07547ec79df92f644e903485fb51abfddeafe2ecaffd18c0438cf292d51c6167eafaf7aa2b89cb6b7698d4358a4ef970459bff7b063cfd6d3a95ad878126eb SHA512 463d755bbb3146ef94292ae64a8a2397485e28b55d4b510881dd91461e3bcc2786a323cf575dd070481236b150c35af2898b5ab2b0db90c34f528821988af74c
-EBUILD cpuminer-opt-3.16.4.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
-EBUILD cpuminer-opt-3.17.1.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
-EBUILD cpuminer-opt-9999.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
+DIST cpuminer-opt-3.18.0.tar.gz 1869910 BLAKE2B 23e090cb9c077fc69f6eee64a522676c078de268e512c588a7d93e1bd3e3904a9e5dbc937a58c21b031f685175b2f2164df04a4f7f22f8129d5183d1b990ec2f SHA512 9144a39b7470682835b57b5ff34810933af5712b4bb2e83a2b5241aeeb13747884f5f48e22e9a71512831b56d345ee5f0e6fd226a8a30d5d10243b4a99f1476c
+EBUILD cpuminer-opt-3.16.4-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-3.17.1-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-3.18.0.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-9999.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
new file mode 100644
index 000000000000..1cd33b0d51cc
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4.ebuild
deleted file mode 100644
index fb5ffe94cd29..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
new file mode 100644
index 000000000000..1cd33b0d51cc
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1.ebuild
deleted file mode 100644
index fb5ffe94cd29..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
new file mode 100644
index 000000000000..1cd33b0d51cc
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
index fb5ffe94cd29..1cd33b0d51cc 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 REQUIRED_USE="cpu_flags_x86_sse2"
 DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
+	dev-libs/gmp:=
+	dev-libs/jansson:=
 	>=net-misc/curl-7.15[ssl]
 	dev-libs/openssl:0=
 "
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index bf4b64b3dc8e..a0bd3d19d5a3 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -13,7 +13,8 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
+EBUILD deluge-2.0.3-r10.ebuild 4762 BLAKE2B d4f4b226bc6e7bc6cfa0808d1a9a435dcce50fdc5744224d580f2900b587b7c3a71a78719d79594d7692bca0cf8fd9658c20417d8a38d79e025743edecb2ecd4 SHA512 22a3503fbb361efdbc44a2e4892afaf878afde0a01b8a0879990c271347df10af92207f1dce1325ea73d5f5cd593c61c44aeeb2d1db4e06e77b1a3b783b71f0b
 EBUILD deluge-2.0.3-r8.ebuild 4503 BLAKE2B 1df878622e276d8f195ac4dbcec94c6d3363db2fd6d2f946c898cc7331a62af91a3b92dd0d0ef07d8eddd5b673321c8e6c36d47765717c60d945654fb4a3e5e3 SHA512 f660a0f90acec654e72d7acb98e16cffb30776ace3ade819841dff22dd448c05a280ca3d1ed59330bb98883311bd63a94eec0fc6e24b9eb4b89d92919d9e8095
 EBUILD deluge-2.0.3-r9.ebuild 4512 BLAKE2B 9e17b7849b0caed5d4bbd2a55a4b356464f56466190b1402feb7ddbf301cd0b16f4ee7e3c4531b78227b8cc71104a912dd2b34781f30743fb7123a69b8559eec SHA512 2a0f697404637ecb45ec33fdcb2b2484af3f3c940cdadf0e253f2cf720987357810d57b4968e8c34984bf503b6a3ecca4d6a4602a0f20ab33f9e9131d020b80b
-EBUILD deluge-9999.ebuild 4535 BLAKE2B ba15c2eec0b6c51b4f549a83468fcbaf9d39d2f31b0a16d9b132caa979f411bd2e201e448feef1a3f9bc8b85ee3ff74da8e07cc1e64796155aeff9c33b5a92b6 SHA512 48e8dfaa7ca6592ec59219bf809f57f038400d09a87e7ea57984ceb8e67ad769c9c06ee26a7f9758bebfcc0a3e839c74ba49a8f577051aba171ade8f9d50bdf3
+EBUILD deluge-9999.ebuild 4762 BLAKE2B d4f4b226bc6e7bc6cfa0808d1a9a435dcce50fdc5744224d580f2900b587b7c3a71a78719d79594d7692bca0cf8fd9658c20417d8a38d79e025743edecb2ecd4 SHA512 22a3503fbb361efdbc44a2e4892afaf878afde0a01b8a0879990c271347df10af92207f1dce1325ea73d5f5cd593c61c44aeeb2d1db4e06e77b1a3b783b71f0b
 MISC metadata.xml 675 BLAKE2B 79c1f6e56c1e5331a1722d6b98da4431e0fd9e19d1c1fd00677c20e3d2214f97d4f71b751edac9ef70e2552abac2b650ed704121275a218374386ff95ef404dd SHA512 1da3e3937d14728111aff841900bcb33912ffe29cae6c14dc401547897d777df37e373f2f65ba0fde00624855d33222445ec3a4edcc0478976bb992ac915d5b1
diff --git a/net-p2p/deluge/deluge-2.0.3-r10.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
new file mode 100644
index 000000000000..be0397a7f781
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		dev-python/mako[${PYTHON_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+	"${FILESDIR}/${P}-fix-pickle.patch"
+	"${FILESDIR}/${P}-log.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 0d7b3a317c07..be0397a7f781 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,9 +27,12 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 68d4f405b7dc..6765e370011e 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -2,8 +2,10 @@ DIST nicotine+-2.2.2.tar.gz 3373462 BLAKE2B 6dbcf4e9d7f85bb2e03194047c8ca9c374ae
 DIST nicotine+-3.0.2.tar.gz 3126152 BLAKE2B 8575c61fc32083e687eac841e403366c516e0420c792bad2bf31b49b83dd80d2b99ace20879f7968dffd0d48e52bc6c6638300216b4eae44773c0723888ca96e SHA512 297aab9b6016df4b45e065d5e6493e237e99ef6ebbd475b7ccf66d2c476053f77c72c2ecd672c20046b422dc1f5eb431e701de687d33f2364619de5643ccef6d
 DIST nicotine+-3.0.4.tar.gz 3141967 BLAKE2B d58072026ee766d81ca88dd4a11aa72f7aaee7a6e37c966e7d4cd0bdee40c8ef6537f01ea92c006b12e9692612d63fffd744011b982ee4cada2df03d2abae064 SHA512 8cc02b8b269267cc775b21ec246d84b932c1c7ef8f0983c63e3bb21de5b4c0de5fa65acdb0a07240b90c3529648f500d43fffbc0a462a260e534e86653a332a8
 DIST nicotine+-3.0.6.tar.gz 2786594 BLAKE2B 69b43c3eec37c8a01a0bd42cd11c02580a5be9ca994106e34e7f588eaabb7cfa85fd312bd527d453e62b3f8c0fb4f031eedf06207e3c1d8602e822958d98ee65 SHA512 42846568948d45559206c85c7ed708be044a5cf55f994318c209506dcc9024d6ccfd141fa21ca57f00c320a1a5ec3ab09faf211ebd442bf1d5060b960f43e8c2
+DIST nicotine+-3.1.1.tar.gz 2775643 BLAKE2B 9c595f8bf2bb4e7c79c3a5a57cadcfea8d2f0df6c89cd93f63f1e5c1117dbe5d85f98ac94c5f7e367e145869e136c701dbf61d1caa270959b29544ab5da17314 SHA512 28eaca5f270176ff5562f693906b4dfef180b91f0113332e3fc1659acaa6bb49e8f956b03612effab14f6833e9e7c00ebca75ca3c49906cd990d1e82e1bb5be3
 EBUILD nicotine+-2.2.2.ebuild 837 BLAKE2B 275ed5b79caeb4a8a6090c25ea3a6ad43e03608700364dd3e17acbea2dbde07b3dd2c60a2913369da0a90b5107623445a0068caeb725778896edefe9af507e11 SHA512 41777ba58191572c64092300f2833e4868145fb12bf3e534eaaa41563a5e92586729b5e0690a03b92ec827c8971b2c15d7519e6f6c682b4059cf203f40d7e197
 EBUILD nicotine+-3.0.2.ebuild 840 BLAKE2B 4c1a16f620db8656b3c74a57425368efc111b18f3171ad98a5b891216737b96ca328b590aacd24afb60bbc356b6e7fa3fea164c07f8474f6da8ae9506279b2c2 SHA512 0e7b479f78b315ad7ab215ddd6482bfb198d4ec249b8b67253110db11a62ada6e49c3160b4724b8cf2039e3f69429f6f7266c758a862cd3ee8b0804d9ea5054d
 EBUILD nicotine+-3.0.4.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
 EBUILD nicotine+-3.0.6.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
+EBUILD nicotine+-3.1.1.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-3.1.1.ebuild b/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
new file mode 100644
index 000000000000..3717d1e247d6
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	${DEPEND}
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nicotine-plus-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a099e4851264..88385292c3c6 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -841,6 +841,6 @@ DIST syncthing-1.18.1.tar.gz 6145390 BLAKE2B 9c40daad6016a90dda135f91a3d17cf6d5c
 DIST syncthing-1.18.2.tar.gz 6152347 BLAKE2B cab3ae2aa0d77f00b423b1e54bfe257a69f208f82af693db0b35b7f6b150a78d7286e3c15e0eaa84b73ec6e3bd10cae2280ddbfb1df2df01265f2e5bd81ac215 SHA512 b5acd207aed1163d8de1534fffe04faeefb1c6aca00933d4b7b96db10451d71acdce5c8147d2b0c3d13a37c3dcfa70da1ac0a9f14dc3a60046da94a960c169f5
 EBUILD syncthing-1.15.1.ebuild 39791 BLAKE2B 8cd048b2e8bd021aec1da09b6493b19c82a97d2b144df685a0dc76c868506ca4a3fc82eb4626bb8091300903bb4c51f4745cc1a8a6f8cb224db384def1bd835f SHA512 8112c6436bfde905c6db91e7662b55c48879de2d737395b50faee7920abafe57a054a569632a185f93e323fd7b570dac06aaad859d7b36b953f847ae5eb7d796
 EBUILD syncthing-1.17.0.ebuild 41735 BLAKE2B 4f1ca65ed4b503948f332cf214b050228284351068c161a9c6162d41e969e44a6d7fb7b9c3cd5321275f774ff7cbaac4367904d27f5c481c7b575244ebf1496d SHA512 595ac309c7fdc7acf2f3459bb7d87d771f2d45373ec45318bafe14b440f3eef904340b043ccf8f312b2272c64d6ea26aa7ad2e61a754324dc5fe07964e40494a
-EBUILD syncthing-1.18.1.ebuild 41408 BLAKE2B 52e8b14f41a55204260a3040dc37fca315a249628c2f7343be5e00e0c426af5d0ea9543e2670ac394ec9a36079f7932d5da7525b9216d531f0867aa9ba592929 SHA512 4e0d39fa7cc6b199afd97796d22b0bd6e2b71a5f82cae6282bfef2dc7cbbcb5074862d2080abf1cc932579ba5fb36c4ae58731dba641b9da69dd8bb2ccec79e1
+EBUILD syncthing-1.18.1.ebuild 41407 BLAKE2B 4cc44eac24fac75c043454ea9fa0f9bd65325f76753bf4ffe4aaed215cc977e2dba11b2c0a5690a8a53c7099a92a1f3d20432a961e7b93d896515ca3448ea377 SHA512 6f84bfe2483df6e2da8ddcd6fa1a7d4b41948025c42607555e3588d403839ac4944891cb98968881f81aab36102820ac4281d8daf8801c29a2c9731e40b98cc5
 EBUILD syncthing-1.18.2.ebuild 42485 BLAKE2B 6d788821a799da5c8b5fe99f343a4e506095191b61e0a96c1bb2f3b6dde9ee26fc7f110fa72d48f284a2a51d1e9fba6f23266e5e1a89ec1db28786d53c63e2f7 SHA512 99ac407856802ae27e4188293768ab61231a0e948d1013488e1a78c7f2f657a89f5265c202a2ca80e916eb2b15bd40ddaff4cc424666bff262c2a403fe44ec85
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.18.1.ebuild b/net-p2p/syncthing/syncthing-1.18.1.ebuild
index 5f28aa9dd886..3530a8a1cef6 100644
--- a/net-p2p/syncthing/syncthing-1.18.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.1.ebuild
@@ -723,7 +723,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index add7053d0489..04d72a347fef 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index af8e2f6134fd..4c449abe6f12 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,3 +1,5 @@
 DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe
+DIST linux-UFRII-drv-v540-uken-08.tar.gz 188874055 BLAKE2B 150b917d20566de5658bfd46d06e2568924267a046e9083289878e0b51ab05744fefbcebd8e61694d937fd1dde769c0c8f06b6248eacebf3ac8d8706f7baa1f8 SHA512 c488fbaee081b3cd601282e737af0ce1d141a9ae940daa2335ef4da833cdb9fbdda3cc378f4e49b26700b36911dc7b142ef0665e1cacef505f91a666736e62dc
 EBUILD cnrdrvcups-lb-5.30.ebuild 6095 BLAKE2B 4d478238178bacf02163a435395a95ef00fe628cfac472072c35dcfc0f8d34ddf43aefae0b5b625014d7e955836152c2a1ec4ce32d7ad0d8eaf5af41eeacbcea SHA512 7d841d4c3fbf9857f79362deebb7b77991f74cbac64bf1c84638ea2d6ddf9d23008ecce4f5b4e6932545193757adb753a56f59b801ed38bcea962f6fba60de08
+EBUILD cnrdrvcups-lb-5.40.ebuild 6205 BLAKE2B 638545f50cd288a55275cf9e237a6eb025b533b5d6564157770fb0bb59e00e1e5c472d7e8e16ccf59a132805346985ee3c862b7d19a4b8eb43dac6b3755efc70 SHA512 832de26d4c8c472d39fb46855ff048f0855d12913d1095c5c3a21a8929ab9820a156c57b830be2b7e3760b1938e2e680679b37fa827aca4f70c2f8466b7279b8
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
new file mode 100644
index 000000000000..b4f74e408ad0
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="08"
+DL_ID="8/0100007658/25"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	media-libs/libjpeg-turbo
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-${PV//0}xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 28a6266735c2..36852b2bbc86 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,6 +2,8 @@ DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc
 DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
 DIST hplip-3.21.4-patches-1.tar.xz 17812 BLAKE2B d38584eb04e5e8d886cd4c8ecd05c31f3a32db185c87eed8a6593f3f2d1368a284bbef36f9d78b2689862165cd132597a3d616aaf5411e875f97de45c57e197e SHA512 fd7438353af8b05e100b5ef16fedcc6bf9257d49fe7d5a12a1a2b3b26965c2ebcd613788e7f585f7c0bd3a97e83381e36f3915eabd16a1e8c4ac50c1129804e8
 DIST hplip-3.21.6.tar.gz 27026295 BLAKE2B 12588ee31bfad45842bd09f8aa0e653bbdb3c80358150b15d391bb55077e52870a5fb047ae0d4c98d687409b5d244da4ee08ce56a7946ef67088de1493a0455b SHA512 08d0a93089669aa04b158aac8aa339da0278824ff2d9ecfcd967ed21ae5c4a1092910e103696e01dd230b8367471528687a4d4623759a561962116758a0b093c
+DIST hplip-3.21.8.tar.gz 27085456 BLAKE2B a3d5dc664c9e87a0a02a4bd5854c6e207a2d661aef70e3ac1cff023bacdd56a004d90caa9897eb9887a16362f73b93b30d8f52e592813e2239448fb22d549b9e SHA512 13802359a2a4510243fa81a27c3047f1fc54c25d53597011a2d5a6933121ae5aa1b020790d7d1a8a0970d5cef18e7e57b60afcbbe079dcf6219e2e64ed6675d4
 EBUILD hplip-3.20.11-r2.ebuild 8231 BLAKE2B 3e060f6b134cfb101500db89a889c092f3eecd8803d8d475212d0c91fb7be52759dac472cfe82dd59eff85f4d579b48d7c03d68fb5ded3f90495334294578dde SHA512 a0fe5d63efd08036fcb45b23dc943b529b07d214f3b8bde4b4c91e34d28ae33f8032cb314108922f74955d6e0a4ed88a29c7d6672e18cd90aef6bce03750d13d
 EBUILD hplip-3.21.6.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
+EBUILD hplip-3.21.8.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
 MISC metadata.xml 1911 BLAKE2B ccddda1b977dda5c8bb3c9e9d9d152ca57406a1b530ee92ccccc7a8a4b194b0749426e3012329fb982ce4c445c05d1fa74a3b3e0619b355ca0de429d9727bfc7 SHA512 290530d8260586d9cc07b63b7599c10a6c7b8304ffd72c22e9b9c2f7db9b6a28a72d0f53a8a84c2715cd9fd25228e0b64c005d97267f1d390114b5a46b88e4f1
diff --git a/net-print/hplip/hplip-3.21.8.ebuild b/net-print/hplip/hplip-3.21.8.ebuild
new file mode 100644
index 000000000000..e3f7c820026e
--- /dev/null
+++ b/net-print/hplip/hplip-3.21.8.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.21.4-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	sys-apps/dbus
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!libusb0? ( virtual/libusb:1 )
+	libusb0? ( virtual/libusb:0 )
+	${PYTHON_DEPS}
+	!minimal? (
+		scanner? (
+			media-gfx/sane-backends
+		)
+		snmp? (
+			dev-libs/openssl:0=
+			net-analyzer/net-snmp:=
+			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	use parport && linux-info_pkg_setup
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+		ewarn "This also disables fax, network, scanner and gui support!"
+	fi
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local drv_build minimal_build
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+		minimal_build="${minimal_build} --disable-fax-build"
+		minimal_build="${minimal_build} --disable-network-build"
+		minimal_build="${minimal_build} --disable-scan-build"
+		minimal_build="${minimal_build} --disable-gui-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
+		if use snmp ; then
+			minimal_build="${minimal_build} --enable-network-build"
+		else
+			minimal_build="${minimal_build} --disable-network-build"
+		fi
+		if use scanner ; then
+			minimal_build="${minimal_build} --enable-scan-build"
+		else
+			minimal_build="${minimal_build} --disable-scan-build"
+		fi
+		if use qt5 ; then
+			minimal_build="${minimal_build} --enable-qt5"
+			minimal_build="${minimal_build} --enable-gui-build"
+		else
+			minimal_build="${minimal_build} --disable-gui-build"
+			minimal_build="${minimal_build} --disable-qt5"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-class-driver \
+		--disable-cups11-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-imageProcessor-build \
+		--disable-lite-build \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		--enable-hpps-install \
+		--enable-dbus-build \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable libusb0 libusb01_build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	python_optimize "${ED}"/usr/share/hplip
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index aaf8ffd8948a..a1a9971d480e 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
deleted file mode 100644
index d70bfd3207e2..000000000000
--- a/net-vpn/ipsec-tools/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX ipsec-tools-0.8.0-sysctl.patch 485 BLAKE2B 95d0ef609a8a744bf8b3451a9b6b8ee4e79d79c99bd7919d45c6fc99d61904e16b3213afbfcde4743dc1be8de0b4455f1da2b3faf210c21833cbd482ab7d0c52 SHA512 a2a96cea5c2b451665d54572e471a6c2b4fb72382dcd90bda536aaabf78cdd36d630d5c1fa56372b95066dc7dffd56480d3402fdbe2d56825a017b2cc075ac66
-AUX ipsec-tools-CVE-2015-4047.patch 517 BLAKE2B 2ef6ddd4b78d7602bc4b19d76a794a1e172049b515932f00d3fe0f63b8157f3652a86f39473dc2f85b017d141790c5bc13378e79d008239899849484c4d9d42a SHA512 1dfda43a9d5919fbf274a28addbf798083f48094c65b88426d471a56e5339b72c9438c36efc6d6a3d74b4a084103c2fd4d1f974cbe494ee1228b2dbcaa304b49
-AUX ipsec-tools-CVE-2016-10396.patch 5805 BLAKE2B dd3c80403033b5a914302bea61de9c8cf088002f27d0a76d42e26c834593faabebd5366a7b46fbf5376fa93086a63a6630b04c2ac895374b1c0b80cd996b7247 SHA512 f0ae3465a41c478db59644d270560452f4f1bbf8ca79e7169a033c5139a4c484c22fb3f5f7f82da5bda0fd436331112f47698648e79a4839c45cdd904fb65d7e
-AUX ipsec-tools-def-psk.patch 907 BLAKE2B 511982e1e7902f10442ca7ec7cd2a732f8a523f5fdc4a3630833d4280518296a3b4c735648c2793a40ad7d2d914019dc19699a51f0cdaddc35b13e94ea0d6b49 SHA512 683f168fac390df602ece1608db7f65370749c291e837497fa68fe4f39ddab907d10d67d4c80d583d7f12a1ea0bf02ba98d228e7c6e9267b49a1a8a7e57e99c4
-AUX ipsec-tools-include-vendoridh.patch 434 BLAKE2B ae27d4fc5630ee372314a855ec0c17b9f9efc5f87cbc6b86c1decd685212478a4a5592bd64c2a5ed19779243114eca4bff7f7e243bdc508454ef0bf4d998245f SHA512 fc39e09dd7b1a2d3b6cdfbfad9f4978ab5d070ae2435cf77fe2283b566bea1d58cd26dbf6cafb563587200724c9602a32ce737fd163b757872e8a6d2c8007d5c
-AUX ipsec-tools.conf 1209 BLAKE2B 6d84eede1d77f09f1dac1db6866c7a877494cfbce69f01fb09f5961ae213547f2e5aca9ab068e375d2fdba8e326444e2b3f3d3cd6249f641e30127b8c5c52efb SHA512 727297a06b75b883a7bd730d84f7a7cec04f81b51df71a6d2419602d835abe3c958d27aac176e29e2463421792843517bda802b3437b306ab43e94d178593bfa
-AUX ipsec-tools.service 282 BLAKE2B 8040f9749d8590506a9e252bdc57614f296f1037bd4da9ee05d35489e518625b7d379e4fefe5d7e81a03ebc6dcf28d240741d9f77b3a03a428a1080e7f127ffb SHA512 71a6accf8a77a837107c627843363aa63cecfb94f3d853a9bae22ed3bd796a0f0dfdae6794fcd74a76d0583b8128e273e07b707451297273fc141f43461222e3
-AUX psk.txt 293 BLAKE2B f7d09ee249e91bb31c36095ab2673eb7d19fa0871263644a8bcfe51740afe047f7a6671b65821b349ecadb17628d8fad2bbaa191081fd808a214b48341b47a2d SHA512 ed09588bcbf9b16e4e18315c7b9a7667788b4ab26cd962376430c316cfb0ee5a30ff26910190731b287c1a1b5927951a79f71a096071e73d67dc867a455b14cf
-AUX racoon.conf 772 BLAKE2B 147bc65c8802c0f7404b61e7e8d99a2f35104278b2112d6f873a5247dd11cfdc1bf6b2ce09eabf2254d4acd747a849cbc28c01b9a2c736b1546c9778d2354906 SHA512 8876920331b4003fd096f1997e1266a12783120e390cea55ca283a8fd6485552b54e87f60e75f33409a4cdb99171d2358953287edd47ddeac8bda6da0cc8becc
-AUX racoon.conf.d-r2 978 BLAKE2B 1070533eff1f70fa86eaec0624afa1be1f3c0b16aa732609aed619e30672fc1e27f8a72449bddbda4470c84094ada0f875d3edd3bcbf5df51502b7590f6cd783 SHA512 28c011831276df27384bc97978c6e88c4b88f98bccd7f578c40881b0544488047ad8fcb83f0654e99dbfe38a979606ceef87973d566e9bfded941cbfe882ecd3
-AUX racoon.init.d-r3 1295 BLAKE2B 730b7c7069ea94f0e27fe3c0ed344d6f9631e0445d2368a89a432a16091cc8c135e5a3c813ed2b4225514650eee4f47fba1894c9f443405c31f46e9c8737d37b SHA512 4e52d86237204134a5cc5726d8639d96723fab58dba6f6ddc1e3c1ed2e1e453c644037f65e118fdd6ca0b25eac4de83e78675dd072e095d9f4ef2dfa4f965475
-AUX racoon.pam.d 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
-AUX racoon.service 244 BLAKE2B f7e268518787a67e9363c936b8a9e69763c41db1926f99f3f001fdf738b0b3a92cd62770ab6cc0189cea20ca22d3abe675c832363ad77974e3f531ffbf525e7b SHA512 56d84f36b307e1ea93f3cdc9fbb7b459f4b3b65ea2bb765f61def10d06a3ff09d61b8d53b21796a55022279e791d751f3bc1ccf0d0f85799a743371390930567
-DIST ipsec-tools-0.8.2.tar.bz2 866465 BLAKE2B cf8c9175d96326fc5c74e6b1921bc66911256e289e6fe9cef77f26c197546902be3ebd5696af39c749a2abaac3f42010c9e2a281fd208122cd59222044b9dd4c SHA512 2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f
-DIST ipsec-tools-add-openssl-1.1.x-support.patch 32066 BLAKE2B b8380408c90bb93f0b95938de2efc61c80d727ae61a1417134583a8c74055fcfe1f7f75893f1f701b0f301a16d8b4d14f1b8a09d1e81d238821bcc122dfe183f SHA512 f2bd85f1c51226da6fc50d3473129e4c2e3c0e46107337f8d676029b7072b98bf164b6813a16de7dd4481f80038453b55a5ff56e7f5ec08ab07641034258e778
-EBUILD ipsec-tools-0.8.2-r8.ebuild 8010 BLAKE2B 88e36224a1a75f842025580d09ab15b20b0fa233681e13a2f31f0b1e00a0dfd1675e743b9173501fef3bdfa74c7408edcacbe02e2873962f51d987a3044cc485 SHA512 5b0c199ba0aa14cb1310d7923869da27673731580eb0ecd7473bd66908ee558060ea8f621ea740854e357bce6a314cd55816c6148f7b7099e81a440c7614c1b8
-MISC metadata.xml 633 BLAKE2B 52069cbea4508b892d7f43c769173f871bca05232f5286760dd6878e5eb28487623de3433a4d77551dcf667d7d52a709ef5f040945a246a67711d1b1540d9b21 SHA512 4aaf5869b29f621b03952aa8c2b2fa53c076cf83610a4433587305a603e3949aad38798e27ff578c1228dc8f6f9f0cccd4efc51ed31b4e26787271da7b0c6a59
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch b/net-vpn/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
deleted file mode 100644
index 5c69bbb2fa61..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/425770
-
---- a/src/racoon/pfkey.c
-+++ b/src/racoon/pfkey.c
-@@ -59,7 +59,6 @@
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/queue.h>
--#include <sys/sysctl.h>
- 
- #include <net/route.h>
- #include <net/pfkeyv2.h>
---- a/src/setkey/setkey.c
-+++ b/src/setkey/setkey.c
-@@ -40,7 +40,6 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <sys/sysctl.h>
- #include <err.h>
- #include <netinet/in.h>
- #include <net/pfkeyv2.h>
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch b/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
deleted file mode 100644
index 58f72e109c40..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-See: https://bugs.gentoo.org/show_bug.cgi?id=550118
-
---- ./src/racoon/gssapi.c    9 Sep 2006 16:22:09 -0000       1.4
-+++ ./src/racoon/gssapi.c    19 May 2015 15:16:00 -0000      1.6
-@@ -192,6 +192,11 @@
-	gss_name_t princ, canon_princ;
-	OM_uint32 maj_stat, min_stat;
- 
-+	if (iph1->rmconf == NULL) {
-+		plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
-+		return -1;
-+	}
-+
-	gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
-	if (gps == NULL) {
-		plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2016-10396.patch b/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2016-10396.patch
deleted file mode 100644
index e123007bb593..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2016-10396.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-Description: Fix remotely exploitable DoS. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10396
-Source: vendor; https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=51682
-Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867986
-
-Index: pkg-ipsec-tools/src/racoon/isakmp_frag.c
-===================================================================
---- pkg-ipsec-tools.orig/src/racoon/isakmp_frag.c
-+++ pkg-ipsec-tools/src/racoon/isakmp_frag.c
-@@ -1,4 +1,4 @@
--/*	$NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $	*/
-+/*	$NetBSD: isakmp_frag.c,v 1.5.36.1 2017/04/21 16:50:42 bouyer Exp $	*/
- 
- /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
- 
-@@ -173,6 +173,43 @@ vendorid_frag_cap(gen)
- 	return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]);
- }
- 
-+static int 
-+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item)
-+{
-+	struct isakmp_frag_item *pitem = NULL;
-+	struct isakmp_frag_item *citem = iph1->frag_chain;
-+
-+	/* no frag yet, just insert at beginning of list */
-+	if (iph1->frag_chain == NULL) {
-+		iph1->frag_chain = item;
-+		return 0;
-+	}
-+
-+	do {
-+		/* duplicate fragment number, abort (CVE-2016-10396) */
-+		if (citem->frag_num == item->frag_num)
-+			return -1;
-+
-+		/* need to insert before current item */
-+		if (citem->frag_num > item->frag_num) {
-+			if (pitem != NULL)
-+				pitem->frag_next = item;
-+			else
-+				/* insert at the beginning of the list  */
-+				iph1->frag_chain = item;
-+			item->frag_next = citem;
-+			return 0;
-+		}
-+
-+		pitem = citem;
-+		citem = citem->frag_next;
-+	} while (citem != NULL);
-+
-+	/* we reached the end of the list, insert */
-+	pitem->frag_next = item;
-+	return 0;
-+}
-+
- int 
- isakmp_frag_extract(iph1, msg)
- 	struct ph1handle *iph1;
-@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg)
- 	item->frag_next = NULL;
- 	item->frag_packet = buf;
- 
--	/* Look for the last frag while inserting the new item in the chain */
--	if (item->frag_last)
--		last_frag = item->frag_num;
-+	/* Check for the last frag before inserting the new item in the chain */
-+	if (item->frag_last) {
-+		/* if we have the last fragment, indices must match */
-+		if (iph1->frag_last_index != 0 &&
-+		    item->frag_last != iph1->frag_last_index) {
-+			plog(LLV_ERROR, LOCATION, NULL,
-+			     "Repeated last fragment index mismatch\n");
-+			racoon_free(item);
-+			vfree(buf);
-+			return -1;
-+		}
- 
--	if (iph1->frag_chain == NULL) {
--		iph1->frag_chain = item;
--	} else {
--		struct isakmp_frag_item *current;
-+		last_frag = iph1->frag_last_index = item->frag_num;
-+	}
- 
--		current = iph1->frag_chain;
--		while (current->frag_next) {
--			if (current->frag_last)
--				last_frag = item->frag_num;
--			current = current->frag_next;
--		}
--		current->frag_next = item;
-+	/* insert fragment into chain */
-+	if (isakmp_frag_insert(iph1, item) == -1) {
-+		plog(LLV_ERROR, LOCATION, NULL,
-+		    "Repeated fragment index mismatch\n");
-+		racoon_free(item);
-+		vfree(buf);
-+		return -1;
- 	}
- 
--	/* If we saw the last frag, check if the chain is complete */
-+	/* If we saw the last frag, check if the chain is complete
-+	 * we have a sorted list now, so just walk through */
- 	if (last_frag != 0) {
-+		item = iph1->frag_chain;
- 		for (i = 1; i <= last_frag; i++) {
--			item = iph1->frag_chain;
--			do {
--				if (item->frag_num == i)
--					break;
--				item = item->frag_next;
--			} while (item != NULL);
--
-+			if (item->frag_num != i)
-+				break;
-+			item = item->frag_next;
- 			if (item == NULL) /* Not found */
- 				break;
- 		}
- 
--		if (item != NULL) /* It is complete */
-+		if (i > last_frag) /* It is complete */
- 			return 1;
- 	}
- 		
-@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1)
- 	}
- 	data = buf->v;
- 
-+	item = iph1->frag_chain;
- 	for (i = 1; i <= frag_count; i++) {
--		item = iph1->frag_chain;
--		do {
--			if (item->frag_num == i)
--				break;
--			item = item->frag_next;
--		} while (item != NULL);
--
--		if (item == NULL) {
-+		if (item->frag_num != i) {
- 			plog(LLV_ERROR, LOCATION, NULL, 
- 			    "Missing fragment #%d\n", i);
- 			vfree(buf);
-@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1)
- 		}
- 		memcpy(data, item->frag_packet->v, item->frag_packet->l);
- 		data += item->frag_packet->l;
-+		item = item->frag_next;
- 	}
- 
- out:
-Index: pkg-ipsec-tools/src/racoon/isakmp_inf.c
-===================================================================
---- pkg-ipsec-tools.orig/src/racoon/isakmp_inf.c
-+++ pkg-ipsec-tools/src/racoon/isakmp_inf.c
-@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca
- #endif
- #ifdef ENABLE_FRAG
- 	iph1->frag = 0;
-+	iph1->frag_last_index = 0;
- 	iph1->frag_chain = NULL;
- #endif
- 
-Index: pkg-ipsec-tools/src/racoon/isakmp.c
-===================================================================
---- pkg-ipsec-tools.orig/src/racoon/isakmp.c
-+++ pkg-ipsec-tools/src/racoon/isakmp.c
-@@ -1072,6 +1072,7 @@ isakmp_ph1begin_i(rmconf, remote, local)
- 		iph1->frag = 1;
- 	else
- 		iph1->frag = 0;
-+	iph1->frag_last_index = 0;
- 	iph1->frag_chain = NULL;
- #endif
- 	iph1->approval = NULL;
-@@ -1176,6 +1177,7 @@ isakmp_ph1begin_r(msg, remote, local, et
- #endif
- #ifdef ENABLE_FRAG
- 	iph1->frag = 0;
-+	iph1->frag_last_index = 0;
- 	iph1->frag_chain = NULL;
- #endif
- 	iph1->approval = NULL;
-Index: pkg-ipsec-tools/src/racoon/handler.h
-===================================================================
---- pkg-ipsec-tools.orig/src/racoon/handler.h
-+++ pkg-ipsec-tools/src/racoon/handler.h
-@@ -1,4 +1,4 @@
--/*	$NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $	*/
-+/*	$NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $	*/
- 
- /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */
- 
-@@ -141,6 +141,7 @@ struct ph1handle {
- #endif
- #ifdef ENABLE_FRAG
- 	int frag;			/* IKE phase 1 fragmentation */
-+	int frag_last_index;
- 	struct isakmp_frag_item *frag_chain;	/* Received fragments */
- #endif
- 
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-def-psk.patch b/net-vpn/ipsec-tools/files/ipsec-tools-def-psk.patch
deleted file mode 100644
index f351860a84e9..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-def-psk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -brau ipsec-tools-0.7.3.o/src/racoon/oakley.c ipsec-tools-0.7.3/src/racoon/oakley.c
---- ipsec-tools-0.7.3.o/src/racoon/oakley.c	2009-08-13 11:18:45.000000000 +0200
-+++ ipsec-tools-0.7.3/src/racoon/oakley.c	2011-06-06 09:36:11.000000000 +0200
-@@ -2498,8 +2498,21 @@
- 				plog(LLV_ERROR, LOCATION, iph1->remote,
- 					"couldn't find the pskey for %s.\n",
- 					saddrwop2str(iph1->remote));
-+			}
-+		}
-+		if (iph1->authstr == NULL) {
-+			/*
-+			 * If we could not locate a psk above try and locate
-+			 * the default psk, ie, "*".
-+			 */
-+			iph1->authstr = privsep_getpsk("*", 1);
-+			if (iph1->authstr == NULL) {
-+				plog(LLV_ERROR, LOCATION, iph1->remote,
-+					"couldn't find the the default pskey either.\n");
- 				goto end;
- 			}
-+			plog(LLV_NOTIFY, LOCATION, iph1->remote,
-+					"Using default PSK.\n");
- 		}
- 		plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n");
- 		/* should be secret PSK */
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools-include-vendoridh.patch b/net-vpn/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
deleted file mode 100644
index 2e22c82db478..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c ipsec-tools-0.8.0/src/racoon/ipsec_doi.c
---- ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c	2012-02-28 13:42:24.000000000 -0500
-+++ ipsec-tools-0.8.0/src/racoon/ipsec_doi.c	2012-02-28 13:41:22.000000000 -0500
-@@ -87,6 +87,7 @@
- #ifdef HAVE_GSSAPI
- #include <iconv.h>
- #include "gssapi.h"
-+#include "vendorid.h"
- #ifdef HAVE_ICONV_2ND_CONST
- #define __iconv_const const
- #else
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools.conf b/net-vpn/ipsec-tools/files/ipsec-tools.conf
deleted file mode 100644
index bfff04af069a..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/sbin/setkey -f
-#
-# THIS IS A SAMPLE FILE!
-#
-# This is a sample file to test Gentoo's ipsec-tools out of the box.
-# Do not use it in production.  See: http://www.ipsec-howto.org/
-#
-flush;
-spdflush;
-
-#
-# Uncomment the following if you want to do manual keying, ie, you want to run IPsec without racoon.
-# Do not switch 192.168.3.21 <-> 192.168.3.25 on the peer
-#
-#add 192.168.3.25 192.168.3.21 ah 0x200 -A hmac-md5 0xc0291ff014dccdd03874d9e8e4cdf3e6;
-#add 192.168.3.21 192.168.3.25 ah 0x300 -A hmac-md5 0x96358c90783bbfa3d7b196ceabe0536b;
-#add 192.168.3.25 192.168.3.21 esp 0x201 -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831;
-#add 192.168.3.21 192.168.3.25 esp 0x301 -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df;
-
-#
-# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer
-#
-#spdadd 192.168.3.21 192.168.3.25 any -P out ipsec esp/transport//require ah/transport//require;
-#spdadd 192.168.3.25 192.168.3.21 any -P in  ipsec esp/transport//require ah/transport//require;
-spdadd 192.168.3.25 192.168.3.21 any -P out ipsec esp/transport//require ah/transport//require;
-spdadd 192.168.3.21 192.168.3.25 any -P in  ipsec esp/transport//require ah/transport//require;
diff --git a/net-vpn/ipsec-tools/files/ipsec-tools.service b/net-vpn/ipsec-tools/files/ipsec-tools.service
deleted file mode 100644
index 0341aa7e4ed9..000000000000
--- a/net-vpn/ipsec-tools/files/ipsec-tools.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Load IPSec Security Policy Database
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
-ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-vpn/ipsec-tools/files/psk.txt b/net-vpn/ipsec-tools/files/psk.txt
deleted file mode 100644
index 97f5180f5ae5..000000000000
--- a/net-vpn/ipsec-tools/files/psk.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# THIS IS A SAMPLE FILE!
-#
-# This is a sample file to test Gentoo's ipsec-tools out of the box.
-# Do not use it in production.  See: http://www.ipsec-howto.org/
-#
-# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer
-#
-# Peer IP/FQDN	Secret
-# 192.168.3.25	sample
-192.168.3.21	sample
diff --git a/net-vpn/ipsec-tools/files/racoon.conf b/net-vpn/ipsec-tools/files/racoon.conf
deleted file mode 100644
index 2e9206db9506..000000000000
--- a/net-vpn/ipsec-tools/files/racoon.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# THIS IS A SAMPLE FILE!
-#
-# This is a sample file to test Gentoo's ipsec-tools out of the box.
-# Do not use it in production.  See: http://www.ipsec-howto.org/
-#
-path pre_shared_key "/etc/racoon/psk.txt";
-
-#
-# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer
-#
-#remote 192.168.3.25
-remote 192.168.3.21
-{
-	exchange_mode main;
-	proposal {
-		encryption_algorithm 3des;
-		hash_algorithm md5;
-		authentication_method pre_shared_key;
-		dh_group modp1024;
-	}
-}
-
-#
-# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer
-#
-#sainfo address 192.168.3.21 any address 192.168.3.25 any
-sainfo address 192.168.3.25 any address 192.168.3.21 any
-{
-	pfs_group modp768;
-	encryption_algorithm 3des;
-	authentication_algorithm hmac_md5;
-	compression_algorithm deflate;
-}
diff --git a/net-vpn/ipsec-tools/files/racoon.conf.d-r2 b/net-vpn/ipsec-tools/files/racoon.conf.d-r2
deleted file mode 100644
index c592d3584967..000000000000
--- a/net-vpn/ipsec-tools/files/racoon.conf.d-r2
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/racoon
-
-# See the man page or run `racoon --help` for valid command-line options
-# RACOON_OPTS="-d"
-
-RACOON_CONF="/etc/racoon/racoon.conf"
-RACOON_PSK_FILE="/etc/racoon/psk.txt"
-
-# The amount of time in ms for start-stop-daemon to wait before a timeout
-# Racoon can sometimes be slow.  We'll wait 1 sec.  Bug #435398.
-
-RACOON_WAIT="1000"
-
-# The setkey config file.  Don't name it ipsec.conf as this clashes
-# with strongswan.  We'll follow debian's naming.  Bug #436144.
-
-SETKEY_CONF="/etc/ipsec-tools.conf"
-
-# Comment or remove the following if you don't want the policy tables
-# to be flushed when racoon is stopped.
-
-RACOON_RESET_TABLES="true"
-
-# If you need to set custom options to the setkey command when loading rules, use this
-# more info in the setkey mangage (example below sets kernel mode instead of RFC mode):
-#SETKEY_OPTS="-k"
diff --git a/net-vpn/ipsec-tools/files/racoon.init.d-r3 b/net-vpn/ipsec-tools/files/racoon.init.d-r3
deleted file mode 100644
index 66e10bb84d42..000000000000
--- a/net-vpn/ipsec-tools/files/racoon.init.d-r3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before netmount
-	use net
-}
-
-checkconfig() {
-	if [ ! -e ${SETKEY_CONF} ] ; then
-		eerror "You need to configure setkey before starting racoon."
-		return 1
-	fi
-	if [ ! -e ${RACOON_CONF} ] ; then
-		eerror "You need a configuration file to start racoon."
-		return 1
-	fi
-	if [ ! -z ${RACOON_PSK_FILE} ] ; then
-		if [ ! -f ${RACOON_PSK_FILE} ] ; then
-			eerror "PSK file not found as specified."
-			eerror "Set RACOON_PSK_FILE in /etc/conf.d/racoon."
-			return 1
-		fi
-		case "`ls -Lldn ${RACOON_PSK_FILE}`" in
-			-r--------*)
-				;;
-			*)
-				eerror "Your defined PSK file should be mode 400 for security!"
-				return 1
-				;;
-		esac
-	fi
-}
-
-command=/usr/sbin/racoon
-command_args="-f ${RACOON_CONF} ${RACOON_OPTS}"
-pidfile=/var/run/racoon.pid
-start_stop_daemon_args="--wait ${RACOON_WAIT}"
-
-start_pre() {
-	checkconfig || return 1
-	einfo "Loading ipsec policies from ${SETKEY_CONF}."
-	/usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF}
-	if [ $? -eq 1 ] ; then
-		eerror "Error while loading ipsec policies"
-	fi
-}
-
-stop_post() {
-	if [ -n "${RACOON_RESET_TABLES}" ]; then
-		ebegin "Flushing policy entries"
-		/usr/sbin/setkey -F
-		/usr/sbin/setkey -FP
-		eend $?
-	fi
-}
diff --git a/net-vpn/ipsec-tools/files/racoon.pam.d b/net-vpn/ipsec-tools/files/racoon.pam.d
deleted file mode 100644
index b801aaafa0f9..000000000000
--- a/net-vpn/ipsec-tools/files/racoon.pam.d
+++ /dev/null
@@ -1,4 +0,0 @@
-auth       include	system-remote-login
-account    include	system-remote-login
-password   include	system-remote-login
-session	   include	system-remote-login
diff --git a/net-vpn/ipsec-tools/files/racoon.service b/net-vpn/ipsec-tools/files/racoon.service
deleted file mode 100644
index df7f1bb8f8c0..000000000000
--- a/net-vpn/ipsec-tools/files/racoon.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Racoon IKEv1 key management daemon for IPSEC
-After=syslog.target network.target
-Requires=ipsec-tools.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r8.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r8.ebuild
deleted file mode 100644
index f5bcdfcd4ab9..000000000000
--- a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r8.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic autotools linux-info pam systemd
-
-DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
-HOMEPAGE="http://ipsec-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~juippis/distfiles/tmp/ipsec-tools-add-openssl-1.1.x-support.patch"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86"
-IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${CDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-		if ! has_version "net-vpn/strongswan" &&
-			! has_version "net-misc/openswan" &&
-			! has_version "net-vpn/libreswan"; then
-			ewarn "We found an earlier version of ${PN} installed."
-			ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
-			ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
-			ewarn "a conflict with net-vpn/strongswan; bug #436144.  We will"
-			ewarn "rename this file for you with this upgrade.  However, if"
-			ewarn "you later downgrade, you'll have to rename the file to"
-			ewarn "its orignal manually or change /etc/conf.d/racoon to point"
-			ewarn "to the new file."
-
-			if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then
-				mv /etc/ipsec.conf /etc/ipsec-tools.conf
-			else
-				ewarn
-				ewarn "Oops!  I can't move ipsec.conf to ipsec-tools.conf!"
-				ewarn "Either the former doesn't exist or the later does and"
-				ewarn "I won't clobber it.  Please fix this situation manually."
-			fi
-		else
-			ewarn "You had both an earlier version of ${PN} and"
-			ewarn "net-vpn/strongswan installed.  I can't tell whether"
-			ewarn "the configuration file, ipsec.conf, belongs to one"
-			ewarn "package or the other due to a file conflict; bug #436144."
-			ewarn "The current version of ${PN} uses ipsec-tools.conf"
-			ewarn "as its configuration file, as will future versions."
-			ewarn "Please fix this situation manually."
-		fi
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	get_version
-
-	if linux_config_exists && kernel_is -ge 2 6 19; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-		ewarn "Checking kernel configuration in /usr/src/linux or"
-		ewarn "or /proc/config.gz for compatibility with ${PN}."
-		ewarn "Here are the potential problems:"
-		ewarn
-
-		local nothing="1"
-
-		# Check options for all flavors of IPSec
-		local msg=""
-		for i in XFRM_USER NET_KEY; do
-			if ! linux_chkconfig_present ${i}; then
-				msg="${msg} ${i}"
-			fi
-		done
-		if [[ ! -z "$msg" ]]; then
-			nothing="0"
-			ewarn
-			ewarn "ALL IPSec may fail. CHECK:"
-			ewarn "${msg}"
-		fi
-
-		# Check unencrypted IPSec
-		if ! linux_chkconfig_present CRYPTO_NULL; then
-			nothing="0"
-			ewarn
-			ewarn "Unencrypted IPSec may fail. CHECK:"
-			ewarn " CRYPTO_NULL"
-		fi
-
-		# Check IPv4 IPSec
-		msg=""
-		for i in \
-			INET_IPCOMP INET_AH INET_ESP \
-			INET_XFRM_MODE_TRANSPORT \
-			INET_XFRM_MODE_TUNNEL \
-			INET_XFRM_MODE_BEET
-		do
-			if ! linux_chkconfig_present ${i}; then
-				msg="${msg} ${i}"
-			fi
-		done
-		if [[ ! -z "$msg" ]]; then
-			nothing="0"
-			ewarn
-			ewarn "IPv4 IPSec may fail. CHECK:"
-			ewarn "${msg}"
-		fi
-
-		# Check IPv6 IPSec
-		if use ipv6; then
-			msg=""
-			for i in INET6_IPCOMP INET6_AH INET6_ESP \
-				INET6_XFRM_MODE_TRANSPORT \
-				INET6_XFRM_MODE_TUNNEL \
-				INET6_XFRM_MODE_BEET
-			do
-				if ! linux_chkconfig_present ${i}; then
-					msg="${msg} ${i}"
-				fi
-			done
-			if [[ ! -z "$msg" ]]; then
-			nothing="0"
-				ewarn
-				ewarn "IPv6 IPSec may fail. CHECK:"
-				ewarn "${msg}"
-			fi
-		fi
-
-		# Check IPSec behind NAT
-		if use nat; then
-			if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then
-				nothing="0"
-				ewarn
-				ewarn "IPSec behind NAT may fail.  CHECK:"
-				ewarn " NETFILTER_XT_MATCH_POLICY"
-			fi
-		fi
-
-		if [[ $nothing == "1" ]]; then
-			ewarn "NO PROBLEMS FOUND"
-		fi
-
-		ewarn
-		ewarn "WARNING: If your *configured* and *running* kernel"
-		ewarn "differ either now or in the future, then these checks"
-		ewarn "may lead to misleading results."
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	else
-		eerror
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror "Make sure that your *running* kernel is/will be >=2.6.19."
-		eerror "Building ${PN} now, assuming that you know what you're doing."
-		eerror "\033[1;31m**************************************************\033[00m"
-		eerror
-	fi
-}
-
-src_prepare() {
-	# fix for bug #124813
-	sed -i 's:-Werror::g' "${S}"/configure.ac || die
-	# fix for building with gcc-4.6
-	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
-
-	eapply "${FILESDIR}/${PN}-def-psk.patch"
-	eapply "${FILESDIR}/${PN}-include-vendoridh.patch"
-	eapply "${FILESDIR}"/${PN}-0.8.0-sysctl.patch #425770
-	eapply "${FILESDIR}"/${PN}-CVE-2015-4047.patch
-	eapply "${DISTDIR}"/${PN}-add-openssl-1.1.x-support.patch
-	eapply "${FILESDIR}"/${PN}-CVE-2016-10396.patch
-	AT_M4DIR="${S}" eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	#--with-{libiconv,libradius} lead to "Broken getaddrinfo()"
-	#--enable-samode-unspec is not supported in linux
-	local myconf
-	myconf="--with-kernel-headers=/usr/include \
-			--enable-adminport \
-			--enable-dependency-tracking \
-			--enable-dpd \
-			--enable-frag \
-			--without-libiconv \
-			--without-libradius \
-			--disable-samode-unspec \
-			$(use_enable idea) \
-			$(use_enable ipv6) \
-			$(use_enable kerberos gssapi) \
-			$(use_with ldap libldap) \
-			$(use_enable nat natt) \
-			$(use_with pam libpam) \
-			$(use_enable rc5) \
-			$(use_with readline) \
-			$(use_enable selinux security-context) \
-			$(use_enable stats)"
-
-	use nat && myconf="${myconf} --enable-natt-versions=yes"
-
-	# enable mode-cfg and xauth support
-	if use pam; then
-		myconf="${myconf} --enable-hybrid"
-	else
-		myconf="${myconf} $(use_enable hybrid)"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/racoon
-	newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
-	newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-	systemd_dounit "${FILESDIR}/ipsec-tools.service"
-	systemd_dounit "${FILESDIR}/racoon.service"
-	use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
-
-	insinto /etc
-	doins "${FILESDIR}"/ipsec-tools.conf
-	insinto /etc/racoon
-	doins "${FILESDIR}"/racoon.conf
-	doins "${FILESDIR}"/psk.txt
-	chmod 400 "${D}"/etc/racoon/psk.txt
-
-	dodoc ChangeLog README NEWS
-	dodoc -r src/racoon/samples
-	dodoc -r src/racoon/doc
-	docinto samples
-	newdoc src/setkey/sample.cf ipsec-tools.conf
-}
-
-pkg_postinst() {
-	if use nat; then
-		elog
-		elog "You have enabled the nat traversal functionnality."
-		elog "Nat versions wich are enabled by default are 00,02,rfc"
-		elog "you can find those drafts in the CVS repository:"
-		elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
-		elog
-		elog "If you feel brave enough and you know what you are"
-		elog "doing, you can consider emerging this ebuild with"
-		elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
-		elog
-	fi
-
-	if use ldap; then
-		elog
-		elog "You have enabled ldap support with ${PN}."
-		elog "The man page does NOT contain any information on it yet."
-		elog "Consider using a more recent version or CVS."
-		elog
-	fi
-
-	elog
-	elog "Please have a look in /usr/share/doc/${P} and visit"
-	elog "http://www.netbsd.org/Documentation/network/ipsec/"
-	elog "to find more information on how to configure this tool."
-	elog
-}
diff --git a/net-vpn/ipsec-tools/metadata.xml b/net-vpn/ipsec-tools/metadata.xml
deleted file mode 100644
index ebfe94eecee4..000000000000
--- a/net-vpn/ipsec-tools/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="hybrid">Makes available both mode-cfg and xauth support</flag>
-		<flag name="idea">Enable support for the IDEA algorithm</flag>
-		<flag name="nat">Enable NAT-Traversal</flag>
-		<flag name="rc5">Enable support for the patented RC5 algorithm</flag>
-		<flag name="stats">Enable statistics reporting</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">ipsec-tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index ab948eb807fc..fee3d4be3474 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -2,5 +2,5 @@ AUX wg-quick.init 885 BLAKE2B 440224b688b1a1b4762bac7ac3bd6cb6fbee546543f1da70fc
 DIST wireguard-tools-1.0.20210424.tar.xz 96816 BLAKE2B 4787624d296c22241ff366c799eb07e1e718534eab9c998df24003380ed9743f76c3b8f779c7e534404573583c9654a43527d4c96de0def78a3d88d30ca6985e SHA512 b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59
 DIST wireguard-tools-1.0.20210914.tar.xz 99744 BLAKE2B 020f4a61597dafc6663e9ee5659f9401416692f5dc8e23afe8d59054bffd32c92814ff2e1f99d6ffe558fdfcf756afc1838e4d425847f892ad4b627a077fe614 SHA512 6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445
 EBUILD wireguard-tools-1.0.20210424.ebuild 4058 BLAKE2B 3e3f0639ee1dd5f89b6c38a65e930abb1c6f5ad045184c669a0a883b0fa356960137d707c9ce2d93aefb6b5c5ebc0f18fbe725b2f109abe8f3238173c1e05f59 SHA512 8a954a295a93631de815da4da2f37937fc88d59df87160fbbfc4c6ae78f569d42fca41e35642212371816ba06efdde6ce996ff5fa5258ddf57c169fbd41ec7d3
-EBUILD wireguard-tools-1.0.20210914.ebuild 4065 BLAKE2B 6d90de16d5a656005bfe4f190e9c6b99f6deaa81bea1def90d8da792e5e6cc19badabde862f5e8af36e62874ec2e0dd12f23cdff9b06b5d72a0e70547f3fdc0d SHA512 17f3ab190b4ad6660d8b21f1589d0bcc1bd56d63db81c428c8ff6c5fab45e0ebcefdb315c85f774b3b3bccc485fd582ab7c0b0147024cdbf7ca6a500952fb71e
+EBUILD wireguard-tools-1.0.20210914.ebuild 4072 BLAKE2B cc321ee0a3ebf95bd33230edd1c1f6df914be68c84d5b88339e7f6b4979d7307d53d62659c1daebed1e321fe2416de6d3fae4be9d873bdc0c68c07a63717174d SHA512 3fdbd697817bc0147d9247872899cb5dd55b3108218189564b5cd9c6d8fee738e88251ed48a4f181b3478d368cf42f4120a7e6eb10c83281c78eb9fd31af1580
 MISC metadata.xml 363 BLAKE2B 34748b86884ce0197e3fd579515d3daf62d32d269f71d05ba1d2f795a66d6140b79fc803008beb0d02a2c7ae80adf0ef19c2daa0be9512f87f3e3c046887c58d SHA512 67a6dc99c972a4bb40b73dae1c33dfc6e1288f3c918e0814656ea5f91a33c72cf3bb261b1b38054d0ea0b67efad07c24e7f969114876526526aeffd4d62497c4
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20210914.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210914.ebuild
index c707cf29cb33..c962d7b2f091 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20210914.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210914.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
 else
 	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c3f10b8bc1ae..ef336d6bc4da 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 76881358a4de..a4a308542127 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db7
 DIST blueman-2.2.1.tar.xz 1570992 BLAKE2B b6d2296b68990c25e6d8077b513ebd3915152522fdf66bb5d887a90cf98e8835d993caf89a93089947ff1f6470075b9b6643ee0169ba86e46d190c09fbc6942a SHA512 7668a68470e7b5ab8e5cd774c89a7ae347de4193e293b5f2a467407fcb625e07a482f986fd7b672b763c297a0c0692c1da53dcc4ae75ec7fa118b180be623104
 DIST blueman-2.2.2.tar.xz 1560516 BLAKE2B fb82044971fb51ed7732f7638872e3bdbc7259a4fd4f3cc26f5567cfce378319ef3346376d3f07ceab92d2d002ff6455cc7c43345da7f660c3dc9f6b5ab57980 SHA512 b95f82c8a1bc8a77755f56944852a92da3bb58ecf646da75cfc6b6b50af679a3a8efb881f7917e6bb8b3645b1d3ab95b52ecd3c13ff0891ce999b59fe6d24488
 EBUILD blueman-2.2.1.ebuild 2893 BLAKE2B 592923dee6370b03f0b3c39326b9bb3dbc3103e8e515df1685a70f1b301f90602095888a09c901160ad49ba1b6e92d2d3200656bc066d6e2ac48434160610ba1 SHA512 44b9679e840ad1416410032bc596a513cb77e66575a0c9c482f0ba32aee9dcf92e66d404caf2ec412afa4cc638ce8875cb69574ed43e8193b53c56d563cb0e39
-EBUILD blueman-2.2.2.ebuild 2900 BLAKE2B 55ec16535fd754a18037cadf8d11755ab484bd9e6409d89e281e26d36f30c271e1561306553a61b5affc26167aea82cded1005b790aeadf8305dbd0262fdf766 SHA512 cc14c5006b784c69292089ce046136bce8baec90dfa9523731e4cd381c4227102deceab19a1e87e8f5633d6b6752594cf5f1d3a72935ead8b20020bb74f097ca
+EBUILD blueman-2.2.2.ebuild 2896 BLAKE2B ae515a65c3aadeac08f95ad247b8c9e0ea9aacdbc55c3d177fceedd1ff95bf1a2148ce0530642389d1390dc9557978c6d51dd268c512c7aca474fb181aa3cabe SHA512 ebd03729bfdc46139909af4ddc6fb799caf6b094e7942ff19c7293c7695308c9a8b90a120d545afaee72e36d7ada89ac195d4f47b2175aeb27c7c3e63798b066
 EBUILD blueman-9999.ebuild 2900 BLAKE2B 55ec16535fd754a18037cadf8d11755ab484bd9e6409d89e281e26d36f30c271e1561306553a61b5affc26167aea82cded1005b790aeadf8305dbd0262fdf766 SHA512 cc14c5006b784c69292089ce046136bce8baec90dfa9523731e4cd381c4227102deceab19a1e87e8f5633d6b6752594cf5f1d3a72935ead8b20020bb74f097ca
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.2.2.ebuild b/net-wireless/blueman/blueman-2.2.2.ebuild
index 093410dceb50..17322df15876 100644
--- a/net-wireless/blueman/blueman-2.2.2.ebuild
+++ b/net-wireless/blueman/blueman-2.2.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index ec444dd98cee..3c4736b8bfbe 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -5,6 +5,6 @@ AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede0672997
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142
 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9
-EBUILD dump1090-5.0.ebuild 2535 BLAKE2B fa38bcef033f4daa131ee948df9e8eed9f8bac803f182523761b9b2c2744af254b8a64c9f2330435f871a3ac2cf90c7e16aace626701914c2ebe41de67d4f8b7 SHA512 cd10dfefdfe138b1a79d02b72708d2c9c443b918ca92c0888125dbd0cf6b781ea344352f03674ba28c52afa4f0faa1012c7ecda5c008daf6b239183eb2fbf1e2
-EBUILD dump1090-9999.ebuild 2486 BLAKE2B be1a047aa5ec00290039f65a8799bf0a8c274c45f4c6f3669293b48643f8abc82d39c48f17e2239b267e4b01b8286781ddd9b9bca34a238fc30b6a11f99e9033 SHA512 0f28dcebdea0c9c02aead1a75244a68de21a700626aad07ae0eba33f50206a1c096159b61c6925a29e7bdd3a4f390695ce8857d2cf7b0bf6c801e840dbd031d4
+EBUILD dump1090-5.0.ebuild 2584 BLAKE2B ee5aa34518399253f157b2cbd3c119248d1816421368e7cbd73c9d9c5872b4fb72f1fcd2ef7aa09bb51e859b72256076db0ddd67ce45ecf389f8a0f5888b6797 SHA512 4ad7981ce1f041f4b91313e3b0bef8bf2c60bc1b2e8d3cd17ee4820330eeb6fe7c4c8f24d41616a87407dd67571dc4eb780a95a56178b72a764d964a38ee8702
+EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild
index 3307e87796d4..9c76ce811944 100644
--- a/net-wireless/dump1090/dump1090-5.0.ebuild
+++ b/net-wireless/dump1090/dump1090-5.0.ebuild
@@ -97,3 +97,7 @@ src_install() {
 		doexe starch-benchmark
 	fi
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index dc9893bd0a78..04ee546dcf91 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -93,3 +93,7 @@ src_install() {
 		doexe starch-benchmark
 	fi
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index dcf8badb1398..54b41bdac4d7 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,4 @@
-DIST gnuradio-3.8.3.1.tar.gz 3394001 BLAKE2B 3d1da3b005e03b01c563c1ce4a323cf14917a59eb4e2d6ff1ec36446c3b5b8786ea521976534003c0c8cb7849ab5ba4647fae4ef5794b138da768ac931dd7119 SHA512 f22311274e93a4c150dff5cb617802fa70f18bc259139be0b41fdaee5d9b95781743f906d6e3833601afe5de2b0476e0daac8f3bc9ea22932a90c875bfe79204
-EBUILD gnuradio-3.8.3.1.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
+DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67
+EBUILD gnuradio-3.8.4.0.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
 EBUILD gnuradio-9999.ebuild 5975 BLAKE2B 76f3be3c1c87c7dee97d43ff546f7b589c3986ba085c62e6a5e43e3d9c88f1927195f7714f90d98f55059e2332d67ef522cd2f7629a402d4cb392a3d7038259c SHA512 1dc35be323b616167438dc4c78d6db9c82736de84ea68b4a9a6e7b4168d2b258ba9e0a15b74b079178c532e62dee5dfae0bc2d826b69cb9a5d2c70fdff675bbc
 MISC metadata.xml 1676 BLAKE2B 9dc4c025e09d54b083b7681f5a06e491375d9621fbb60d0a0b8c218da0e9a3d7cc557aaac86002984bf0b7dbc82848261d3ec0cceeb0cb35ebaed92675cea2a9 SHA512 e52efa5ac1bb1dc576b2802d581741c43622aabfac2133b1e3aefdcec671e2c67631f91c1322d22a4b315e1e12c006cc696dd97aa0f18ebace534cc249251b12
diff --git a/net-wireless/gnuradio/gnuradio-3.8.3.1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
index 9f0a184fbeca..9f0a184fbeca 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.3.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 406e45441613..01c3d5d24662 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,4 @@
-DIST qdmr-0.8.0.tar.gz 3858103 BLAKE2B 1e3e16854ae12b4ae7d1b484c03ee6bea16b06d4b7b8619b084b93216fdafc0b5f9736a32f8b195b73fabc04503a0c3c0f874f4ec2ed81bd2cf564ae6cf4525f SHA512 1964981e77e738215abf3459ccaf46e7b0207f31a8e315b4d36f902e722472b1e37348a87e0cc724294df7a843244b15096b591722490b9955da9a27a8843c79
-EBUILD qdmr-0.8.0.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
-EBUILD qdmr-9999.ebuild 913 BLAKE2B d294e2546f9d6e470f2f170a5b5114caf845bf0ed13c619f83c37988f48961d218c958c0b905a6fb05c330758d48c098923561e6ce39304d8ac7c43cc4e2e4c7 SHA512 60f76dad956ca78f91cf4133e8e574a28071723e87dd3cb16b641a3908b76f40d4c60566ea2bbe43c1b7ed632b8cdcd71b41dcb0b25df3a97e8d53d56a3a32fd
+DIST qdmr-0.8.1.tar.gz 3870631 BLAKE2B 3be78a398a41cb105abac07b2a3c3ddaf0a5e51b5af855860c5ea06a407447d71ae89d4f3be5d46ba8fd50c38baec42663977373c643813f4db193ab034cfb88 SHA512 068eaad49393dca4384146b5254342d57921fd2e3f972057dd0f6abc1f8ce1412ae544ab09f50ce0ffa50f48f7fb2145fc36e82c2c8f9cf534fedb60e947130d
+EBUILD qdmr-0.8.1.ebuild 1260 BLAKE2B ea10e5ff44058bf706f3d97707b6a8435313c03776c817641f2160b9e4161dbeb2a4daeef5484653c15273f2f80faef73d1b7c8ddf947e9685cb4856cbd3a9fd SHA512 af845fa5ef65d9ffd79b77b54ef87e68702cdc01fc4fa5ce55adbf4c136b72752881f6b3cea06dc1ec6709a7c1e49be31ed7f773566b1303b59b2a5815c5bb58
+EBUILD qdmr-9999.ebuild 1260 BLAKE2B ea10e5ff44058bf706f3d97707b6a8435313c03776c817641f2160b9e4161dbeb2a4daeef5484653c15273f2f80faef73d1b7c8ddf947e9685cb4856cbd3a9fd SHA512 af845fa5ef65d9ffd79b77b54ef87e68702cdc01fc4fa5ce55adbf4c136b72752881f6b3cea06dc1ec6709a7c1e49be31ed7f773566b1303b59b2a5815c5bb58
 MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
diff --git a/net-wireless/qdmr/qdmr-0.8.0.ebuild b/net-wireless/qdmr/qdmr-0.8.0.ebuild
deleted file mode 100644
index ae09930cdab3..000000000000
--- a/net-wireless/qdmr/qdmr-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
-HOMEPAGE="https://dm3mat.darc.de/qdmr/"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
-else
-	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtserialport:5
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-BDEPEND=""
-
-src_prepare() {
-	#no devil perms
-	sed -i 's#666#660#' dist/99-qdmr.rules
-	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
-	cmake_src_prepare
-}
diff --git a/net-wireless/qdmr/qdmr-0.8.1.ebuild b/net-wireless/qdmr/qdmr-0.8.1.ebuild
new file mode 100644
index 000000000000..21f42f59eb72
--- /dev/null
+++ b/net-wireless/qdmr/qdmr-0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
+HOMEPAGE="https://dm3mat.darc.de/qdmr/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
+else
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtserialport:5
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+BDEPEND=""
+
+pkg_setup() {
+	CONFIG_CHECK="~USB_ACM"
+	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
+	CONFIG_CHECK="~USB_SERIAL"
+	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	check_extra_config
+}
+
+src_prepare() {
+	#no devil perms
+	sed -i 's#666#660#' dist/99-qdmr.rules
+	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
+	cmake_src_prepare
+}
diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild
index ae09930cdab3..21f42f59eb72 100644
--- a/net-wireless/qdmr/qdmr-9999.ebuild
+++ b/net-wireless/qdmr/qdmr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake udev
+inherit cmake udev linux-info
 
 DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
 HOMEPAGE="https://dm3mat.darc.de/qdmr/"
@@ -33,6 +33,14 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 BDEPEND=""
 
+pkg_setup() {
+	CONFIG_CHECK="~USB_ACM"
+	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
+	CONFIG_CHECK="~USB_SERIAL"
+	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	check_extra_config
+}
+
 src_prepare() {
 	#no devil perms
 	sed -i 's#666#660#' dist/99-qdmr.rules
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 188daedbde8f..c35fa8520ef2 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,12 +1,6 @@
 AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f79ef7c6c1cd7b0a48696510933b0cb8fc04c65ef4b2cd23109bcf266472225a8ee4a2ff430d404 SHA512 48324164cc7adab2e7c7f44b45a3a590ef9bcb161b4f6b22a94b4c4abf989b353a37c7b28ad1d81ffdff96dda84c10ba36bc9948f70a6b1f1c767394dc03ab77
 AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
-DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
-DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
-DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
 DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
-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 1598 BLAKE2B 930fc83da9e99ba5fb703c7f134519ecfa3ac0419c6ea113d6d2c46d4eff296eb9adb48d64a78f639ff32121fd2716663bf3442a3663239384e9ac643dd31789 SHA512 70cc49b03a5365dc07b7cd263197b5000c567e244df013dc5cb184c2b4a0060c8a9a2aaf313fe4725f5fddb5101d8d3b04672872a7026b69b5f31bdd3f5d3856
 EBUILD rtl-sdr-9999.ebuild 1603 BLAKE2B 33a129066b5b6b9c137f49b43912f81a5c477d443cf7fd58f3f6a3181689c421080960a4cd30ada8f77a2682011e9f2af022871d49445fd3b858b85f8f68f3f2 SHA512 17aea001e8fe4a4259161051f7125daefaaa13da4b77c0e10a8696874c390415fda5de68cb7e2f145d5fb0eaf1d91204982736325124021cdb5ec38693bc61d7
 MISC metadata.xml 327 BLAKE2B c850854368e94999292623351c2b09508b49ff74cf8a3cde1872340347a07766ead3427ab6445fde90788e1a0b264a53829114633c515d4b0b30713a65a3739e SHA512 7770f1736d4207f81194646409e8a971c4ee97a9b2285eb67aef37bc7ec1002191e775ee7b489726580f86b5be8d8d8d8f82e84b37fb480c364c29e5e77f683c
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
deleted file mode 100644
index 6bc9e9c36706..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.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
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-else
-	#git clone https://git.osmocom.org/rtl-sdr
-	#cd rtl-sdr
-	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	#the udev rules are 666, we don't want that
-	mycmakeargs=(
-		-DINSTALL_UDEV_RULES=OFF
-		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Only users in the usb group can capture."
-	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
deleted file mode 100644
index f62298abe773..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.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
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-else
-	#git clone https://git.osmocom.org/rtl-sdr
-	#cd rtl-sdr
-	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	#the udev rules are 666, we don't want that
-	mycmakeargs=(
-		-DINSTALL_UDEV_RULES=OFF
-		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Only users in the usb group can capture."
-	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
deleted file mode 100644
index f64f3d037d80..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-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
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
-else
-	SRC_URI="https://github.com/steve-m/librtlsdr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 x86"
-	S="${WORKDIR}"/librtlsdr-${PV}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	#the udev rules are 666, we don't want that
-	mycmakeargs=(
-		-DINSTALL_UDEV_RULES=OFF
-		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
-	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
-}
-
-pkg_postinst() {
-	elog "Only users in the usb group can capture."
-	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 82f25216ed85..c9188ccd0e40 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 4c4b2fa49920..7dc591aeedf7 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
+# Needs a lot of Perl packages to be keyworded.
+dev-vcs/git doc
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-20)
 # Requires zstd, which is currently broken on m68k.
 dev-util/cmake test
@@ -23,34 +27,16 @@ app-text/htmltidy test
 app-doc/doxygen doc
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
-# Avoid having to keyword dev-python/sphinx and friends for now.
-dev-python/more-itertools doc
-dev-python/pexpect doc
-dev-python/cython doc
-dev-python/cffi doc
-dev-python/cssselect doc
-dev-python/execnet doc
-dev-python/flake8 doc
-dev-python/greenlet doc
-dev-python/jinja doc
-dev-python/lxml doc
-dev-python/py doc
-dev-python/pyasn1 doc
-dev-python/pycodestyle doc
-dev-python/pygments doc
-dev-python/pylint doc
-dev-python/pytest-cov doc
-dev-python/smartypants doc
-dev-python/wrapt doc
-
-# James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid lots of unkeyworded dependencies of Python tests.
 dev-python/argcomplete test
 dev-python/distlib test
+dev-python/fonttools test
 dev-python/isort test
 dev-python/nose test
+dev-python/pytest-regressions test
 dev-python/requests test
 dev-python/setuptools test
+dev-python/sphinx test
 dev-python/urllib3 test
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-20)
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 411f503a5869..f3fc5130ffa9 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,20 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
+# Too many unkeyworded dependencies for now.
+efl
+subversion
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-27)
+# The Lua 5.3 tests fail on m68k so it's probably broken. 5.4 works.
+lua_targets_lua5-3
+lua_single_target_lua5-3
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-27)
+# MPI isn't very useful on an architecture that doesn't support SMP.
+mpi
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # I tried Mesa under qemu-system-m68k with VirtIO-GPU. It didn't work.
 opengl
@@ -24,10 +38,6 @@ rust
 # Qt is not keyworded or tested.
 qt5
 
-# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
-# dev-libs/efl has many unkeyworded dependencies.
-efl
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-23)
 # valgrind has no m68k port.
 valgrind
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 562b60830521..3db64c002a9d 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-09-27)
+# depends on mysql
+kde-apps/akonadi mysql
+
 # Marek Szuba <marecki@gentoo.org> (2021-09-23)
 # mkdocs ecosystem only partly keyworded on riscv, has rather messy
 # Python-target requirements.
@@ -24,6 +28,7 @@ sys-cluster/ceph pmdk
 # dev-ruby/asciidoctor isn't keyworded here
 dev-libs/nanomsg doc
 dev-util/ccache doc
+net-misc/chrony html
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-09-15)
 # Marek Szuba <marecki@gentoo.org> (2021-09-07)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 52488bbb2e05..ec229ccf0326 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -259,7 +259,6 @@ sys-devel/gcc ada
 # and the package is confirmed to work with it.
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
-<=dev-python/vcstools-0.1.42 test
 
 # Michał Górny <mgorny@gentoo.org> (2020-03-27)
 # Requires old version of dev-python/docutils.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d5ff47743a6e..b08b6b8e6109 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (2021-09-26)
+# Mask 8.1 as it is RC
+php_targets_php8-1
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
new file mode 100644
index 000000000000..36128fb4712c
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
new file mode 100644
index 000000000000..e38047556647
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
new file mode 100644
index 000000000000..70e347cc4398
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64/systemd
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
new file mode 100644
index 000000000000..36128fb4712c
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
new file mode 100644
index 000000000000..cbac179df32e
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d/systemd
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc
index b63c5d69d88b..76a65f23514a 100644
--- a/profiles/desc/php_targets.desc
+++ b/profiles/desc/php_targets.desc
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags
 
+php8-1 - Build against PHP 8.1
 php8-0 - Build against PHP 8.0
 php7-4 - Build against PHP 7.4
 php7-3 - Build against PHP 7.3
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index a6e6798121fa..39f97a1ad44d 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -8,3 +8,4 @@ postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
 postgres12 - Build against PostgreSQL 12
 postgres13 - Build against PostgreSQL 13
+postgres14 - Build against PostgreSQL 14
diff --git a/profiles/package.mask b/profiles/package.mask
index 3b3a64a98240..4b1aea196f76 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,82 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-10-01)
+# KDE Plasma 5.22.90 (5.23 Beta) mask - Pre-release version
+# See also: https://kde.org/announcements/plasma/5/5.22.90/
+# KDE Plasma Beta Review Day on 2021-10-01: https://tinyurl.com/kdereview
+~kde-plasma/bluedevil-5.22.90
+~kde-plasma/breeze-5.22.90
+~kde-plasma/breeze-grub-5.22.90
+~kde-plasma/breeze-gtk-5.22.90
+~kde-plasma/breeze-plymouth-5.22.90
+~kde-plasma/discover-5.22.90
+~kde-plasma/drkonqi-5.22.90
+~kde-plasma/kactivitymanagerd-5.22.90
+~kde-plasma/kde-cli-tools-5.22.90
+~kde-plasma/kde-gtk-config-5.22.90
+~kde-plasma/kdecoration-5.22.90
+~kde-plasma/kdeplasma-addons-5.22.90
+~kde-plasma/kgamma-5.22.90
+~kde-plasma/khotkeys-5.22.90
+~kde-plasma/kinfocenter-5.22.90
+~kde-plasma/kmenuedit-5.22.90
+~kde-plasma/kscreen-5.22.90
+~kde-plasma/kscreenlocker-5.22.90
+~kde-plasma/ksshaskpass-5.22.90
+~kde-plasma/ksystemstats-5.22.90
+~kde-plasma/kwallet-pam-5.22.90
+~kde-plasma/kwayland-integration-5.22.90
+~kde-plasma/kwayland-server-5.22.90
+~kde-plasma/kwin-5.22.90
+~kde-plasma/kwrited-5.22.90
+~kde-plasma/layer-shell-qt-5.22.90
+~kde-plasma/libkscreen-5.22.90
+~kde-plasma/libksysguard-5.22.90
+~kde-plasma/libkworkspace-5.22.90
+~kde-plasma/milou-5.22.90
+~kde-plasma/oxygen-5.22.90
+~kde-plasma/plasma-browser-integration-5.22.90
+~kde-plasma/plasma-desktop-5.22.90
+~kde-plasma/plasma-disks-5.22.90
+~kde-plasma/plasma-firewall-5.22.90
+~kde-plasma/plasma-integration-5.22.90
+~kde-plasma/plasma-meta-5.22.90
+~kde-plasma/plasma-nm-5.22.90
+~kde-plasma/plasma-pa-5.22.90
+~kde-plasma/plasma-sdk-5.22.90
+~kde-plasma/plasma-systemmonitor-5.22.90
+~kde-plasma/plasma-thunderbolt-5.22.90
+~kde-plasma/plasma-workspace-5.22.90
+~kde-plasma/plasma-workspace-wallpapers-5.22.90
+~kde-plasma/plasma-vault-5.22.90
+~kde-plasma/plymouth-kcm-5.22.90
+~kde-plasma/polkit-kde-agent-5.22.90
+~kde-plasma/powerdevil-5.22.90
+~kde-plasma/sddm-kcm-5.22.90
+~kde-plasma/systemsettings-5.22.90
+~kde-plasma/xdg-desktop-portal-kde-5.22.90
+~kde-plasma/xembed-sni-proxy-5.22.90
+
+# Alfredo Tupone <tupone@gentoo.org> (2021-09-30)
+# Deprecated upstream
+# bug #815466.
+dev-ml/ppx_metaquot
+
+# John Helmert III <ajak@gentoo.org> (2021-09-29)
+# VM image data corruption bug, causing I/O errors in VMs. Bug #815379
+=app-emulation/qemu-6.1.0
+
+# Joonas Niilola <juippis@gentoo.org> (2021-09-26)
+# A library without revdeps, EAPI-5. #776901
+# Removal in ~30 days.
+media-libs/libyami
+
+# Brian Evans <grknight@gentoo.org> (2021-09-26)
+# Mask for 8.1 RC
+dev-lang/php:8.1
+virtual/httpd-php:8.1
+
 # Jakov Smolić <jsmolic@gentoo.org> (2021-09-25)
 # Upstream renamed the Theano project and continued as dev-python/aesara.
 # No reverse dependencies.
@@ -230,13 +306,6 @@ dev-util/trinity
 # Should be safe to unmask if you are using x11-wm/mutter instead.
 >=gui-libs/egl-wayland-1.1.8
 
-# David Seifert <soap@gentoo.org> (2021-08-29)
-# Broken for the past 5 years (#585942), no new upstream release in over
-# 5 years. Same issues as sci-biology/wgs-assembler, use a modern
-# assembler like sci-biology/abyss or canu.
-# Bug #585942, #731880, #808667, removal in 30 days.
-sci-biology/mira
-
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2021-08-30)
 # Homepage dead, uses gtk2, fails to build, https://bugs.gentoo.org/711344
 games-puzzle/gnudoku
@@ -247,10 +316,6 @@ games-puzzle/gnudoku
 # and accept a more unstable release.
 >=www-client/chromium-96
 
-# Anthony G. Basile <blueness@gentoo.org> (2021-08-27)
-# Masked for removal in 30 days.  Deprecated upstream.
-net-vpn/ipsec-tools
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2021-08-26)
 # Preparing for final 5.0.0 release
 >=app-text/tesseract-5.0.0_beta
@@ -504,7 +569,7 @@ virtual/jre:11
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-libs/glibc-2.33
-<sys-devel/binutils-2.35.2
+<sys-devel/binutils-2.36.1-r2
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
 # This package has some dangerous quality and security issues, but
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 362bc02c60cd..1e100b77f5e2 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -203,8 +203,6 @@ riscv		default/linux/riscv/17.0/rv64gc/lp64d					exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64d/systemd				exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64					exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64/systemd				exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32					exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32d				exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d					stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop				dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome			dev
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index cde2ff095b42..faa4e3963bc3 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -4,7 +4,6 @@ move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
 move app-cdr/k3b kde-apps/k3b
 move net-misc/badvpn net-vpn/badvpn
-move net-firewall/ipsec-tools net-vpn/ipsec-tools
 move net-misc/libreswan net-vpn/libreswan
 move net-misc/logmein-hamachi net-vpn/logmein-hamachi
 move net-misc/openconnect net-vpn/openconnect
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b8060249a2f9..5c72d44ca77d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1818,7 +1818,7 @@ dev-lang/ruby:systemtap - Enable SystemTAP/DTrace tracing
 dev-lang/rust:clippy - Install clippy, Rust code linter
 dev-lang/rust:miri - Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly)
 dev-lang/rust:nightly - Enable nightly (UNSTABLE) features
-dev-lang/rust:parallel-compiler - Build a multi-threaded rustc
+dev-lang/rust:parallel-compiler - Build a multi-threaded rustc (experimental, unsupported)
 dev-lang/rust:rls - Install rls, Rust Language Server (used with IDEs supporting RLS protocol)
 dev-lang/rust:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/rust:system-bootstrap - Bootstrap using installed rust compiler
@@ -2724,7 +2724,6 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
-dev-util/android-studio:custom-jdk - Install and use Android Studio's custom JRE.
 dev-util/anjuta:devhelp - Enable devhelp integration
 dev-util/anjuta:glade - Build glade plugin for anjuta
 dev-util/anjuta:terminal - Enable terminal plugin based on x11-libs/vte
@@ -3692,11 +3691,14 @@ mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
 mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/neomutt:kyotocabinet - Enable Kyoto Cabinet database backend for header caching
 mail-client/neomutt:lmdb - Enable LMDB (Lightning Memory-Mapped Database) backend for header caching
+mail-client/neomutt:lz4 - Add lz4 support for header cache compression
 mail-client/neomutt:notmuch - Enable support for net-mail/notmuch
 mail-client/neomutt:pgp-classic - Build classic-pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backend for header caching
 mail-client/neomutt:smime-classic - Build classic-smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
+mail-client/neomutt:zlib - Add zlib support for header cache compression
+mail-client/neomutt:zstd - Add zstd support for header cache compression
 mail-client/roundcube:change-password - Allow users to change passwords through Roundcube
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
 mail-client/roundcube:fileinfo - Use the dev-lang/php fileinfo extension to guess the mime_type of attachments
@@ -3871,6 +3873,8 @@ media-fonts/terminus-font:ru-i - Changes view of Russian letter 'i' - not like L
 media-fonts/terminus-font:ru-k - Changes view of Russian letter 'k' (see homepage)
 media-fonts/unifont:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/unifont:utils - Install unifont utilities
+media-fonts/vollkorn:otf - Install the OpenType version of the font
+media-fonts/vollkorn:ttf - Install the TrueType version of the font
 media-gfx/ahoviewer:plugins - Build plugin support for now, in future pull additional plugins
 media-gfx/ahoviewer:rar - Rar archive support
 media-gfx/ahoviewer:zip - Zip archive support
@@ -6861,11 +6865,6 @@ net-vpn/badvpn:tun2socks - Build tun2socks, a program which implements a TUN dev
 net-vpn/badvpn:udpgw - Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.
 net-vpn/i2p:nls - Adds Native Language Support using GNU gettext.
 net-vpn/i2pd:i2p-hardening - Compile with hardening on vanilla compilers/linkers
-net-vpn/ipsec-tools:hybrid - Makes available both mode-cfg and xauth support
-net-vpn/ipsec-tools:idea - Enable support for the IDEA algorithm
-net-vpn/ipsec-tools:nat - Enable NAT-Traversal
-net-vpn/ipsec-tools:rc5 - Enable support for the patented RC5 algorithm
-net-vpn/ipsec-tools:stats - Enable statistics reporting
 net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
 net-vpn/ocserv:otp - Enable support for one-time passwords
 net-vpn/openconnect:gssapi - Build GSSAPI support
@@ -8504,6 +8503,7 @@ www-apps/nikola:webmedia - Use dev-python/micawber to extract metadata from web
 www-apps/postfixadmin:vacation - Install vacation.pl script and dependencies
 www-apps/radicale:bcrypt - Enable bcrypt
 www-apps/redmine:markdown - Enable support for Markdown
+www-apps/redmine:minimagick - Enable image processing support via dev-ruby/mini_magick
 www-apps/redmine:passenger - Enable support for www-apache/passenger
 www-apps/roundup:jinja - Enable Jinja2 support
 www-apps/roundup:markdown - Enable markdown rendering
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 9bfe1bec9d38..bd449a468a49 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index ccb9725e7912..d793b8961287 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,20 +1,18 @@
 AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294
-AUX stellarium-0.20.3-unbundle-qtcompress.patch 8123 BLAKE2B 314a2f4c191b7d6c0083679878c38bf6f632a1be6d19d68d82a0eda520c9a96e3f4f87d7437b6cf53c0812fc917ec82865796a8088da7afc2d6424d442a20a94 SHA512 fd6121345a5609b8a70a06753b6495b258eae7a1f978d8eeac8e7aa6b73777d9a982bc016d891bbcad48ead1b5c624bb0b07dbac8b40bd1a16baaf347b72b97d
 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 AUX stellarium-0.21.0-unbundle-qtcompress.patch 8133 BLAKE2B 83b66dfb3938c775092b48c4bcb65feab6b6c76ef98016dd84e680bb6ce99abaade3af2e8be7e179fa9c53235cc767b5f1a075d75133232aaacfe2c8aad51de3 SHA512 262c5efd0e2ab5545ba1d99850d1edeafb2b0cbe7a15125b648991d49e2a0d4dfb7bac488a7e2709e6ecaab285c2c74f36a50cca65fbcda7c9f8905e4f3902da
+AUX stellarium-0.21.2-unbundle-qtcompress.patch 7484 BLAKE2B f3cf62bf45247c2b4a09a55dcfbc3424869ce4c294da0a4ebc4daa3a19baa7ba377ff9ff4e271d2aab098f20ecde5018793901cacc54be9849bccad510831ca1 SHA512 81934b0b9ba8b2d1d8fa75eacdf146e374bbc29b862fe5585a4846d14c17174ef0c936d22c1a80eb61d3041d79d0f981d01bdb215e4530833b9d00e2613d0dae
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
-DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
 DIST stellarium-0.21.1.tar.gz 362055145 BLAKE2B a7ea6327d415331848a53879e76ea973fbb51709a0bd561cd4e415b215e5c8494290e2e663bda9f463f565a771465e0e0133f46517a5798d607f076e2635764d SHA512 6dd935808c711da32c793a0cedad464a15bf35ede60cff385e96f1d5868e751ed2e09b61551f7a6fe599b702a6f4d0a62d4494a40b68e77685ba57b6a63b5031
+DIST stellarium-0.21.2.tar.gz 387061883 BLAKE2B 74878961efb01088c5c7c3031d989cccce5db2e072890d01a37a8b40d30838d7ee06f440abcd8279f14677f12c42f29d129499cf2e73c0bd2e771f201007d123 SHA512 91f4e263bcda25ba356decc99f46a3e278be24bcab25519522deac0ed540205ab8320365bb40a56b7f231635bf5b026b4f87f00eeb68a26eab2b7e37d38567bf
 DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
-DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
-DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
+DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
 DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
-EBUILD stellarium-0.20.4.ebuild 3980 BLAKE2B 0e1c9517aaf37c258e8343adee97b5932c06b0d5210eca3151c8f8431002c9c4dad1e62885d51fb7d0828a7099c7a6fa20ba516c90b7e452bc679eec03ee7393 SHA512 a1b0ada116ed34164ee771c68d7b84a5f1fbb16294dd31963d84ab927cf112ba92fd48aeea070ec2ec73922acc236cbd44e72f6f709eb0aabaa8033291dbd6bf
-EBUILD stellarium-0.21.0.ebuild 4045 BLAKE2B e0940012d4da752e2ccbec0ad5f08f6ca609a25cc5ad085f9668e799838f3af7b7780d70bfc48b78601d1e6f5f6fb060fe85f7fb6319ef84c86a93fc97f1a897 SHA512 703127041fd91ebba34f53b9f6b5aa78cd28ff55551b2f1a868d66b9d6f4b4b2d19a48837b12e99bb76e151571f98854ec947013f0f592c79bd3c34d0126e242
+DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
 EBUILD stellarium-0.21.1.ebuild 4041 BLAKE2B aec4e079a895882d66ca5e3c7c81cd2abbb972692a205f3f529c594229daf56c0b77921497fbf33019efdc50a75f44ea31e8ea30dd5d557f20c3de0850896e66 SHA512 e17e1c3c11de681a243c40589fff17c11a7b86b071c1f8772bcacb464432e22cca3a9cdb36a38d71c706b5c32187d86e7ca4e35ec5a3f91f453c3bb02768665d
+EBUILD stellarium-0.21.2.ebuild 4063 BLAKE2B 13b38a8f7c5c8f9fbc1960655f7949378ca85b42842f5cf989fd0def03b6b27038833f4ad9d82194d184bf4c5a493575d4b21ce69717b35f81ff4f3ec6f03011 SHA512 12e76c5da96d73aa441f464d3620b5a7f285b01f5a70269d1db6603637dea2c4cd094636424a5c9c68272f9d16c0196f880f80bdef0d28fc1252bdb696816a3f
 MISC metadata.xml 1197 BLAKE2B e58627df43d61288709e9a6bc4f77c91c14c672b8a3b87c43230f4b84f206675c907ddf54bf581c5f482943ba81ef5d9bbc89d85587725cb3c085565c53f5cac SHA512 fdce909883c678f3e6ebdb1e211135eddf8993eba88c46646005b223d74a126a5c98c61cd053f099d3f8ce0530e42ae02df24e5ebbd207b86cbca8556315f0a7
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
deleted file mode 100644
index 64b19a54c88a..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b72c2c8f6..9436bc66da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -629,5 +629,6 @@ ELSE()
- ENDIF()
- 
-+find_package(Qt5Compress REQUIRED)
- 
- ########### Set some global variables ###########
- IF(UNIX AND NOT WIN32)
-diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
-index 8e3138adf2..b59049767d 100644
---- a/plugins/Satellites/src/CMakeLists.txt
-+++ b/plugins/Satellites/src/CMakeLists.txt
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
- ENDIF(ENABLE_TESTING)
- 
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
- IF(MSVC)
-diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
-index 7432f4316d..f4f4453661 100644
---- a/plugins/Satellites/src/Satellites.cpp
-+++ b/plugins/Satellites/src/Satellites.cpp
-@@ -43,7 +43,7 @@
- #include "StelUtils.hpp"
- #include "StelActionMgr.hpp"
- 
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- 
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
- 					QString archive = zip.fileName();
- 					QByteArray data;
- 
--					Stel::QZipReader reader(archive);
--					if (reader.status() != Stel::QZipReader::NoError)
-+					QZipReader reader(archive);
-+					if (reader.status() != QZipReader::NoError)
- 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
- 					else
- 					{
--						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 						for (const auto& info : infoList)
- 						{
- 							// qWarning() << "[Satellites] Processing:" << info.filePath;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bdd214729f..81631ce8ec 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
-      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- ENDIF()
- 
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
- IF(ENABLE_LIBGPS)
-      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
- ENDIF()
-diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
-index 8da2070b26..9949252cee 100644
---- a/src/core/modules/LandscapeMgr.cpp
-+++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 	}
- 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
- 
--	Stel::QZipReader reader(sourceFilePath);
--	if (reader.status() != Stel::QZipReader::NoError)
-+	QZipReader reader(sourceFilePath);
-+	if (reader.status() != QZipReader::NoError)
- 	{
- 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
- 		emit errorNotArchive();
-@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 
- 	//Detect top directory
- 	QString topDir, iniPath;
--	QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+	QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 	for (const auto& info : infoList)
- 	{
- 		QFileInfo fileInfo(info.filePath);
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 1e0e7e2b32..834aff89cb 100644
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

- 

-+if(0)

- set(qtcompress_SRCS

-     qtcompress/qzip.cpp

-     qtcompress/qzipreader.h

-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
- #turn off automoc, not needed here

- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

-+endif()

- 

- set(qcustomplot_SRCS

-     qcustomplot/qcustomplot.cpp

-@@ -176,7 +176,7 @@
-     qxlsx/xlsxcelllocation.h

-     )

- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)

-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)

- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

- 

- ################################# INDI ################################

-diff -r 11536448457a xlsxzipreader.cpp
---- a/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -28,13 +28,13 @@
- namespace QXlsx {
- 
- ZipReader::ZipReader(const QString &filePath) :
--    m_reader(new Stel::QZipReader(filePath))
-+    m_reader(new QZipReader(filePath))
- {
-     init();
- }
- 
- ZipReader::ZipReader(QIODevice *device) :
--    m_reader(new Stel::QZipReader(device))
-+    m_reader(new QZipReader(device))
- {
-     init();
- }
-@@ -45,8 +45,8 @@
- 
- void ZipReader::init()
- {
--	QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
--	foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
-+	QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+	foreach (const QZipReader::FileInfo &fi, allFiles)
- 	{
- 		if (fi.isFile)
- 			m_filePaths.append(fi.filePath);
-diff -r 2019bb0d2919 xlsxzipreader_p.h
---- a/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -38,7 +38,7 @@
- //
- 
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- #include <QScopedPointer>
- #include <QStringList>
- #include <QVector>
-@@ -60,7 +60,7 @@
- private:
-     Q_DISABLE_COPY(ZipReader)
-     void init();
--    QScopedPointer<Stel::QZipReader> m_reader;
-+    QScopedPointer<QZipReader> m_reader;
-     QStringList m_filePaths;
- };
- 
-diff -r 11536448457a xlsxzipwriter.cpp
---- a/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -29,14 +29,14 @@
- 
- ZipWriter::ZipWriter(const QString &filePath)
- {
--    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::ZipWriter(QIODevice *device)
- {
--    m_writer = new Stel::QZipWriter(device);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(device);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::~ZipWriter()
-@@ -46,7 +46,7 @@
- 
- bool ZipWriter::error() const
- {
--    return m_writer->status() != Stel::QZipWriter::NoError;
-+    return m_writer->status() != QZipWriter::NoError;
- }
- 
- void ZipWriter::addFile(const QString &filePath, QIODevice *device)
-diff -r 2019bb0d2919 xlsxzipwriter_p.h
---- a/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -37,7 +37,7 @@
- //
- 
- #include <QString>
--#include "external/qtcompress/qzipwriter.h"
-+#include "qzipwriter.h"
- 
- class QIODevice;
- class QZipWriter;
-@@ -57,7 +57,7 @@
-     void close();
- 
- private:
--    Stel::QZipWriter *m_writer;
-+    QZipWriter *m_writer;
- };
- 
- } // namespace QXlsx
diff --git a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..f5d757b1bb16
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
@@ -0,0 +1,207 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
+      MESSAGE(STATUS "GPS: disabled.")
+ ENDIF(ENABLE_GPS)
+ 
++find_package(Qt5Compress REQUIRED)
+ 
+ IF(USE_QTOPENGL)
+      # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+ 
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+ 
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ 
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ 					QString archive = zip.fileName();
+ 					QByteArray data;
+ 
+-					Stel::QZipReader reader(archive);
+-					if (reader.status() != Stel::QZipReader::NoError)
++					QZipReader reader(archive);
++					if (reader.status() != QZipReader::NoError)
+ 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ 					else
+ 					{
+-						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 						for (const auto& info : qAsConst(infoList))
+ 						{
+ 							// qWarning() << "[Satellites] Processing:" << info.filePath;
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+ 
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 	}
+ 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+ 
+-	Stel::QZipReader reader(sourceFilePath);
+-	if (reader.status() != Stel::QZipReader::NoError)
++	QZipReader reader(sourceFilePath);
++	if (reader.status() != QZipReader::NoError)
+ 	{
+ 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ 		emit errorNotArchive();
+@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ 
+ 	//Detect top directory
+ 	QString topDir, iniPath;
+-	QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++	QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ 	for (const auto& info : infoList)
+ 	{
+ 		QFileInfo fileInfo(info.filePath);
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

+ 

++if(0)

+ set(qtcompress_SRCS

+     qtcompress/qzip.cpp

+     qtcompress/qzipreader.h

+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here

+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)

+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

++endif()

+ 

+ # QCustomPlot should not be unbundled, because upstream uses GPL 3, and

+ # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.

+@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
+     qxlsx/xlsxcelllocation.h

+     )

+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)

++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)

+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

+ 

+ ################################# INDI ################################

+--- a/src/external/qxlsx/xlsxzipreader.cpp
++++ b/src/external/qxlsx/xlsxzipreader.cpp
+@@ -5,13 +5,13 @@
+ QT_BEGIN_NAMESPACE_XLSX
+ 
+ ZipReader::ZipReader(const QString &filePath) :
+-    m_reader(new Stel::QZipReader(filePath))
++    m_reader(new QZipReader(filePath))
+ {
+     init();
+ }
+ 
+ ZipReader::ZipReader(QIODevice *device) :
+-    m_reader(new Stel::QZipReader(device))
++    m_reader(new QZipReader(device))
+ {
+     init();
+ }
+@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
+ 
+ void ZipReader::init()
+ {
+-    QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+-    for (const Stel::QZipReader::FileInfo &fi : allFiles) {
++    QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++    for (const QZipReader::FileInfo &fi : allFiles) {
+         if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
+             m_filePaths.append(fi.filePath);
+     }
+--- a/src/external/qxlsx/xlsxzipreader_p.h
++++ b/src/external/qxlsx/xlsxzipreader_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+ 
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ 
+ #if QT_VERSION >= 0x050600
+  #include <QVector>
+@@ -31,7 +31,7 @@ public:
+ private:
+     Q_DISABLE_COPY(ZipReader)
+     void init();
+-    QScopedPointer<Stel::QZipReader> m_reader;
++    QScopedPointer<QZipReader> m_reader;
+     QStringList m_filePaths;
+ };
+ 
+--- a/src/external/qxlsx/xlsxzipwriter.cpp
++++ b/src/external/qxlsx/xlsxzipwriter.cpp
+@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
+ 
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+-    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+-    m_writer = new Stel::QZipWriter(device);
+-    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++    m_writer = new QZipWriter(device);
++    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+ 
+ ZipWriter::~ZipWriter()
+@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
+ 
+ bool ZipWriter::error() const
+ {
+-    return m_writer->status() != Stel::QZipWriter::NoError;
++    return m_writer->status() != QZipWriter::NoError;
+ }
+ 
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+--- a/src/external/qxlsx/xlsxzipwriter_p.h
++++ b/src/external/qxlsx/xlsxzipwriter_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+ 
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+ 
+ class QZipWriter;
+ 
+@@ -27,7 +27,7 @@ public:
+     void close();
+ 
+ private:
+-    Stel::QZipWriter *m_writer;
++    QZipWriter *m_writer;
+ };
+ 
+ QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
deleted file mode 100644
index 25de0105315a..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.12"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
-	deep-sky? (
-		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
-	)
-	doc? (
-		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
-	)
-	stars? (
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen[dot] )
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-libs/qtcompress:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? ( dev-qt/qtpositioning:5 )
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? ( sci-libs/indilib:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-qtcompress.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-
-	# Several libraries are bundled, remove them.
-	rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
-	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
-	# while we have qcustomplot 2 in tree which changed API a bit
-	# Also the license of the external qcustomplot is incompatible with stellarium
-
-	# for glues_stel aka libtess I couldn't find an upstream with the same API
-
-	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
-
-	local remaining="$(cd src/external/ && echo */)"
-	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
-		eqawarn "Need to unbundle more deps: ${remaining}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build apidoc
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
-		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
-	fi
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	if use deep-sky ; then
-		insinto /usr/share/${PN}/nebulae/default
-		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
deleted file mode 100644
index 9f6e471d3edb..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.12"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
-	deep-sky? (
-		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
-	)
-	doc? (
-		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
-	)
-	stars? (
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen[dot] )
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-libs/qtcompress:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? (
-		dev-qt/qtpositioning:5
-		dev-qt/qtserialport:5
-		sci-geosciences/gpsd:=[cxx]
-	)
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? (
-		dev-qt/qtserialport:5
-		sci-libs/indilib:=
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.21.0-unbundle-qtcompress.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-
-	# Several libraries are bundled, remove them.
-	rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
-	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
-	# while we have qcustomplot 2 in tree which changed API a bit
-	# Also the license of the external qcustomplot is incompatible with stellarium
-
-	# for glues_stel aka libtess I couldn't find an upstream with the same API
-
-	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
-
-	local remaining="$(cd src/external/ && echo */)"
-	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
-		eqawarn "Need to unbundle more deps: ${remaining}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build apidoc
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
-		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
-	fi
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	if use deep-sky ; then
-		insinto /usr/share/${PN}/nebulae/default
-		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.21.2.ebuild b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
new file mode 100644
index 000000000000..6a6c12433040
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.13"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+	)
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen[dot] )
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-libs/qtcompress:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-fonts/dejavu
+	sys-libs/zlib
+	virtual/opengl
+	gps? (
+		dev-qt/qtpositioning:5
+		dev-qt/qtserialport:5
+		sci-geosciences/gpsd:=[cxx]
+	)
+	media? ( dev-qt/qtmultimedia:5[widgets] )
+	telescope? (
+		dev-qt/qtserialport:5
+		sci-libs/indilib:=
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
+	"${FILESDIR}/stellarium-0.21.2-unbundle-qtcompress.patch"
+	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	# Several libraries are bundled, remove them.
+	rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
+	# while we have qcustomplot 2 in tree which changed API a bit
+	# Also the license of the external qcustomplot is incompatible with stellarium
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build apidoc
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+	fi
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 3430aa8cb6fd..72463ed5f3f1 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/mira/Manifest b/sci-biology/mira/Manifest
deleted file mode 100644
index 4f41daaa1741..000000000000
--- a/sci-biology/mira/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX mira-4.0.2-boost-1.50.patch 1444 BLAKE2B b85b61c1f84d907cba498d14b1ac01faf4e8918614ef673b937b4501611a4ba513d4c0db1d57f313eee98d98d64366c86eb78957d3c493efdd2c3b2cbd8f278b SHA512 647efc785a76369524e264b611773d9f5101c13981c98a8bfa03d2633c74ff9e16253b48a506624cf75d1b11852ae8573d6446f584a951b8c5cdec1cd23552f5
-AUX mira-4.0.2-cmath.patch 295 BLAKE2B 30892b3a519682db7e04b1a0169c4018d7f4dd4e3da631b2e84cd97f47183ee4ee31f6f68323be7893694afb2a7238c651db36fb51f143451b964de019b14e68 SHA512 7c45bf5dd987c06c76bbacc1bd6f1137f1c6ea23eecf01643ee335216341714a0607b4468d9241c4084bed6d32e453c8bb1cb48997164769aa33223fb59edd88
-AUX mira-4.0.2-cout.patch 735 BLAKE2B d386a704829b7f3264ee69d55d7451a5479a9d121e49cbd8d9322c9a27a065073076608569d169982784fcc6cc4ae4423712d15d1c4d642a6b8fd0dd7d5fe3a3 SHA512 9d1aa493d20481d0a7e3eaefba36dc29d7903f70c9a445b6e0ea478d04124e8a81de37c437f0fb28c0a395562db7e78217cf09e500fd4a1f2a1f929c1d4d2a5a
-DIST mira-4.0.2.tar.bz2 10368046 BLAKE2B cc84c6c13c8024409634ccafd103be8a4f2a9e27fa7f19d2ef401393db9e8063a6fac2f21cd25dfe58e90aee8cf38983369d928241f9bc65e78da0e95fa41d3b SHA512 a7f9845de207cefb87ffa652f4f6b9b85735ef22eeb29b456e4d946ba1675e7dd2c78abb2da56f11fddcb699f5c0700a08ce298196ce1a8e586a758a8d3bdc7e
-DIST mira_3rdparty_06-07-2012.tar.bz2 31656 BLAKE2B 7e952d96e9073acd8ab1d1fc7c51c37f6526287d31698c5090500d421147285b535e8cab7e49f4e51a5634c901d1cd969206b1727e683d3fcebdc195399e3589 SHA512 4d4dbdf7ab5126f9d47160bee8bc127b6a225de8087f6b9914c754324a74d966333207c86a3f38cf0ea9f91408707e2a24086dbe1318fdfa2870b0c39bc5033b
-EBUILD mira-4.0.2-r1.ebuild 2563 BLAKE2B 7cfb5eb182024af1ef2dc73de85909bdfe57cb95bb1af557c64e2f9ee002eb3363360b27283d8cc31105bd97d4b4fca2d70830bcd02c983402773793c0696409 SHA512 a4783d30af6224c0931370e05d932ea0a98a08487b3036d75b43a303063b575772a385b1ea54758a80987cfcff39512bd506b383178413fb8dfe542b87adbfca
-MISC metadata.xml 356 BLAKE2B 9a95855c50b94970679770e6359d9fca38b0a239c63eca3483dd36490beef6906b416e684e0da4c7cfb56feebf58273636d4d0eecfd3426ff96eeec655075458 SHA512 1ea0315c25907e0db27cda049b798e749a1543005467a0f4ae23d0d7d51d41312f520d4847e5d8758c839b3074e56cc18b4d1819bac2448cfdddce223fea9dba
diff --git a/sci-biology/mira/files/mira-4.0.2-boost-1.50.patch b/sci-biology/mira/files/mira-4.0.2-boost-1.50.patch
deleted file mode 100644
index 50f83c9021dc..000000000000
--- a/sci-biology/mira/files/mira-4.0.2-boost-1.50.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-ax_boost_regex.m4 |    4 ++--
-1 file changed, 2 insertions(+), 2 deletions(-)
-
---- mira-4.0.2/m4/ax_boost_regex.m4
-+++ mira-4.0.2/m4/ax_boost_regex.m4
-@@ -78,14 +78,14 @@
-                 for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
- 				done
-                 if test "x$link_regex" != "xyes"; then
-                 for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
- 				done
-                 fi
diff --git a/sci-biology/mira/files/mira-4.0.2-cmath.patch b/sci-biology/mira/files/mira-4.0.2-cmath.patch
deleted file mode 100644
index a4a020177af7..000000000000
--- a/sci-biology/mira/files/mira-4.0.2-cmath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mira-4.0.2/src/mira/ads.C
-+++ mira-4.0.2/src/mira/ads.C
-@@ -31,10 +31,11 @@
-  * Routines for computing scores and some other classification number are
-  *  provided, too.
-  *
-  */
- 
-+#include <cmath>
- 
- #include "ads.H"
- 
- #include "errorhandling/errorhandling.H"
- #include "util/dptools.H"
diff --git a/sci-biology/mira/files/mira-4.0.2-cout.patch b/sci-biology/mira/files/mira-4.0.2-cout.patch
deleted file mode 100644
index 78e7168cb49d..000000000000
--- a/sci-biology/mira/files/mira-4.0.2-cout.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- src/progs/quirks.C | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/progs/quirks.C b/src/progs/quirks.C
-index 47e5ee8..060b6f3 100644
---- a/src/progs/quirks.C
-+++ b/src/progs/quirks.C
-@@ -25,6 +25,8 @@
- 
- #include <boost/filesystem.hpp>
- 
-+#include <iostream>
-+
- // make the "tcmalloc: large alloc" messages from TCMallom disappear
- // by setting the reporting environment variable to a very large value
- // see: http://groups.google.com/group/google-perftools/browse_thread/thread/24a003fc35f3d470?pli=1
---- a/src/mira/parameters.C
-+++ b/src/mira/parameters.C
-@@ -2222,7 +2222,7 @@
-     MIRANOTIFY(Notify::FATAL, "File not found: " << pfile);
-   }
- 
--  parse(fin, Pv, nullptr);
-+  parse(fin, Pv, false);
- 
-   fin.close();
- 
diff --git a/sci-biology/mira/metadata.xml b/sci-biology/mira/metadata.xml
deleted file mode 100644
index 5ef527dc14ca..000000000000
--- a/sci-biology/mira/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">mira-assembler</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-biology/mira/mira-4.0.2-r1.ebuild b/sci-biology/mira/mira-4.0.2-r1.ebuild
deleted file mode 100644
index cbd1309c474f..000000000000
--- a/sci-biology/mira/mira-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MIRA_3RDPARTY_PV="06-07-2012"
-MY_PV="${PV/_}" # convert from mira-4.0_rc2 (Gentoo ebuild filename derived) to mira-4.0rc2 (upstream fromat)
-
-inherit autotools multilib
-
-DESCRIPTION="Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Illumina"
-HOMEPAGE="http://www.chevreux.org/projects_mira.html"
-SRC_URI="
-	https://sourceforge.net/projects/mira-assembler/files/MIRA/stable/"${PN}"-"${MY_PV}".tar.bz2
-	mirror://sourceforge/mira-assembler/mira_3rdparty_${MIRA_3RDPARTY_PV}.tar.bz2"
-#	https://sourceforge.net/projects/mira-assembler/files/MIRA/development/${P}.tar.bz2
-#	mirror://sourceforge/mira-assembler/mira_3rdparty_${MIRA_3RDPARTY_PV}.tar.bz2"
-
-S="${WORKDIR}"/"${PN}"-"${MY_PV}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-CDEPEND="
-	dev-libs/boost:=[threads(+)]
-	dev-util/google-perftools"
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	app-editors/vim-core
-	dev-libs/expat"
-RDEPEND="${CDEPEND}"
-
-#DOCS=( AUTHORS GETTING_STARTED NEWS README HELP_WANTED
-#	THANKS doc/3rdparty/scaffolding_MIRA_BAMBUS.pdf )
-DOCS=( AUTHORS GETTING_STARTED NEWS README HELP_WANTED THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-boost-1.50.patch"
-	"${FILESDIR}/${PN}-4.0.2-cout.patch"
-	"${FILESDIR}/${PN}-4.0.2-cmath.patch"
-)
-
-src_prepare() {
-	find -name 'configure*' -or -name 'Makefile*' | xargs sed -i 's/flex++/flex -+/' || die
-
-	default
-
-	sed \
-		-e "s:-O[23]::g" \
-		-e "s:-funroll-loops::g" \
-		-i configure.ac || die
-
-	eautoreconf
-
-	# Remove C++ source files that upstream built with flex.
-	local f
-	local PREBUILT_CXX_LEXER_FILES=(
-		"${S}"/src/caf/caf_flexer.cc
-		"${S}"/src/io/exp_flexer.cc
-		"${S}"/src/mira/parameters_flexer.cc
-	)
-
-	for f in "${PREBUILT_CXX_LEXER_FILES[@]}"; do
-		if [[ -f ${f} ]] ; then
-			rm "${f}" || die "Failed to remove ${f}"
-		else
-			die "${f} not found"
-		fi
-	done
-}
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}/usr/$(get_libdir)" \
-		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-boost-thread=boost_thread-mt
-}
-
-#src_compile() {
-#	base_src_compile
-#	# TODO: resolve docbook incompatibility for building docs
-#	use doc && emake -C doc clean docs
-#}
-
-src_install() {
-	default
-
-	dobin "${WORKDIR}"/3rdparty/{sff_extract,qual2ball,*.pl}
-	dodoc "${WORKDIR}"/3rdparty/{README.txt,midi_screen.fasta}
-}
-
-pkg_postinst() {
-	einfo "Documentation is no longer built, you can find it at:"
-	einfo "http://mira-assembler.sourceforge.net/docs/DefinitiveGuideToMIRA.html"
-}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index b83157699fde..e2b6ff823c0e 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 5b64661b2ca6..c8430eed23c7 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,9 +1,3 @@
-DIST qalculate-gtk-3.17.0.tar.gz 2414740 BLAKE2B e24cd509566ab2daa106b5d233f8d851409b933e82b4057cd2c9b3c6b3526a30f878f2512243711e77718dd12cd4208a5c60bbded7eae50a8841a49c75814bb7 SHA512 ea4413d1574f9875810d82c80590de46c3c424b6466508faab30c6b2505ddd306fb206f316ec99e28a7e5311f2842e011206b9caca4aed36245d1f16f25f5de5
-DIST qalculate-gtk-3.18.0.tar.gz 2418606 BLAKE2B 19c37474cacacd9e4c3ebdc58441a9c032cb86382e5545760018731b197765cae19d2f5687aeeb3ab09b2c137ec3f383f442a0b7910109fb0b664019837bb905 SHA512 d90c7188b28853489363663199be500e83dc908af6956d31d7f50c0797db262282475b7cc56bf177ebbacc3a0aaec5499c10c7270bd44a848589f16ea190b03e
-DIST qalculate-gtk-3.19.0.tar.gz 2508273 BLAKE2B db2f479c9fbbc11ece391e324858aad4404bdca03e14f69e7e2ed8966850fa5f699dd82d9ef613054d5113f5137b983e6520c2dc1c8e5a83ce253ea140d7c522 SHA512 3587ca55673bf71476423be6ec99fd8245c19c725866103862cd622e39e136cfaa94cd86744ede7a700a6e7886b7e8b84d646b25a1a22c73242a0ba9719149d6
 DIST qalculate-gtk-3.20.1.tar.gz 2547876 BLAKE2B d357ba4c03f39d504c2dda0e3d48b443ca05f5dd092bfef35f688947bf5c73eabef4756c7f53280cfd382e78c283f90a99dfa5d9727c5a9addce1c65c0ec9fb4 SHA512 5cdb5154a329514ed9d9c2081d15bfad4f12e2fc837ee3c32313a88492b06cb1139e1774ab3b3c3d4018a6a1d875022fafbf6ca904f8e8f56b60eda2450ef1e5
-EBUILD qalculate-gtk-3.17.0.ebuild 841 BLAKE2B 0240be3d37f43cf047c74d89c35c72394f6b564f490ca095a80b047d849e718ecb3025704804467fb3199d97591a004bac7dc34915a553987e9f7f4bc07a032d SHA512 748ea72a4e2b62d288131b20ff231cc57a88ed33fc623f68807973f617f670e8532f27582bf148fddc059aff92c06ea4560edddb8120b8ceb12d3fd78999f54e
-EBUILD qalculate-gtk-3.18.0.ebuild 865 BLAKE2B 42649f8a09ec79bee7127a50e4dcf11a8a3496ebd537143343140c8434dba4258b62bead1256ab71ab24ef471106fb5d0fae5004227feaeae2bf36d2ed775c5e SHA512 9a6abe04019dc6cc4abb82a44d273d775ddc523348884520adfebedccc3efdee320369ca55d872259f8deb05b45e4b1c210250b290b1bec60b508463d6e8e27d
-EBUILD qalculate-gtk-3.19.0.ebuild 865 BLAKE2B 42649f8a09ec79bee7127a50e4dcf11a8a3496ebd537143343140c8434dba4258b62bead1256ab71ab24ef471106fb5d0fae5004227feaeae2bf36d2ed775c5e SHA512 9a6abe04019dc6cc4abb82a44d273d775ddc523348884520adfebedccc3efdee320369ca55d872259f8deb05b45e4b1c210250b290b1bec60b508463d6e8e27d
 EBUILD qalculate-gtk-3.20.1.ebuild 863 BLAKE2B 7925a2a7624c3919de3544a2f05b49424c191302f4b5054809938ebc2a3a58a68359509dedf57c422c74b7e91f6f73e3e742d9aa0092478c693571a7c2d2c247 SHA512 6b43b1973d2a47a4c893e6281e397b71d2669d3fbac98ecb78410b2468110f18535f9411193a72248556163c760af985d78344cf9a689c2a91b7e44a439c7047
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.17.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.17.0.ebuild
deleted file mode 100644
index 2d0b31d9af04..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sci-libs/libqalculate-3.17.0:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rarian
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/calendarconversion.ui
-		data/periodictable.ui
-	EOF
-
-	gnome2_src_prepare
-}
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild
deleted file mode 100644
index 095917fa8e5a..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.18.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 gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sci-libs/libqalculate-3.18.0:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rarian
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/calendarconversion.ui
-		data/periodictable.ui
-	EOF
-
-	gnome2_src_prepare
-}
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
deleted file mode 100644
index 095917fa8e5a..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.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 gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sci-libs/libqalculate-3.18.0:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/rarian
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/calendarconversion.ui
-		data/periodictable.ui
-	EOF
-
-	gnome2_src_prepare
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index efa4ea389a2a..5a44c21e64d0 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 4b31f32b5258..e4c35fa87574 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,3 +1,5 @@
 DIST chemex-2018.10.3.tar.gz 546696 BLAKE2B d283cfb94118686f1974780249641e0ea6f86cdb854c4a256897e361a300a94506813a5035ee2f300fca13263e8452b77e7a0817436cbd620ba16d801a541af7 SHA512 784bd03b354724d6aa52d663c6f661f865d4ef7ca345573bc8aae9ef63e5dbb3e65abba364de3ff441b78adfa588344c718809c5880b3fc70d8ed24be06a0826
+DIST chemex-2021.4.0_p2.tar.gz 2384471 BLAKE2B 1eb609c4e4ad9ac0f7cac8ab523e72e8ab9c12d40671fd598cd26b8de2a3d6e68dfdcaee9202521fc583068f591377842b3e7b9f0e1f95e6cba8da9b0c6d63a4 SHA512 568072eaf0d1c666de2aedacc50cd98da15631e0ef15ba60414be671ac97a50967e5b4d6d00340b1263f730b3a803ccc8995fbb86cfc47517b9521c9920641c8
 EBUILD chemex-2018.10.3.ebuild 1007 BLAKE2B 9b231e246e6401185db827f7cc808be6c1955a569f00b156b7b3ef43645cb51596865551df05c176bfa916128dd40953d933a54e7c10548c37fb08acbb8fb62c SHA512 82f4719818573b63cbdc8d7ffac0968204357f705655e327df0866ea6296c03fb38b8b05133b301fb88fdbaec693814c55c6fea935f7dc4a507eeee5fe0493f3
+EBUILD chemex-2021.4.0_p2.ebuild 1184 BLAKE2B a7ab020a416e46f232ce5b9bd140d7af6c925b8e0da5b2dfe629e7f50533692700c183cf1068be6fa0cee7cd3141eee6f684a936fea9b034f0a68b8f0f080358 SHA512 06067c09038bcc2629ac272a5005acd1f11fce5014ceb2fb9eb8fa9f7c6d900d9ccdc07a90e54fde11e5399baed2b12def1facdfaf7e929e603e6c334b463a04
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p2.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p2.ebuild
new file mode 100644
index 000000000000..8b5e04b8b082
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2021.4.0_p2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.11[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.4.2[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index bd0403ea9a39..4d8b3caac725 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index bdbab07c8bed..0badac8976f4 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -5,6 +5,6 @@ AUX magic-ldflags.patch 1767 BLAKE2B 644e2cd816f1763103612376c095bd00b375a129136
 DIST 2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
 DIST magic-7.5.202.tgz 3692294 BLAKE2B 8c484e7771b388df8a5e9df574a522f81b5ae34bfaa0db28f444f31a0f5737094d73d2f5467796df74f9230fe684e9c96b08b11812b5627ee5a1bcc74893a021 SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80
 DIST magic-8.0.207.tgz 3893605 BLAKE2B 39309def79e03fd6b116482eec2f200cb2b0d2042add2e2a70b0805bc0bc75654de6a92150167ab755b21c333be917c5fac53a30e9f5ee7915fd662179ce391c SHA512 034387d774f653d6de419d597564e96242b87bf3c478045e5a649f490fe4e5431c983f6667b5900ec9ae283af2775404dfbdcbaf18419f85d7242d492360d32b
-EBUILD magic-7.5.202-r1.ebuild 1718 BLAKE2B babc0fc252beca1886f6863bef3bf68fd3c6409695b931ce9fb2a511d7ce5b3574d809ef3f0d4b262cb03256172cd72df94d7757ff54df10dbb558e38244197b SHA512 d812428184a717a1bebc2661526f77102112365221ee91e37b9c922d6e0b62c0daef8d73594f750d59fd91a978c399e0454b410464a63f5c8c96af2e29b5d65a
+EBUILD magic-7.5.202-r1.ebuild 1903 BLAKE2B e523f4d002c84ce8a3f9a1f350d908a783a55c689685657d92432e5c0a346745c0bf297927a9c4e6e3da0b4a50ace7c8b883664e90d116d7404eea9617feeaca SHA512 2762333c3c1a0e584c0ede583dccc883fde2db05c185a71b779b27b500f547e1bba42ab1fc92e46fd6af4d11e4fdddc075653b16ef100c4a21e6a1ae5a21f25f
 EBUILD magic-8.0.207.ebuild 2009 BLAKE2B 313b25b462e163036511b6d87619436c509683bbc0b2b0df282c9a9556d7b5102b1d3a4e7f0e4ab29231f9cdfa6fff63353b22ca9cdc39cfbcc3de00cb680147 SHA512 e9f0ec364c7bcd4f3412a0fa77682f268bda5f33077c84c227f981b05547e3d60c44fad12581d268e6ea9b78a483a1ddd140b45536f1a0515b1691ca2b97e8d6
 MISC metadata.xml 1381 BLAKE2B 7f9458b2f3e6c1f511b1f5a0f8f31e58114e29216eaf3927a6570f16bfab24fb357a82b432414a28a16fde8f02a00fafa5b5d915681a68c621b11202dbfc3d32 SHA512 b9cd12c6e4704bde2aa963880e9321fd64239b7f9333a7daa74be6707001ed18ac61bc48dc8f85cfeac9a427e07a3bcfe07607662d206d0f5d75753e333d2632
diff --git a/sci-electronics/magic/magic-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
index 00761831257f..40a3643a1ebb 100644
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ b/sci-electronics/magic/magic-7.5.202-r1.ebuild
@@ -31,6 +31,12 @@ src_prepare() {
 	eautoreconf
 	cd ..
 	sed -i -e "s: -pg : :" tcltk/Makefile || die
+
+	# required for >=autoconf-2.70 (bug #775422)
+	local ac_aux_file
+	for ac_aux_file in install-sh config.guess config.sub ; do
+		ln -s scripts/${ac_aux_file} ${ac_aux_file} || die
+	done
 }
 
 src_configure() {
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fb0d34eae1c1..57699f6d5e33 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index e49e95988de5..55fccd0d29f4 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,6 +1,4 @@
 AUX fplll-5.4.0-gcc11.patch 623 BLAKE2B 230fcf908c4a6604f6da3800927b9bfee0d9c8b979d0b4cfeba5bf5ae68256f1d457bade2d62c30f2a7e7c07d8433374b19459a3f6d37ba71766b73e1cb189bc SHA512 35b1589267cadddbb7aef7859a748eb171f4545ed42037645588d44df0e404a3ec5f21419ad4a1e34dd5fd037cdceeb927ec7b7a770e4a24eecdbdee6b3176bd
-DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
 DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
-EBUILD fplll-5.3.2.ebuild 684 BLAKE2B dbb2bf6a338bd9b4f357aafab6737001155249d0a28fc398f37c696f4e3a1a2497b221a5426c7f252a36b9f57c26e0bab65ca134fa405407f6697aa8f17949a1 SHA512 ebd3087376ccd1be88f351be6edb6e0eaa3beeefc3a4774208133173c67ae58490c967fbe5e19349026135a1292b4711a193cec70b5ecace1f1470010d72ae87
-EBUILD fplll-5.4.0.ebuild 709 BLAKE2B 622629192a7f0cb16400fc1f12e3dcde46b5273c44cb2a6c7652801b1a304967469f022fb5c2c4c36cbc62bc16158d03003283175ab1dba2355c2fce83bbd13d SHA512 664c5b6b77cf2c62c5333f27d5e5a61f6136b891bbbe7afe48d3a1ea3d6c221765510cdba0768a24bc2b2cbdd472feeda34e814fabfe6c19c1d750f3e1ba857f
+EBUILD fplll-5.4.0.ebuild 707 BLAKE2B dec4dd083a0d8800dd51ba6f851c73355641b69cf693394696f055f42ad282269d049b2dacf049ba415fe9db5e9a549bdded08388bb66da66b9886c35c660ced SHA512 1851a3d2f7faa5ee5254900e11ac35fa2d6b95925052b2005776236c6811cfa0eefde8f848253fcd65f7eadd02bd23fcba45be6a3031019c0df7e309793f9bc1
 MISC metadata.xml 858 BLAKE2B e27b47f6a8d0bb3c17eb023c24f95472c5f791e8a9bf86c1805d1c832b0973a665fe2231f82a289c37afd5318deb89717029ae6694005ade8e112a2769a56170 SHA512 49b6fd4968670fb0da92a883b81420e4739a893a6866ae500106181df5182324e616ccee8e0f290a7cda20f3f4d850fbf9a9462d03f0057da9ced4ba1d835ba7
diff --git a/sci-libs/fplll/fplll-5.3.2.ebuild b/sci-libs/fplll/fplll-5.3.2.ebuild
deleted file mode 100644
index f204635f77ef..000000000000
--- a/sci-libs/fplll/fplll-5.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
-HOMEPAGE="https://github.com/fplll/fplll"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/6"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-BDEPEND=""
-DEPEND="dev-libs/gmp:0
-	dev-libs/mpfr:0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# Support for --with-qd is problematic at the moment.
-	# https://github.com/fplll/fplll/issues/405
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fplll/fplll-5.4.0.ebuild b/sci-libs/fplll/fplll-5.4.0.ebuild
index ecdf4079d976..577db2e4a492 100644
--- a/sci-libs/fplll/fplll-5.4.0.ebuild
+++ b/sci-libs/fplll/fplll-5.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs qd"
 
 BDEPEND="qd? ( virtual/pkgconfig )"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 15f746f7990a..3cb0f9bea3fe 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,4 +1,6 @@
 AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee4523f7b0fce5322a732d462448181c3a0f134261bf66110a9456117bd7fbbf7b2228987b78843033d6f8524b141dcf13 SHA512 e31be023ccc34a4437728b73569c7599b1bd43b9e86f1c886f95884e722cdf1b8a5cb263c6934ddeb172b92cecd122d7cf7e1a59137476dd16ee31e0790cd0bd
 DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
+DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
 EBUILD indilib-1.9.1-r1.ebuild 1330 BLAKE2B 43a126b0ef9d3ac40f7a2f3098586956d1df58501c5e4b7d67cb5006752f28b8d7c1ce7521ab51c53d47da54da329e44be020b8ba623a691ac67c4395fe2de78 SHA512 33a020e215980d154276b1382d4559fccc5e2e0ffa7a8924fb780c8d674aafbb07186c5fcc92c2a4189fe734a55680fc209278623c3318a161b8a5a46ec2ec55
+EBUILD indilib-1.9.2.ebuild 1274 BLAKE2B e88473c87b95fa6fadcc3d185604acf7671d72eb0a0d48c50ea4b74eb2383af5f482d7538bc92b340864b5ea194a584e0c6de21cce2ac2765d88811076686000 SHA512 f3b3d4f11298dda225de4c332c75bdb051446ce93037d07d01b551585164ae9e1177839b201e1cf45e712f3686836c2ec539c14ad508111c5366149de8d3d912
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
new file mode 100644
index 000000000000..7bc78575bc2c
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	rtlsdr? ( net-wireless/rtl-sdr )
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		$(cmake_use_find_package rtlsdr RTLSDR)
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 9780a42e1588..3dfea25dfdef 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,4 +1,4 @@
 DIST components-1.1.1.cif.gz 80378687 BLAKE2B 0776d79f733762ad19177bc93a5587e90966a7862f84174ede23a5875ae4633b519168b24b1c02d7afb30f9049d48434921a70c097a7e8238a5745f1676dcc78 SHA512 fc68513b37871677beb60855e82ed5831e10b08340697a97bbc7113d4c898b8e8382d097d36793346e34b97f0b5def5312fe7eb81ab4f120ad3908ee8d6d1aa3
 DIST libcifpp-1.1.1.tar.gz 978553 BLAKE2B 750cf80bac769a3db86b3be03924402da0254e69206a15222a5dfaa23a7eadcac1f57eb054f2fc783c287bfed86dab0a75d2994b031cc3cd3c2431a26e250d17 SHA512 e74419dada21ea12423c404c34eeb0b410fdb0b26827cd4451375329668909879b6d4795451c6f7c2b2ffc8d282dfcff2f1800630a3487111404335be4cb338f
-EBUILD libcifpp-1.1.1.ebuild 778 BLAKE2B be9a25b4d688f22d93b6fd7bcf963f1acbc3eeabd6d974eaa7f0edaae83e13042b8534011c8801c26490172e468c4ccb5aae7088efe4bb2732b04ada9e43d6a9 SHA512 60793162d3e6f308dbba936f75e9e9364d756edc93bd9135c39abce0fa405a3230e64d34247424d838a5ba2658176192f5898aeb7f720576c053139fca63c54b
+EBUILD libcifpp-1.1.1.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
index 63a6e309a1b4..1f190d58f576 100644
--- a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
+++ b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit cmake tmpfiles
+EAPI=8
+inherit cmake
 
 DESCRIPTION="Code to work with mmCIF and PDB files"
 HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
@@ -14,7 +14,9 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	>=dev-libs/boost-1.70.0:0=[threads(+)]
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 3358aab4532e..2dc5dd6a88d3 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,9 +1,3 @@
-DIST libqalculate-3.17.0.tar.gz 1770500 BLAKE2B 247c74db32e63437c556dd60f00f56acf53d9ba90ea1027b34b98b455215e6c03e3ee34116b6d3989fa43b449e18b6f2ebaed67f9dff36f08dd8b38c685c6586 SHA512 b204dc44b6fdb2b72d3c85840fee38482db071f0f8241420ea24093dcdcc377c66f516c571827fbede40237618a53153a75bb7afee7f3bee7a1a71aedd779a11
-DIST libqalculate-3.18.0.tar.gz 1788899 BLAKE2B 7701dab4d11c9d54f95454cd7be530cfa9f5a8dbe438dac6d734c294ce1eb5be1f4fdb30ef6d041d19f389df88dce4fa7dea68d555ad441992498685bfb3b919 SHA512 37d870f6fd147745747ac971758a512e85e33c42605b99ac4ba68b53ca42a6f0da7ede3869fe3ea4e47d77961e826ad999e0f0c0d87039042563f124bea1250e
-DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081cce609935b4282add885d7277a20696cc3c69272b8255d9da3e79907ec4c57b4b87c971908fc3da890d46ff4849e65ccc SHA512 19df6e46e88478df4dd7ae592557c8c984f76c137708892b01f88737c2a8d72ca01324fd1b1322069292795cd158483b3fc0cc99c6559279e7a2f76ca4a47a56
 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 1603 BLAKE2B a503ff3c6842ce2c20340e3783eda16ec0071151adedb157402df9c6ef0051afdc36ba03482d3b7edd8543c77c77d254b6fe6745ade186eff54f0be9cb9fa25f SHA512 f417057b5dc28dc540b2ba858e6219484d230e2a5a94416b67bcfb2670f09e144f09a3249f6a104eda529cd2c6a710ab9a0e6f935477f3d8731eb7adf4695790
-EBUILD libqalculate-3.20.1-r1.ebuild 1610 BLAKE2B d7471379d9ba406f6b0a90e9e9e5b4f772ba63834fbc6b3d92fd9c6dc730bb53ad7ff0b8ee02c3c3a6deedf1b51b1db6125297fcc08e73ee3cf1704c19f4d655 SHA512 aad5aa2d0896fc1128e74f9480dea552ab5203efbb0cf06a99fd2e5f83748edd13b99d66efba8e5df0509ac957226a08339c2305e34b8677124cf8035812da1a
+EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.17.0.ebuild b/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
deleted file mode 100644
index 35672fd3c7e3..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-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"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
-	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= )"
-RDEPEND="${DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/currencies.xml.in
-		data/datasets.xml.in
-		data/elements.xml.in
-		data/functions.xml.in
-		data/planets.xml.in
-		data/prefixes.xml.in
-		data/units.xml.in
-		data/variables.xml.in
-		src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with curl libcurl) \
-		$(use_with gnuplot gnuplot-call) \
-		$(use_with icu) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
deleted file mode 100644
index 35672fd3c7e3..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-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"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
-	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= )"
-RDEPEND="${DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/currencies.xml.in
-		data/datasets.xml.in
-		data/elements.xml.in
-		data/functions.xml.in
-		data/planets.xml.in
-		data/prefixes.xml.in
-		data/units.xml.in
-		data/variables.xml.in
-		src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with curl libcurl) \
-		$(use_with gnuplot gnuplot-call) \
-		$(use_with icu) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
deleted file mode 100644
index aa63a8ec0a91..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-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"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
-	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= )"
-RDEPEND="${DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/currencies.xml.in
-		data/datasets.xml.in
-		data/elements.xml.in
-		data/functions.xml.in
-		data/planets.xml.in
-		data/prefixes.xml.in
-		data/units.xml.in
-		data/variables.xml.in
-		src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	# Needed for po-defs/Makefile
-	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
-	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
-
-	# bug #792027
-	tc-export CC
-
-	econf \
-		--disable-static \
-		$(use_with curl libcurl) \
-		$(use_with gnuplot gnuplot-call) \
-		$(use_with icu) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
index f87a066dfb22..a233c76663bd 100644
--- a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a5fe1c3d5927..f49d60c6b94a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index cf4e80addae0..1288847de815 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,9 +1,13 @@
 AUX arb-2.18.0-build_type.patch 866 BLAKE2B c127152e03d8dd532558a7dc95e4dd2cc1079073d8c30095feea6fa11a65ced564b94dbe3f2c3295fe47a010982a95b2e4408101ad078017d296f9c796f33ddd SHA512 b38728b103b55b19da1f92f9db8bfae74f275d54f83f3409e18503f199467e48fb74bdfb3716c28c01201dd19e8d78d20036671f99cdb63738f33416dc8eb7a2
 AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
+AUX arb-2.21.0-gamma_fmpq-testfix.patch 2291 BLAKE2B 019af88d2e8c56cd9fcab960fd8fca6f0fdb74e69e72866edcd437700761768c78bd0cfa925ed9bac1c33e4e7c958bfca7939b7cef7c1b7186537dd0573e5414 SHA512 fe40677a95996f54121379e5bef0921e13923be80c68a7821177b371d71d4847e4ed903f3bc0c266c6c6de7fae9ede7cbaa59d5927b4bdb3cc7e58d588aaad68
+AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d35a9c9182b6ba9ced2d786866f8a15a4dd07c97a2702d723de98f5e264a5ca107ad24dc99095e46485fb75696114c6909 SHA512 5addd977a49fa5e9ec9847b07a3043d78ce7d7df5d6947ae895dd345424fa1941335e7a3691cee1497036e33b47fe1858e42b07277629956fe0299c4034b2d79
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
 DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
+DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
 EBUILD arb-2.17.0.ebuild 2025 BLAKE2B aad028595287b91057475d8ea72305c8f720558917009660ef09502e5e22c371192eb6c0e52f281d6fdf9944cbf2038b9d39b1ca7ad9f5a5337b5e796f49bd92 SHA512 5160ed2793dd71af6005ec4ca75bc404c880c149519b85b3f19c51da2321ffbe99b0c6bc7e41dab1de6f624abd16bb3fcc55479dd8ae6cf4af20bca3a3954ed6
 EBUILD arb-2.18.1.ebuild 778 BLAKE2B a8b078451c6ae4907242d87c08a39814bf1c4e77648ed20ccecdc0a93810e3553b03e01aea9a194de9d8c853f871ce016717c95a5cc3dcc53604d1fb77a5067c SHA512 edd48a1e3724defd85700a5c6ec6b98ea9c12cae5f060c540be4610c7e7c8cf266d76ce7522bb482f868e8bede4430d2fd88996d985b6ea294ee79cb4713b938
 EBUILD arb-2.19.0.ebuild 751 BLAKE2B 84cdad6036faaf1a78268921ce0398addc31c6ac4e70681af10794f1c14c50545998870d31c28d8d59f0479ea7b9de395b8e9668daab66e0f2b2f894476d4978 SHA512 c484d59ebfb19fd9a9e05f69c9b7a246bc2e2d6802bb3c938afd3fefc82d984c7545c9b4314b61e949dc05ede11d222e377a66e50eb3123e385d643e983db125
+EBUILD arb-2.21.0.ebuild 787 BLAKE2B aa52e2c080e4a5b6816af28443c8f9386b12c36113df4dc88e21cf7dee6795ba6bf060358fbebb289f74ee4efa6f71e3f81e5db767803e1a03edc09af027f1ec SHA512 b9c7c98053b7769a86be7346b2210c71544d6f8757e580cf47f7e07e21e3ef8d277e4177156b972c5fbe92eb8a6ab691341bc2eae4579e419eb9a87f5eff4e69
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.21.0.ebuild b/sci-mathematics/arb/arb-2.21.0.ebuild
new file mode 100644
index 000000000000..e18ea81def99
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.21.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="https://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-2+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sci-mathematics/flint:="
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gamma_fmpq-testfix.patch"
+	"${FILESDIR}/${P}-qa-warning-fix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch b/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
new file mode 100644
index 000000000000..179ba8887f32
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
@@ -0,0 +1,73 @@
+From 450435a84a40acc1871cd84f1caf2ea47c11a18c Mon Sep 17 00:00:00 2001
+From: fredrik <fredrik.johansson@gmail.com>
+Date: Tue, 28 Sep 2021 12:07:45 +0200
+Subject: [PATCH] fix (hopefully) spurious test failures for gamma_fmpq
+
+---
+ arb_hypgeom/gamma_fmpq.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/arb_hypgeom/gamma_fmpq.c b/arb_hypgeom/gamma_fmpq.c
+index 996a87e5..ee750d0d 100644
+--- a/arb_hypgeom/gamma_fmpq.c
++++ b/arb_hypgeom/gamma_fmpq.c
+@@ -529,22 +529,22 @@ arb_hypgeom_gamma_fmpq_outward(arb_t y, const fmpq_t x, slong prec)
+ 
+     if (q == 1 || q == 2 || q == 3 || q == 4 || q == 6)
+     {
+-        arb_hypgeom_gamma_small_frac(t, p, q, prec);
++        arb_hypgeom_gamma_small_frac(t, p, q, prec + 4 * (m != 0));
+     }
+     else
+     {
+-        arb_hypgeom_gamma_fmpq_hyp(t, a, prec);
++        arb_hypgeom_gamma_fmpq_hyp(t, a, prec + 4 * (m != 0));
+     }
+ 
+     /* argument reduction */
+     if (m >= 0)
+     {
+-        arb_rising_fmpq_ui(u, a, m, prec);
++        arb_rising_fmpq_ui(u, a, m, prec + 4);
+         arb_mul(y, t, u, prec);
+     }
+     else
+     {
+-        arb_rising_fmpq_ui(u, x, -m, prec);
++        arb_rising_fmpq_ui(u, x, -m, prec + 4);
+         arb_div(y, t, u, prec);
+     }
+ 
+@@ -602,7 +602,7 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+     }
+ 
+     arb_set_fmpq(t, a, prec + 4);
+-    success = arb_hypgeom_gamma_taylor(t, t, 0, prec);
++    success = arb_hypgeom_gamma_taylor(t, t, 0, prec + 4);
+ 
+     if (success)
+     {
+@@ -611,12 +611,12 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+ 
+         if (m >= 0)
+         {
+-            arb_rising_fmpq_ui(u, a, m, prec);
++            arb_rising_fmpq_ui(u, a, m, prec + 4);
+             arb_mul(y, t, u, prec);
+         }
+         else
+         {
+-            arb_rising_fmpq_ui(u, x, -m, prec);
++            arb_rising_fmpq_ui(u, x, -m, prec + 4);
+             arb_div(y, t, u, prec);
+         }
+ 
+@@ -684,7 +684,7 @@ arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec)
+         wp = (slong) fmpz_bits(fmpq_numref(x)) - (slong) fmpz_bits(fmpq_denref(x));
+         wp = FLINT_MAX(wp, 0);
+         wp = FLINT_MIN(wp, 4 * prec);
+-        wp += prec;
++        wp += prec + 4;
+ 
+         arb_set_fmpq(y, x, wp);
+ 
diff --git a/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch b/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
new file mode 100644
index 000000000000..dd5440f938de
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
@@ -0,0 +1,21 @@
+From d271652d3124c9e65a97df310a141c607a0b5ee5 Mon Sep 17 00:00:00 2001
+From: fredrik <fredrik.johansson@gmail.com>
+Date: Wed, 29 Sep 2021 19:55:34 +0200
+Subject: [PATCH] add missing include
+
+---
+ acb_poly/lgamma_series.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/acb_poly/lgamma_series.c b/acb_poly/lgamma_series.c
+index 504b0cb4..d50ffb9f 100644
+--- a/acb_poly/lgamma_series.c
++++ b/acb_poly/lgamma_series.c
+@@ -10,6 +10,7 @@
+ */
+ 
+ #include "acb_poly.h"
++#include "acb_hypgeom.h"
+ 
+ void
+ _acb_log_rising_correct_branch(acb_t t,
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 60aa6a552fd5..4ed43a86a9ef 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,4 +1,6 @@
 AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d53dd97044487413567e172235260fc238e6a4ad89225788726bdff94f36b699acda45c86025c23be04b895c1857d836a321113 SHA512 a364c4606fb9321443991d1356f9fb7b2c7fb946ad46760e6e1b1172acc1399f19fabd1eec4dbf8e75e1e61be5d8bfa88ac056ccff47d60f4d50fdff6e31193b
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
+DIST flint-2.8.0.tar.gz 5209922 BLAKE2B 801c6130b3e8119998c3288d243358f567a843597c425cf5edcd37f6dd0f71a5d796e5dc3c8f3ffb8407f8e6dc01a3f4c62daa758e62eee2bbbf6ed07f1721e0 SHA512 91125f7c3aaccb40768091c36c11b5fb5d1e5010e7cb71145d18d348606baa1e72aeae27baa826c00c4a190c39ef19af9488357d0d5634a7c5774e9aeeaef3fc
 EBUILD flint-2.7.1-r1.ebuild 1371 BLAKE2B 859d5bb309b970d5d92e909f8c5573d782d076ed79a23080fb879caba258e35825113823f19a1c5572de726f7f213bd0fc459c088dae48b50bca0fbbb8397552 SHA512 fad00e1482b27ada9a2847638ac1129b90b8c30b5f033af6103509e9181f4dcb6d944ba7ed23ec18c4de51ecb3b9fa8963f13da57e6d0f0a23d7c6e0de1d6ad3
+EBUILD flint-2.8.0.ebuild 1318 BLAKE2B f56232bcfd9e1e66da8836069f6ad3f79ab369912d4e7eb6befb28be4f41e912ffb24ce2f0654ad530758eb9b06cb0c362f05410a80bd7f3cf7b0f089869d611 SHA512 9c992949c4b8a5faf7dd90ea872352f1c72fe5fb34d508f8c3319176c14432e78bcd708fe75c5014f86e06eefc4290f66784c4e5520f62ddf6762159e0867759
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.8.0.ebuild b/sci-mathematics/flint/flint-2.8.0.ebuild
new file mode 100644
index 000000000000..c0196d38a199
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ninja doesn't like "-lcblas" so using make.
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/16"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-tex/latexmk
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )
+	virtual/cblas"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+		-DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		-DCBLAS_LIBRARIES="-lcblas"
+	)
+
+	cmake_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 605b67a55a6e..35e497b3539e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -4,6 +4,8 @@ AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b4
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0 SHA512 4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
+DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9 SHA512 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
+EBUILD octave-6.3.0.ebuild 5134 BLAKE2B fd44f94ae9fbfb79d14454a226f125e4d80a0f266f2f36ac3339870a995258780edfe16077dfec8719a5222989ca1adbd7f469afc3bac207b870a48e487da423 SHA512 a0ed121465799575865f4a5227b34f0626c5c92954cdfed3f1daa7a2f72422be2fcfde43f449a13d34f16760d5af7a7068db54932b893ed7d5b5157ffeabc7e2
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.3.0.ebuild
new file mode 100644
index 000000000000..0b1370942764
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.3.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse
+	ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	java? ( >=virtual/jre-1.6.0:* )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	ssl? (
+		 dev-libs/openssl:0=
+	)
+	sundials? ( >=sci-libs/sundials-4:0= )
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	# Some of these use_with flags are a bit mismatched. The configure
+	# script offers only --without-foo, and detects "foo" automatically
+	# unless --without-foo is specified. Passing --with-foo is not an
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--disable-jit \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug 566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 83a1f28f9c43..f33c6c83c891 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,7 +1,6 @@
 AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96bd5417c31005512ee8f256283921fb64ec4a9ec27fb7e721648b117d3be1000816d1e9bc5ae5adc5df63afe1b0490db020c6 SHA512 de3283be39cff0bba916b314eb9e112324626513f30b5c0e0340617535d8e66ee93fdd9613839633bf7e85244caff6fa1379cc5d0c0a7f9484d028a650eb8845
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
 AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
-AUX pari-2.13.1-rnfdisc.patch 1335 BLAKE2B 25c16204f996b210d345d1ca903d2256b07f8575ea5363cc5646508e84c77785f9a05b6c751a49bd15cf6915128d5e1f533d468ff0d2c544bd8b7d8cad37ac2f SHA512 70ec83d1dd028458d3f2d15b4159f53136ed50c84275d38121ad04bb38ef144c235e460aca8927152791e57a8e1fd9ebe5e233c624d953213fe83c00bbb09b24
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
diff --git a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
deleted file mode 100644
index 39d325911e88..000000000000
--- a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3edb98db78dd49bb8b4137b46781a7cd570c2556 Mon Sep 17 00:00:00 2001
-From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
-Date: Sun, 28 Mar 2021 13:27:24 +0200
-Subject: [PATCH] rnfdisc_factored: remove spurious Q_primpart [#2284]
-
-diff --git a/src/basemath/base2.c b/src/basemath/base2.c
-index b2b63ada5..531f5c558 100644
---- a/src/basemath/base2.c
-+++ b/src/basemath/base2.c
-@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd)
- 
-   nf = checknf(nf);
-   pol = rnfdisc_get_T(nf, pol, &lim);
--  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol)));
-+  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol));
-   pol = nfX_to_monic(nf, pol, NULL);
-   fa = idealfactor_partial(nf, disc, lim);
-   P = gel(fa,1); l = lg(P);
-diff --git a/src/test/32/rnf b/src/test/32/rnf
-index 6bd4585..d24e1ce 100644 (file)
---- a/src/test/32/rnf
-+++ b/src/test/32/rnf
-@@ -832,9 +832,9 @@ error("inconsistent dimensions in idealtwoelt.")
- 0
- 0
- 1
--[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0]
--~]
--[2, -1]
-+[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25
-+/17, -12/17, 12/17, 16/17]~]
-+[1, -1]
-   ***   at top-level: rnfdedekind(nf,P,pr2,1)
-   ***                 ^-----------------------
-   *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented.
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 515c27fb3dbf..4fc256151f39 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index cbb8399d569d..a80ebee92d3f 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,4 +1,4 @@
 DIST lammps-stable_3Mar2020.tar.gz 126001870 BLAKE2B 35ed6ff208fd6dcc8eae50b8e0562a6a0771aa6419c0225353f648d95512ca64b22250ad4a3f9b836b9a25a6838e24e070a1d190fdc02b896dc1ed9838648f01 SHA512 6608cd9f6ea18d8acb55d611a560cb4b329043b41aca23fafd91fac0dfbde5a5286e1a6563bd16b2414bb3bf95929e3a2f270a0b023ce5ede515eb3353d56f04
 DIST lammps-testing-stable_3Mar2020.tar.gz 55729550 BLAKE2B d0de8efa83342b4a350f17a43d3fe96011534b3f410beb295e396a45200ea56298c14664b290b2e30ab4f2fd70b92c01c73927b2878e8171a166dedee8ecf379 SHA512 e3dc592ce57ae625eb66ddd9ca80d7bbaca57c47a07166a7196dcc3074b574a497e706da8baf93b5deacdf588702ceb141014533ac2aaccdd011836fb34943b9
-EBUILD lammps-20200303-r1.ebuild 3058 BLAKE2B ef2ba82d63cf376d4e43ca43eeb8fee3772f7b927e36e9d1b7a762c4786805fc9742b701bd9b2a563fc32cd73a8688d8c12e0220b261cccaf7d763bc7a07cfff SHA512 7c137e91c53be71ef015b7c44fe780dd9bcc077bc9dfbd28f015c4d886cef599396a4dbd179759549b24c66d18a00468776179dc0254a665aff79fce18a04929
+EBUILD lammps-20200303-r1.ebuild 3058 BLAKE2B 3b10b331c807abd91d50d8c8130961c35dd6d8d3e41087ec70aabd63e0e2cd0796ef39fa3b8f0282b44198a505d84966c19005ed23f414462c7ef8e6978afdab SHA512 0e00620a4f223e79fddea03cce905e58a965be9f875d9c31ee925472f83712b006567180d7c3257d46dc72019dfb65ddec424f76493e50c314d9ee8c2d89937c
 MISC metadata.xml 1401 BLAKE2B 2e20264031bcd2178c2accee5ac4abbfdfbaf53c00822ec2c2e6ef23fd0320525bd6126f6cd13c022b8b9ea8e314546f7cda63b675ec4f4a3c04af48206411dc SHA512 c2936835e7b3966469cf699d59f1c81060129f4e8851989ba5b3a93e02f7c0c8e9dc600866dd1e995c08c6af8d69829f76375eb10458fdcbd85150556508eb90
diff --git a/sci-physics/lammps/lammps-20200303-r1.ebuild b/sci-physics/lammps/lammps-20200303-r1.ebuild
index 750459af9395..dbf42732cb2b 100644
--- a/sci-physics/lammps/lammps-20200303-r1.ebuild
+++ b/sci-physics/lammps/lammps-20200303-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit cmake fortran-2 python-r1
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 89084a1e95f8..5e64c41c9d91 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 345262162b8a..690179c75aa6 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,7 +1,9 @@
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
+DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
 EBUILD baselayout-2.7-r3.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb
 EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
-EBUILD baselayout-9999.ebuild 10942 BLAKE2B 74c1d6bf2c6d3eb516fc0fad25dc9b8262a132dba25d02ec7df43a977586d1c118b3e5f0e1c97fdf5f8d11424ce76984e8bcdcff270af834456c3d6147205520 SHA512 589915bc9fe7b7a93e393b0f1ac5a978436c6c56b2415373f198992bc87f4d3d78faf4a2b3fd857a78be2fdf54b0d11e020e38bbbb6d125f7d11bd0a52a6d72a
+EBUILD baselayout-2.8.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
+EBUILD baselayout-9999.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
new file mode 100644
index 000000000000..c5f4dbf7dda3
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.8.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die "Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep || die
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	dodoc ChangeLog
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ver_test 2.6 -lt ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}/{,usr" || die
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 84c0a536ea3c..c5f4dbf7dda3 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -248,12 +248,12 @@ src_install() {
 		OS=$(usex kernel_FreeBSD BSD Linux) \
 		DESTDIR="${ED}" \
 		install
-	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README || die
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
 	doins Makefile
+
+	dodoc ChangeLog
 }
 
 pkg_postinst() {
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 8999b776e326..cef7e114cd5b 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,8 +1,10 @@
 AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5
 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7
+AUX coreutils-9.0-fix-chmod-symlink-exit.patch 1133 BLAKE2B 28a3adfb2c8b4e8d557a713d9e83fb61672e74dbc7dc8a8f7adf497825be0e53e1c08bff37122750a6144da70737af558dc018a06816e279879f31daf746a4d1 SHA512 392b94d55c5864e5de637567f7207e5c789a722710c29bead72c41b9f85f535f96f84f4abc64b35ee218c5ec5bc129837a65ec95cbb88113877b302823491991
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
-EBUILD coreutils-8.32-r1.ebuild 5952 BLAKE2B f36627a733cc12af6662232d75938deb476470daa22084be267487a38d0ae42d32ff79c17f42dda25f8d8a7d95fb5b5f8a487de0bec45f364249bd25bceeeec8 SHA512 ec173a036db1b88010acfa13b301370ac80c7da2f1e29ee4b9c8c36e64ed60d98c5c9c111d0f14d93bf3c34b517fe47a98b3c30d3ccf0e17dcedbeec17d93908
-EBUILD coreutils-9.0.ebuild 5904 BLAKE2B b4e36bdb7300dc1dd33e180543d239813980cfcede24e201ed7f4c57dfe4af15bc1da7b37c0000b655980e7163f266ffb7716f68735230a589b092b38cf83299 SHA512 85b98a9e7ccf84d97b4f6a3d9d4f8a649a1179e2bbc71a7e4374610ce1c08f09d19ef4100c056aaf8ac7907954d02ff1da2a653f64f3c67ae792c0b204e037b9
+EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c
+EBUILD coreutils-9.0-r1.ebuild 5990 BLAKE2B aae844fd5650c162c268d9906d533a56d2a6e2e44cc106a031f75ca10fdfbe023e64909cf21409a5994638300e037f6a4be28dbac1d799b0991bca1ad58b0572 SHA512 4c023ab56b5070c52326a42099f8b14597ea3ce0efcb54bfe7098b37e6866f2332281f750a7b552bc38f4236e27c2e5b1ef79ff65662f3a7cf54d5d46d677325
+EBUILD coreutils-9.0.ebuild 5919 BLAKE2B a972080d2584b0bd38e48ee317b44a848767c182fed84f2b740bf3b8fefa79ffced03e885fdb64b689cbc88ac0929b73ecd478ae6071bd2bdaee3bfddf9d95b7 SHA512 5de0a279ed98b04c981f9b37a4e759d95cfa820af642813bf63ffc24a1e819349dd16a4a82c2c2bf93e11c0c29f00093f79add5ad0c97d74dad4aec8781321d0
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 47b5462e103f..1a139279ad85 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -36,6 +36,7 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/xz-utils
+	dev-lang/perl
 	test? (
 		dev-lang/perl
 		dev-perl/Expect
diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.0-r1.ebuild
new file mode 100644
index 000000000000..ffbc9ea3ef92
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.0-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH="${PN}-8.30-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	!vanilla? (
+		mirror://gentoo/${PATCH}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
+	)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Upstream patches
+		"${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
+	)
+
+	if ! use vanilla ; then
+		PATCHES+=( "${WORKDIR}"/patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+	)
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild
index 0f0aec04b0bd..b373e1d79b29 100644
--- a/sys-apps/coreutils/coreutils-9.0.ebuild
+++ b/sys-apps/coreutils/coreutils-9.0.ebuild
@@ -35,6 +35,7 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/xz-utils
+	dev-lang/perl
 	test? (
 		dev-lang/perl
 		dev-perl/Expect
diff --git a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
new file mode 100644
index 000000000000..25b2b72bcb80
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
@@ -0,0 +1,35 @@
+https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda
+https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html
+(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html)
+
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+   enum
+     {
+       CH_NO_STAT,
+-      CH_NOT_APPLIED,
+       CH_FAILED,
++      CH_NOT_APPLIED,
+       CH_NO_CHANGE_REQUESTED,
+       CH_SUCCEEDED
+     }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+   if ( ! recurse)
+     fts_set (fts, ent, FTS_SKIP);
+ 
+-  return CH_NO_CHANGE_REQUESTED <= ch.status;
++  return CH_NOT_APPLIED <= ch.status;
+ }
+ 
+ /* Recursively change the modes of the specified FILES (the last entry
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e136aa8ae169..785f510206a3 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -5,7 +5,9 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
+DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
 EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
+EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
 MISC metadata.xml 1348 BLAKE2B 118050b55b34009e6c684f563e70801decdbbb72d74fa2f4f3f2f9fc1451dd2bf2ddb63d3303ca9d2f85eba14e9fe302cb4bdf6e487d9fd4883e62e61adc398f SHA512 28988ca295040f8a4abb56a6993c115378e13ef15c6abe96417ad475ad622738663c49b8875eee0e515f767290e2d903f2a483b37a7694f9b91a3d0475627468
diff --git a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..a64bc49822db
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg
+
+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 ~riscv ~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:=[introspection?]
+	$(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
+)
+
+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" )
+	use riscv && 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/gpet/Manifest b/sys-apps/gpet/Manifest
index 55f25cde28b9..49f3e3881b66 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,3 +1,3 @@
 DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
-EBUILD gpet-0.4.ebuild 479 BLAKE2B 4cc59195abf756759b4b6e5ea9e42a6ca5a974339711d36b805918af75f9e5f3dae4d960f43840df2faf535935dfc9709f001dcd7ebba1462fdfa5d3834b468a SHA512 9df9ba5abdae33247c01fbcd6875340cefa001a4a38d8bea577cf8174e742ea5b9b92ad082015803ab8dd3b2d87801fdcb71ca1693394e5c6ec898a77f6e51b3
+EBUILD gpet-0.4-r1.ebuild 609 BLAKE2B 6fbcf20b2165b2c7d50889763b465cb2f37bc7cd59f349298ca8939844b3ca464b0f7b4b7a6de65a4789bee1a599668041b031ab99c8c52931a50ab2941d2de7 SHA512 99f4f90bb345bee2cb683381eee49b2f84b1fbad42a8a241b922bd00361a8c4fef30256b9473222478001e4ca84117d89b0481b22f63369341cbf1c6b3739117
 MISC metadata.xml 302 BLAKE2B 7424fdf95d939a357153ced679c81cf6495dbe1ea07a81592265a4be83e78388f3d88ff24b424353c94c5eef3f1607c7a27834ba72b8511b5908a6038b65cb95 SHA512 54fae275193922e2c838c0a092c0a6ebd8b742b7d92e96b2a2e63defdaf094179eb7a7836d91aec24f1406140fdf86f24cf277ffb454e6ac48cd43b5848f5577
diff --git a/sys-apps/gpet/gpet-0.4-r1.ebuild b/sys-apps/gpet/gpet-0.4-r1.ebuild
new file mode 100644
index 000000000000..0fc96d64a9fa
--- /dev/null
+++ b/sys-apps/gpet/gpet-0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="GTK+ based TOMOYO policy editor"
+HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"
+SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	gnome-base/gconf
+	sys-devel/gettext
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e "/^gpetdocdir =/s!doc/gpet!doc/${PF}!" Makefile.am || die
+	eautoreconf
+}
diff --git a/sys-apps/gpet/gpet-0.4.ebuild b/sys-apps/gpet/gpet-0.4.ebuild
deleted file mode 100644
index 70a0b701a922..000000000000
--- a/sys-apps/gpet/gpet-0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GTK+ based TOMOYO policy editor"
-HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"
-SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	gnome-base/gconf
-	sys-devel/gettext
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 52fbf7bc8c37..4955197fb6fd 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,3 @@
-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 1537 BLAKE2B 9940931b974e902a855baa9bb36ccc71980bedfa1205c8c78d9d1e68aaf46164b9a60d693b83dc763a5f227cb9a25f81f04d46ae1a60d3e0f24ba21f5376d280 SHA512 e95bc7124e3e84f714ac43573edfb35e52d96683a44100de95c99129ea97fc50aec7bcbfc5de0f4d7c4a952a9a006bc30ebd7623a04e50ff27409ed9e1e60f83
-EBUILD hwinfo-21.76.ebuild 1537 BLAKE2B 9940931b974e902a855baa9bb36ccc71980bedfa1205c8c78d9d1e68aaf46164b9a60d693b83dc763a5f227cb9a25f81f04d46ae1a60d3e0f24ba21f5376d280 SHA512 e95bc7124e3e84f714ac43573edfb35e52d96683a44100de95c99129ea97fc50aec7bcbfc5de0f4d7c4a952a9a006bc30ebd7623a04e50ff27409ed9e1e60f83
+EBUILD hwinfo-21.76.ebuild 1547 BLAKE2B 9e691103ba93913281be177fc503a73e939ad9f1c3cb01c636d7d69a10ef642e6ca91cf0c2258594103e519135eabd83170c4e1d64792175a14d8f38a8f06ce8 SHA512 27048939938710f67b98c152bd8a4aa11bd3e75fe17e0c30a2cc7c5ba7da466a3a636d4299bdfada88aa190c8dfc89f3058ae12b65e959055a16e99b3156f5a0
 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-21.74.ebuild b/sys-apps/hwinfo/hwinfo-21.74.ebuild
deleted file mode 100644
index f1d008f78694..000000000000
--- a/sys-apps/hwinfo/hwinfo-21.74.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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/hwinfo/hwinfo-21.76.ebuild b/sys-apps/hwinfo/hwinfo-21.76.ebuild
index f1d008f78694..09823f8d2035 100644
--- a/sys-apps/hwinfo/hwinfo-21.76.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.76.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit rpm toolchain-funcs
 
 DESCRIPTION="Hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://www.opensuse.org/"
+HOMEPAGE="https://github.com/openSUSE/hwinfo/"
 #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"
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index 4797e1c7da1f..b37b1c7409c5 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,3 +1,3 @@
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
-EBUILD input-utils-1.3.ebuild 563 BLAKE2B 1e980e694a0d14be800110e0f21b637c1c21d5ed8b28117332a312c1c52d42b3792b196b82b0726f610075bc0acae1ad8a832010a49b75bf33847ea938c950d0 SHA512 6d5fd990373f6ece92c61e9fee8901ec05ae90dd41bee785dafacae7e7893f442efe18873379460994aa1d1c926c5a9939d0321c4f939fcbe35c5fad255e6a72
+EBUILD input-utils-1.3.ebuild 570 BLAKE2B e8c662469a4d6503db709904c6d446d91bce0ab9ee9f9d111306797dcc6f01095f128cf5c261b5e3943b138d4b1f10ef0fa2ecbf430a23516d6c53b8430bf962 SHA512 b4741f733570824d38e4a483c10c5e9c3fde5a217fd3c1fe152405e92b1b57966a8499696c8029c4c2ac3ea47c75cb10ffafb7cb10a9ebc307782c56bf8f8890
 MISC metadata.xml 580 BLAKE2B dba766179c7ec94124f83b699826a4173a54c189ff3e4dfe2aca140b1cd14755fa70c4ca8bdb693aba6487426c4de15911818b50f79ee1acf92e82120728d13d SHA512 e55a38b9782b54475eda9cda1488bc130031f7504a42b27f310821aedead9ecc76e2eb3fcbe9f3c4d372290a39e840433813300c5731342cafa7a8614d17dd9f
diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild
index d47716258637..d5499f832ba5 100644
--- a/sys-apps/input-utils/input-utils-1.3.ebuild
+++ b/sys-apps/input-utils/input-utils-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index d0a0295b9be4..213cfe26a682 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -1,5 +1,4 @@
 AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a
-AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b
 DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf
 EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch
deleted file mode 100644
index 6ec44a8079ad..000000000000
--- a/sys-apps/minijail/files/minijail-9-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 54ee978..a50ee9a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no)
- GTEST_CXXFLAGS := -std=gnu++14
- GTEST_LIBS := gtest.a
- else
--GTEST_CXXFLAGS := $(shell gtest-config --cxxflags)
--GTEST_LIBS := $(shell gtest-config --libs)
-+GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags)
-+GTEST_LIBS ?= $(shell gtest-config --libs)
- endif
- 
- CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \
-@@ -73,6 +73,7 @@ clean: CLEAN(minijail0)
- 
- 
- CC_LIBRARY(libminijail.so): LDLIBS += -lcap
-+CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so
- CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES)
- clean: CLEAN(libminijail.so)
- 
-@@ -91,6 +92,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so)
- 
- 
- CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl
-+CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so
- CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES)
- clean: CLEAN(libminijailpreload.so)
- 
-diff --git a/common.mk b/common.mk
-index 77879d8..1cd815b 100644
---- a/common.mk
-+++ b/common.mk
-@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \
-   -fno-strict-aliasing $(SSP_CFLAGS) -O1
- CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14
- CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11
--CPPFLAGS += -D_FORTIFY_SOURCE=2
-+CPPFLAGS +=
- 
- # Enable large file support.
- CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 449f0d4c76c3..396faa8c1128 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,10 @@
 DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
 DIST pkgcore-0.12.6.tar.gz 624740 BLAKE2B fb03cffd274d8c31f6eff33a0f9133dc0ef84a7e671d6f29cda938fca3e353d498173ae3e5ce7c5b7433e5e668096ae63ed7c4cc7108ad6edc7db3c247ce85df SHA512 18d01f7a52a7aeae0fcfd8ce81e27f98a204c3743e211a2dd182cabd6521c9d528663affbd98521a41ada17cbece860fce61d9e6a2dff2ca525da26741807c95
 DIST pkgcore-0.12.7.tar.gz 624992 BLAKE2B 93058dcf8eae891a7462b3125d648c218c034388daa8be86b4cbea34b82cbe7c484f354f4bf94bb3e4f25858783402d172231f773aded15b4dd902e52f9a3620 SHA512 2d25c3262a3fa806514d64a2f15664b8f0fe3ab2946ae681dd0ba7cebd8c9c9490500f809907f40eb5072763134d4e68cd75d17b2b7321a33fb55ebdad0768a7
+DIST pkgcore-0.12.8.tar.gz 624442 BLAKE2B d7e15fc659820e3cd6e4f7848413c12b2439d38900c9f64c582ba078d3fe874c12d66d39fdf59a7e4ff585d82d29fcad16c9af869b2388ed6e0af0be7d16d887 SHA512 d02087d4bada3bc2f87738b0ddedc72782b2facdf681927e84fed32dc6645e48ebde83de5aeb9eb0f64e01afe2ac511ae0f7450a2708698bbad872a60044319b
 EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
 EBUILD pkgcore-0.12.6.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
-EBUILD pkgcore-0.12.7.ebuild 1119 BLAKE2B fce894d6475003f291f3d8c5a631401858308e28000b896d254eaeb612ccc9863c3db6a22b5b9d3528810b92ada15cbeb6f2c6dbc70ee3892c8759ccd4528111 SHA512 5466790abbaabd9b1a1200e048649229f65b793437e7ee30595009eb61b9d9c88a037e7a641c55ab5700946190f71f875af436c70d39cb338b2a66622c8399c5
+EBUILD pkgcore-0.12.7.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
+EBUILD pkgcore-0.12.8.ebuild 1127 BLAKE2B e9ebe5fa39276a8ee620a9e3f322bcc8bf4ac7f5885c1dcb64507137b11a29e33af7ca3d4d75401c6d741e4e3c0abcdcc1a57adbc56a3827d7f536702eb29d4f SHA512 d9c1964fb7968ad83bd01656ca18aa30ce717b0b6e8763c052f1cdf2d84b8f3c86dba88cec165528b49750651cfdb73e48b6bbb628103d2b79f71236fda6dff0
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
index 7e94ce62b01d..94ce676970ca 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
new file mode 100644
index 000000000000..bf0996ccbaa8
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.8.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 ~m68k ~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/plocate/Manifest b/sys-apps/plocate/Manifest
index c07aa89dd0cf..ab876f4c67c1 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -6,7 +6,7 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0
 DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433
 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
-EBUILD plocate-1.1.10.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
+EBUILD plocate-1.1.10.ebuild 2076 BLAKE2B 24b739711c5dea6964cfac26f18ab4f7cff7d1a78a8d2d7d2ed1810d12a417a42bd0257ad14a36c9e65aa7c767fc9cd8a7db151f58ceac2345514964c084d0fe SHA512 0a6c96e085ed11000df8b30e2406c100a2404f0cd72b912493ab3734fca774313e86cb0f489db791fb2daa39bcba21a6452428a0ac1d539617296e72b5ef5c30
 EBUILD plocate-1.1.11.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
 EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
 MISC metadata.xml 1393 BLAKE2B 1459e2cc800bad910a9e08a1fd0d6b6a533d3420279a4a89d5c07d91775180669684d5b454962323acb5ecc1d96de650f48623a9f63319004ad25bea7b4ded97 SHA512 16e282b1d1bc1f71631bbde3ca935c1e0747175460860ef068e6855a9efa3d843841e0b9deaa0848a2f4fbff32aa630f0b93c398b196c6619a61f59263ee8e31
diff --git a/sys-apps/plocate/plocate-1.1.10.ebuild b/sys-apps/plocate/plocate-1.1.10.ebuild
index d198d630c595..5b617cb2ffc9 100644
--- a/sys-apps/plocate/plocate-1.1.10.ebuild
+++ b/sys-apps/plocate/plocate-1.1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 54dd29dfd62a..2e2ba0dff9c2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,10 +10,14 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983a
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
 DIST portage-3.0.22.tar.bz2 1150425 BLAKE2B af9cb1eeb96d887fe13514b14b9820c37b0de3204ebd423e69fea839a2908db2a916a03e82186ee9cc64562b770c27e407431fc00427ec1a5119b80ce35d5128 SHA512 0c227cb5a532235e735f973a5eb8f018189abb067e4b94276a780357b6ce93c9c967a03a3320affddf3c614fd26188e7598eeaee350305013b427a343892b016
 DIST portage-3.0.23.tar.bz2 1150929 BLAKE2B 26009cd2c19a138783a713d524744215796d35bb495e753e0fc76a354db89cfd210bdb62eea2dc54609e18024be49cec0e1de96bb6225f6d50fe9d8f52d8cbe5 SHA512 e0b21cd9f2eeaf201e2caf9f39afd9d0525a25d1576955b277ea9b44f0fcfdbe27ff54de16a06da53f72a08bbafc73a14f9d874dba4edebca3cbdf69fbf31862
+DIST portage-3.0.24.tar.bz2 1153838 BLAKE2B b2cbb8b3156987f42ff6c8f140586eae40da4a0a42091a4d11f46b61b66e81ac8e4c366e69b12c06d3a300405f089d68e70175efb7eabe25bb19c47679c19873 SHA512 b16751ba0b4c604cd7d72ad8dfaad40d845f87066b4e54fe264093b88a0b29a6af4e8b72f00be2da501fd288dfa23143d8f61f49048e8565b9d17687ef3732d9
+DIST portage-3.0.26.tar.bz2 1153321 BLAKE2B bec2409fa80b236bff10ba1840f6b11294a2a08148e2fd143e13f09f8baf68a1fe1a0a448169850e33b4bb00eefbd0745e6503ffe61d0e5ca604d949a93c997c SHA512 d3ac941a3f9b24747e66ceda508ca6b6211c6ec412b7fbdfbbc9191696b67516aec4ab5ee5e49a086e32567e54f9156c3bf5c4fddb85ccebb1c61bb4c87e719a
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B f4a457de8df4a6c79568de33f898c56016ef44fc44b8965befd5c15dd16b93a800c8797ebfaddb0cb6e81c1a6f7af68eb297d9399bad9aa534ea75117eba73e0 SHA512 40329720f7ea7538da334479835cf21560f2e3c3420863593cbaf7dfb454dae1b01293256622ee09c05d3e7d8949e4f2839d1d1bd0911ccb9d6e63254003790d
 EBUILD portage-3.0.19.ebuild 8512 BLAKE2B 06282a5646db362eb2031c129fd277ddb9e911579784ef9c156df2aa8b48895e50e5612bb012d3145ffd279ba7c67df642e985fecd186c626969ff5cc7c59cea SHA512 b87c08791772a3d2b349caef7fc2af307fef0152631caa7cc641ebbf9da306ec8c96ee0e0de145b9e962766da1e93c511e068bc23d91585d9d3d084cbb2b0751
 EBUILD portage-3.0.20-r6.ebuild 9869 BLAKE2B 9b6a95912f49c38f004384a630439c9d007bf56aa8020a55be7e466497403f0e1a3d82cba0f10678034153c451c5fb730898fa2c0d25e9e524dfffe788ad8e5d SHA512 e64ae862c144824ace31c0b6b65bd2bc34824206f301c52337294c72cab9a679d8b6eeea1fb3cde35499b3970618d3ac075e83eb68ff1a4782a5baa4ea357ed2
 EBUILD portage-3.0.22.ebuild 8528 BLAKE2B 74f9bcdb8e92e6b001e9dc7f449c0556a96f268765079eb34c7028893128939eca7b30ac26625849e2b94f2926451e2f2e1c3fbe0939fef88a9ba201ed609276 SHA512 0fe39792c480bcdba77e366b725c5c4f305249a1ba2c34f1d90078f2fc1ea342966f8800db3888506ecc66590b37bcdfd5d5eabeb1554dedc2776afa34e575be
 EBUILD portage-3.0.23.ebuild 8528 BLAKE2B 74f9bcdb8e92e6b001e9dc7f449c0556a96f268765079eb34c7028893128939eca7b30ac26625849e2b94f2926451e2f2e1c3fbe0939fef88a9ba201ed609276 SHA512 0fe39792c480bcdba77e366b725c5c4f305249a1ba2c34f1d90078f2fc1ea342966f8800db3888506ecc66590b37bcdfd5d5eabeb1554dedc2776afa34e575be
-EBUILD portage-9999.ebuild 7824 BLAKE2B bb058756e366050ff60bd9fda782fb36ea8862ae5a62ff520e8ca8e274828d974d8d085c9d03cb94d8494b8fe0fb6f648ba58d508ee44e3d3e6e53a99a83ece9 SHA512 cd5d263d759622de183124f4ebe1bdc1f34f25a02393def436057b802e84ed34bf3a22bd1161e725e7b3c3226b37cf3c844f14e01f61c2d6b1bcde01d9e84fb5
+EBUILD portage-3.0.24.ebuild 8517 BLAKE2B 40317e7f9aba4bae7ee79bd5b199872bbdc8f18a4a1cebbc8fbe30c172fcdc1d79686015317554105766f4055686328c255228ce63b4888ac28c8dd6d22230e6 SHA512 8487aa578431d9db84ad668aca6b0637beab6868c55144a1a42c60a39cd24f18cf1a45f18a60d294fdd8a0e4f98f24b038c7ce2548acedcfb15f720d1bf70174
+EBUILD portage-3.0.26.ebuild 8523 BLAKE2B b7f2e333c662342790a5c2d0513306d5fe7b4d08ba546cb8ce318fa57b4c41a0271bdf9c61b1b6410ed7c1c0abd849d27c41a878aadfd2e3e8ff1665bfd55738 SHA512 6fa4948648dd544e0a75566d24e228605e98de741558637a182454deac454660487bda53aaf0df3dbf0dd23f4d18dcc2f84877f20386bfaa7eee0cae7e880e72
+EBUILD portage-9999.ebuild 7791 BLAKE2B 6b600783f4b3da37fec10c5105cc8d9fbe6bbd9c06b0926b56e7f9ef422b2fcf8ad1be36ed6d4b6c148f3d01438d5331120e336041da116fc6b9141773b4f11e SHA512 bd51dd3e8271a37b90a5250132a9b6bb3ff5f4da00f410a902f6a43fc2871b7b6809babe075b4dbdd5147ec99a71bfe21ba68c777b18cc6a1fb7c761033ae597
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/portage-3.0.24.ebuild b/sys-apps/portage/portage-3.0.24.ebuild
new file mode 100644
index 000000000000..cd4bdfc5bc41
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.24.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-3.0.26.ebuild b/sys-apps/portage/portage-3.0.26.ebuild
new file mode 100644
index 000000000000..2520a5c59195
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.26.ebuild
@@ -0,0 +1,264 @@
+# 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='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 14c3a28ab28f..8d3f85a57721 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 60cfbd2f3599..157a5089b562 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST qdirstat-1.7.1.tar.gz 8532003 BLAKE2B 4e3eec17dbfedf602580eb94a8264af40e77e2d5f67d4f0b9bf4a073bcd951ec48b9c3cac50463d0c0a2512a31c69adf10c1f77d6df317c617d4260c7fd845cf SHA512 e272cb603262966f6f24ef0dda268b4c9819783ec43e4f09181f7c6c7c9dac576403b8fc0c3a5b90b85bdc381f491ef3fd0db79ed88993f2bed3157529651ce0
 DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10
-EBUILD qdirstat-1.7.1.ebuild 981 BLAKE2B 4573e11212221fe9d1afc86e2767e8292fa0a30b3b8d92bf33251d5465b56761f562fd536f58f69e4e5f0eb1b9942abdb994585cf92a51ed4d5e82550db53fa7 SHA512 438d72ad5a9e91577a5f7c401c588b9bd0670159447f8dac121aacf2ccc69176912aaa92bad5c0cf47a3a4cae5a144cb40df8f680b47e78155d4980c99a81924
-EBUILD qdirstat-1.8.ebuild 993 BLAKE2B f30bd927fdda466dd4bd2638b57200d7a11c5fdaa3a85d5fce2cf7076181f7c713187da8736c175b48401fb27be71865e5bd4c1bec406adf1838e3d2c47e2a60 SHA512 f6ad26d6e18be7a8007945ccac0cf53f3a4161e455b8ef79ad530d8de0caa834b31a1bdd04ff8ec2fca9a4ddb0ac941e2f481688ccfc01f5002014b331454ef7
+EBUILD qdirstat-1.8.ebuild 991 BLAKE2B 4799e6e46bfd638075328690e6a82bf3cc5b01c3d97951352cbf0eeb1261b7594796cc445f3d9b6e1306c15cd6fd5f84ebc0fbfe7b20097a43382db5111939c9 SHA512 7b18d715f765dc7fbf6a1ebf95ff91ed10f90f5ad38e6f0c3e6cb3d5faffa0dc604e608e98d2cef185b8e8b24738780189fdbee56bce4815cbd3b5841e302f02
 MISC metadata.xml 883 BLAKE2B b5a3c4f300c991de6174a8e46c9dfe672e9293713d5174b182d9cce2354840c9afa63aea8d5335e1bae365c12440ac93290a3abe46f7cff5264179835ba0a719 SHA512 5b23f2d2bd68dc0562df3cd78a066980cccedb5f7f3dca98b200b7b0ccf739a4a01a2fe84accd6fa96b2ceed5b35087db915b3cdd0d9af2cd080d4a590f4ce08
diff --git a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
deleted file mode 100644
index cf382f9d1410..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.7.1.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
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt-based directory statistics"
-HOMEPAGE="https://github.com/shundhammer/qdirstat"
-SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-src_prepare() {
-	default
-
-	# Fix QA warning about incorrect use of doc path
-	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
-
-	# Don't install compressed man pages
-	sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/qdirstat/qdirstat-1.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild
index 6943b8116948..64ab49423bd4 100644
--- a/sys-apps/qdirstat/qdirstat-1.8.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 069d37b6a5e1..d4d2296590d5 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -3,6 +3,6 @@ AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
 DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7
-EBUILD rng-tools-6.13-r1.ebuild 1704 BLAKE2B 3005edac0db4da6d2222973f4a837d025742bb6c6e67fcdba9e4fde45b00ada12b1d3a9ee9e4f42fb4eb4b5d3a7575ee7252eaaa97c3879f85bea56df3dfec2b SHA512 8b7167cc590171dc2ab071b7fb63f245b2647cf086599b76fc5d58c33977af3672c3e6cc842b246bb072bc9b3d66b98856ead1369a009039b58a5a1e7194fd84
-EBUILD rng-tools-6.14-r1.ebuild 1629 BLAKE2B e13a382dcbe0f6a820bc6047213872f705faa1bd7325cb181c7e145e1798a27bb509f5e48038acdf0a27aa9fddbbb2dbd3e7706c7b5b466af45039f5d05d304a SHA512 650546fc3a71c16e976a2e94e09dc1dff2a1bdc2f73ba7b70283c81032969f4ca65631f3be77c9bad0eb8244c04ef54544a3f9087e1451ad1fcad0af82ccd6f0
+EBUILD rng-tools-6.13-r2.ebuild 1706 BLAKE2B 3bf72b094d00456cc61acb2d98ce19a5db21b1f0eb822e722139f696eb81a56e87f0d97ad149b92997827b60c6af10e36ce6594438b68b418586cca58d713c20 SHA512 416a3b5bd41180eda085714ce9e34bb0eac7a925428207aef6f444193a6bb8b6232b00a85e27513bad2921fa318bffe87403fd9fddcf37ce936def6c53685af2
+EBUILD rng-tools-6.14-r2.ebuild 1631 BLAKE2B 7b4b35c429759350d2a5b516ebf2922aef43cde36f5d6a45ae88fac9a027a043f865c96e93f7ce36e62b005ccedc74d74d9e51ae59b3e908614c18b9fb71ba9e SHA512 e4c212ee04442ba3eadb12fac8f7fc77a60ac870281036de185f7b56e1ace223c2b9d560e7bb47450082f9a422a0e2902af2225ad0684c661ae97d632c6564f4
 MISC metadata.xml 826 BLAKE2B 6a0fb04e17c209dcbf342357d8b044258533e877bc191d3afea272d379f02e75af2fbf912a840db32313e2fbf418c25556d423aec7793a0fca0fbaca5a4feb18 SHA512 24e9616ab14295a4cc0101752734332e98bb0299c42e831a0db9262527f83433174b704d3b1114841c4a00c82adfbe07b7473b2d57ec85d9358f41bff3797f3c
diff --git a/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild
deleted file mode 100644
index 1e3e35cf30a9..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
new file mode 100644
index 000000000000..f70781ca79d6
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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.14-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.14-r1.ebuild
deleted file mode 100644
index fa8184cabf28..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.14-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 rtlsdr 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:= )
-	rtlsdr? ( net-wireless/rtl-sdr )
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		$(use_with rtlsdr)
-	)
-
-	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.14-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild
new file mode 100644
index 000000000000..6d708a77d27f
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild
@@ -0,0 +1,69 @@
+# 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 rtlsdr 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:= )
+	rtlsdr? ( net-wireless/rtl-sdr )
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		$(use_with rtlsdr)
+	)
+
+	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/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 98cff3c867cd..950fee7043ab 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,6 +1,6 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
 DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d
-EBUILD sandbox-2.24.ebuild 1620 BLAKE2B 14aae3cf980c2285e1dbf7c735e95801ae646cea389f585aa560bd016f860fd8936bc33ab2428168389910a06e76c20b0a20fe51071df62bd861be41a12c9f27 SHA512 443f9f99cc2e5e303c5c48686bd8f4c1647a39aca7515bc5f847f2cec4ca97cd2b240b221a07742dec94d7cb164075201c4cfbbcd711ade30f7a0a60c2666f16
+EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1623 BLAKE2B 89f1946e8c8984c422bd4837eae4e20e0878496fc2b9dda84e5a53fd3db1d199f449967ed0af3156e26b8d8dedbc38c99db92e57eb2cf928b63da7fff2827e27 SHA512 40ddf4bf456b789e8d45997659057a0247dca25a6f7874860ca63e839cd915c819c2d0faae7e5facd7361dfe76e5e49c391b9f96d8b32967358c5d11f25aa9b5
 MISC metadata.xml 253 BLAKE2B 67da03c96f16f23fc1bbed2f09b3ace7f1309ae149005999bf271479a6d142783d69d44aff75f4a7169f20f5bd1f0f605bcda292953a15454896a56c7ba9e7cf SHA512 3148011cc25751dc4d0e6c077963880e10cd49f79b5d9778f31c73f161d958e2dce687dea8dd84e2b5a7762b00d3ff843b1fbc8b1827379ccbd4e3fac8eefcc3
diff --git a/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild
index 2d94c2dde836..e95d6bc812a8 100644
--- a/sys-apps/sandbox/sandbox-2.24.ebuild
+++ b/sys-apps/sandbox/sandbox-2.24.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic multilib-minimal multiprocessing
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 10720c7342f2..78eaaf94a3dc 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,7 +1,7 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
+AUX smartmontools-update-drivedb 161 BLAKE2B e1ff7f8f77b6b1afe02228e1b5a3045555ec11f4f1cef86af2a024544ae8714520682ca87592a54d801327f95c4cb3b7c9e1b49592e7bcfcdc0c7837a3a5c881 SHA512 cf460168f1e0cb9a5276a098b62b61044d797ffc992dc0233fae5109769aeab4c04eab56fbcbdc5202513f8a537bc7c40cf463d9260deefd3efa4811e58a249b
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-EBUILD smartmontools-7.2.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6
+EBUILD smartmontools-7.2-r1.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6
 EBUILD smartmontools-9999.ebuild 4120 BLAKE2B 8934c567f80a47f0a3d31a7e97b6a0821bb3cc34cc203c0c8568e78c2023b64bfbc938c4b68584bff6ec9eb41c46f7a6d7edcbc9f1f63a62fa0329b87412c2f8 SHA512 424b6c177004e0d7c706699343e0aa145470e95f6e65cb8d3b326e702c699a02e9bd4a640c30ffec7de635c9d7dfa4db1cd54e46b8d3cc010084103ed494526a
 MISC metadata.xml 629 BLAKE2B c73896c9de740a685e9032160525ff16cea74570a357add089208502966cd30a8aa9e60cd582ebd739c452e11da41a9e1edf5383d0060b4b6e90e4184d2c7478 SHA512 2263c65a48ab07a4fa6440c38c4d25486f0b55b686983911297becddbacb7549c54d6d8c890e5df5a30654d1b3d589389d83cb4d974bb6c9a5a4aa61907b2478
diff --git a/sys-apps/smartmontools/files/smartmontools-update-drivedb b/sys-apps/smartmontools/files/smartmontools-update-drivedb
index 831f1e6541b5..b7d1bb95243f 100644
--- a/sys-apps/smartmontools/files/smartmontools-update-drivedb
+++ b/sys-apps/smartmontools/files/smartmontools-update-drivedb
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-/usr/sbin/update-smart-drivedb
+# Hide stdout until a --quiet switch is added:
+# https://github.com/smartmontools/smartmontools/issues/110
+/usr/sbin/update-smart-drivedb > /dev/null
diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild
index 39f90ac1de44..39f90ac1de44 100644
--- a/sys-apps/smartmontools/smartmontools-7.2.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index f2b46786a1f2..6e46ef246f74 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,6 +1,6 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
 DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589
 DIST tuned-2.16.0.tar.gz 213111 BLAKE2B 865cfffc89459396aa50c7908c88de405dea365084cf1592134391da961e88cc5610b663d93d531febdf881182624a13771493c61915003c59ad24bc64dd8a5c SHA512 35f04e1ee1ab3d8be711f0787db92c089cc210c75a3be0bc60389effaed8dc3fb502eff54ea0336154563f7b194f8ff286a2e408ab439a472b6d4922c64d5b03
-EBUILD tuned-2.15.0-r1.ebuild 1360 BLAKE2B e0ba83ac9f68884ad57900f55a602242d902ffd8d94af9a58b9c7b825903d871d282f6357ea1a70b8294354c8597d14ccc82d79798daa560ff7a42b6efb3b2fb SHA512 25be2fd64fd25e53d86f8dfb6140bd6e0e899b7893c773412c802ee18b65cfa2703acce16caffcfc378f56564646481c114670893472433becee66451125923e
-EBUILD tuned-2.16.0.ebuild 1398 BLAKE2B 68aeb197be15110539f5bb1d2fa05d0325a6fb08faa4ad2ac1f778ee8db31fff434dd610493eb5b812f5f5624e0f467116e4ee94ff7df9dfd1bd258d94ed7533 SHA512 976ba258e4f46073e4dabba51b1e4506523382e056d5631b7d433756c4ab5582f9767afd57dac39fe562f4eb74d381234b7bb26a500a0d14c9410027ae19e7fd
+EBUILD tuned-2.15.0-r1.ebuild 1398 BLAKE2B 337e9eae70d78f6cd5144be3a1a23cd14c5d9d2e2e85db195a97d4a84547bd1f8db927d577dfcbefb459eaf70b05fac170c735c3784486c91448fe40afa029e2 SHA512 20643784a9dddcc356b8d6e1bf2dc955f2c3beff3f82f18d2999f1f9fb6a65d10aafb22bfddf9679147fb368f6ec95a09b23c8888a9ad0a22353e01e8b801a43
+EBUILD tuned-2.16.0.ebuild 1398 BLAKE2B 337e9eae70d78f6cd5144be3a1a23cd14c5d9d2e2e85db195a97d4a84547bd1f8db927d577dfcbefb459eaf70b05fac170c735c3784486c91448fe40afa029e2 SHA512 20643784a9dddcc356b8d6e1bf2dc955f2c3beff3f82f18d2999f1f9fb6a65d10aafb22bfddf9679147fb368f6ec95a09b23c8888a9ad0a22353e01e8b801a43
 MISC metadata.xml 389 BLAKE2B 52563fa6fe2c0117754a8892f1393c78692dc9952a06ecc3fdf0344a2a4bdf9ff7f72acf9e0789d2ce5c014c8f563c9ce5a553a2bd94adc654982e1c37c1f225 SHA512 9f4a01f5090acff631fa852632f6c4624b08c746afb545aeb215bfbf55f2ae7ef9b6f74af0036ca1e6962ac3a4307b6175afad3eb6b0363fe8868a4185168747
diff --git a/sys-apps/tuned/tuned-2.15.0-r1.ebuild b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
index 050ad815152f..cceedf446eba 100644
--- a/sys-apps/tuned/tuned-2.15.0-r1.ebuild
+++ b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-inherit python-single-r1 xdg-utils
+inherit python-single-r1 tmpfiles xdg-utils
 
 DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
 HOMEPAGE="https://github.com/redhat-performance/tuned"
@@ -58,5 +58,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
 	xdg_icon_cache_update
 }
diff --git a/sys-apps/tuned/tuned-2.16.0.ebuild b/sys-apps/tuned/tuned-2.16.0.ebuild
index bb7ae49d1f98..cceedf446eba 100644
--- a/sys-apps/tuned/tuned-2.16.0.ebuild
+++ b/sys-apps/tuned/tuned-2.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-inherit python-single-r1 xdg-utils tmpfiles
+inherit python-single-r1 tmpfiles xdg-utils
 
 DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
 HOMEPAGE="https://github.com/redhat-performance/tuned"
@@ -58,6 +58,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
 	tmpfiles_process ${PN}.conf
+	xdg_icon_cache_update
 }
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index e2ca8e5cea29..724cb084f383 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 22e8a72247a9..871a9b6b0ed9 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,5 +1,5 @@
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
 AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6bed7cf08cb57b742e71cba7adc7440c8564f6db208f6ef09ab4fe50a4381fb8988b4fed815d71cf3 SHA512 fc49ba42cc2b538fdbbd93f7422359d1410b4124e11afca7db0511da980360be14cf49aee829ed1f5762ad4723c68090088638c36d76b040fcafda063394adf2
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
-EBUILD munge-0.5.13-r2.ebuild 1440 BLAKE2B 4d596d53723565d9fa0a00488ab62e0728f3dac134d4d1cf0a99ca8bd5fbdfe45e6a166034517e93fad6af43383b04183379436fa7b66cd27befaf9003e25e22 SHA512 49527c37a4142d7b85b8463952fe56ef366f5b8b2ceb26ca89463dfee33226c0ea13883dcc601bc3f8d2e8c916bc9940f0966a425363c2700cd40b53574db358
+EBUILD munge-0.5.13-r2.ebuild 1498 BLAKE2B 8e0e23e18a8ee92fc418ce5ef214a787692cbea31933537370bd5d7f63f49cd0601a663fee6bfb1c38d788e4e56b46af168090a54e0dc265590f5ead5186933a SHA512 c7ea8f838339d8214b63e9bcbcf58bfd9a34ac8be5192891ebca91561b90a30bb1c9f9b7190ba03cc191c695b40453408014695998d2444a965ff3bdef2a4140
 MISC metadata.xml 1060 BLAKE2B a520e4060bfedd84813f4e491a5af8514095374a862274efb6a4731cb25ff81831d8fd8733fe91c39cd538e0261ee92b9ff85240882e3812350f1994587d3a7e SHA512 f0195cff8c4adb4dc7d56dd078d1f99e520b0ac9a63ee585b7c90d21dd0e581348bdeabd191a78efaef9c9a323707f22875b0c6b09377c08cb591d961ec35459
diff --git a/sys-auth/munge/munge-0.5.13-r2.ebuild b/sys-auth/munge/munge-0.5.13-r2.ebuild
index b10bf0e81697..6eb0ac441fed 100644
--- a/sys-auth/munge/munge-0.5.13-r2.ebuild
+++ b/sys-auth/munge/munge-0.5.13-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools prefix
+inherit autotools prefix tmpfiles
 
 DESCRIPTION="An authentication service for creating and validating credentials"
 HOMEPAGE="https://github.com/dun/munge"
@@ -71,3 +71,7 @@ src_install() {
 		find "${D}" -name '*.la' -delete || die
 	fi
 }
+
+pkg_postinst() {
+	tmpfiles_process munge.conf
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 596518ec5736..3cd9094308f2 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 5adbb068f1d8..4ce549eefb67 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,5 +1,5 @@
 AUX os-prober-1.76-exherbo.patch 905 BLAKE2B e8d78b730d33b5760128eaf910f20ac01dc7db3e2b3a271279859869e3c8451e7c8dd72ed5b2784a0dfbf3f31747a81509445d3793a8ed8070a1a721b1b84186 SHA512 0c3c2e4cde868e186131b08268e6344841f0830be5bf4131e5a7ded93a222097599b0a011168e4b7bd0bc97b69ece194df1d46d98eac2c921f16b3e76d004cc8
 AUX os-prober-1.78-btrfsfix.patch 14379 BLAKE2B 5aff7aad1957966355748eafb7b1b426e81428c1de9d1053e708cccb271efe97c8728887a7dbc969a78e4ff3d92cbb0b1badf7551532030b585c5211a7308323 SHA512 deefcd22ac50b9a5cdc4609eda6cc5c58f40989c17e56a8f098f529bacfef7bb65fca9775e7ea85540b850eecfd1380d9474388644f13c47459c14bc6cbe681f
 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
-EBUILD os-prober-1.78.ebuild 2232 BLAKE2B 918f76cc26698560bf10124b36643a18783fc15471494b20ebb86b11e6ffaebf88477248651db89ac4c7cd32683cd7065b72acf0a72d1b94576a5dcb782609d6 SHA512 4219e33567ebaa6e6b293fcf36d8681d4ff99ff0d6ed2399926be671ad4eef1a1ef1a6d290b0406c56583e0b1acfe01c833365bb5362ce4be0cf0f12ba0776f0
+EBUILD os-prober-1.78.ebuild 2233 BLAKE2B 7fa1535d0b90ec18c1ec2a49759915a786f35657a1bbed560239fed784e87d8517b2754c315017013f72398d6159faff5178f9976963443fd42ac52c6210f4db SHA512 54cb1e72251533af64b65675b1fb5833c699f9f91c6d20586268e5300a7977e2d95dcd3e8d32629ac6aaf45a9fecc434151aff4d7e656f577ae42f17c15b2f14
 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild b/sys-boot/os-prober/os-prober-1.78.ebuild
index 0ee253a646f7..ba56852a216e 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober"
 SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-3"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index aa985b19e6b7..5b7454e6cd04 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index aaf368bbc087..fee0ab31cfc3 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1,4 +1,4 @@
 AUX disable_create_run_dir.patch 632 BLAKE2B 9b4c817cbf77de4b33063f42d832f729542da24cbd9c8c495f5383562e1228322e3c41321f4c2f09b9745dfc56420c74cc94dc380a7780d01dbd71a1f5a04d99 SHA512 4ef81f24a21f200881f2ff94ba9d39f1b097362eb371623a62dc7d66c7e174e3e7a465be85856c7c5ca8a01d8fe725bd9d713f871af8cec3c25bc94811d7c415
 DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
-EBUILD ploop-1.14.1.ebuild 1407 BLAKE2B dc7a9d264b26cc186b324f8cccf125fac8859a3d6a6e670e0a274278b11e51a5bc917daa641a0edaabaefd999dd73ab5bb35a26c6b85a9ca9c33b46329fcc7b3 SHA512 12f92b7f53d240b3ec801c5260169ba77e851a4d751bbc88a467bd320c5e05dc1560f09f5f605bb69d869caf20625463e07bc62054a1ad13f2a90c81bb87aa54
+EBUILD ploop-1.14.1.ebuild 1465 BLAKE2B ca02d9dcb3a5b7fbf509ba511f2c707866d157451d9a29078bce451447281b4545d0eac65b317aeeb04afd78fcee34cefc9df11dee53df28469321eca57cce47 SHA512 ea81975710843518d76d4e60aad9fc4927b252dbb69173209c92678385f1ed5bbb7ea55ce2ba4ab4b543b4769540c0c8fea85a1650968c239e4c046d08c53464
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
index adb736dd7bd0..3e65c0a61516 100644
--- a/sys-cluster/ploop/ploop-1.14.1.ebuild
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs multilib systemd
+inherit eutils toolchain-funcs multilib systemd tmpfiles
 
 DESCRIPTION="openvz tool and a library to control ploop block devices"
 HOMEPAGE="https://wiki.openvz.org/Download/ploop"
@@ -58,3 +58,7 @@ src_install() {
 	default
 	ldconfig -n "${D}/usr/$(get_libdir)/" || die
 }
+
+pkg_postinst() {
+	tmpfiles_process ploop.conf
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 913be3a7c4f4..320caae035ea 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 6b62036e2a04..ed89747bbddf 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -5,7 +5,6 @@ AUX automake-1.13-hash-order-workaround.patch 529 BLAKE2B 92706c8c87aa1722de4ee4
 AUX automake-1.13-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3
 AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55
 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
-AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164
 AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
@@ -18,6 +17,6 @@ EBUILD automake-1.11.6-r3.ebuild 2566 BLAKE2B c1e28e5349f89560b320f0fb61d63a18e1
 EBUILD automake-1.13.4-r2.ebuild 2643 BLAKE2B cfb0517a6dbee72711d8f25f4a86c8cfd73ba821f3ed58ca86035d380d5b03102f1a56037257515a21247f1e42d74637df2cd71496a74e5bc47c798c72d9699b SHA512 41dd36863935300680001619afe6fa931521bde40e07c1b226899a09a5ed7ed67603074bfeb2dbd1f51dc0d3a3c968e83e4e64c9ab732406a0983e87c95ad79d
 EBUILD automake-1.15.1-r2.ebuild 3192 BLAKE2B edd43338af2e12fdc25c419bcf452e014a64f23aac91d57d727d61a4125dcc047406a954b8d3b5d02a6232b528b25dc2b4d210e9caf76814453f9793d1a7ca7c SHA512 6de009d30ad3126f93f1c3b705ef44181a385e042488aa206cdc5a9aa7e518da79e80d5853e8f4f73fb3b3c682882afc48bec625ea7a881c63ca7d675a605c2d
 EBUILD automake-1.16.3-r1.ebuild 3518 BLAKE2B fa4a284c5f1564170e2d2ba0dc6f7e414d0a947b05c8b59e53a9622f93827add33d4551de53fff5fefd0e85b2fe7d9ddbe7e9032fee21b7ba6cf6a27cf217c02 SHA512 6c45e29f1304a2d219774359025c23c7a8bd20b99317c6a2c6275ab15eba935ac716da256411d002622574c4a48de9684f6fed2c4e4f6cb9e0bae1d27f8725c0
-EBUILD automake-1.16.4.ebuild 3520 BLAKE2B 8c9f6e221b6a2e24a4684176df3c52afdd32d0b75983c2d2b19e74a64da0ba08366d7d8d0d67ca52257e59fc1a07bc3e2ed9abab60188ca3c90a54f67eb774a8 SHA512 08a7fe18d0579713291abfa6c3e19731ede6801c99a6620f49cc81e7b2c1cc096643e2df983a3b6ac0e5203bf6f57a69a8b8b304d6236d2fb501c1e6e51e605f
+EBUILD automake-1.16.4.ebuild 3519 BLAKE2B b7eb1e9a55101b3cb7316ed0a4cfb59df54868596b0f411a24d5755c3ca09e9a228e43806247fab49b17fd29ea3a25c0a4554eeff8f2dfceacfdadeed15d0e18 SHA512 360b99b548ca535af29485639e41e9f46cf47c5ee005b09f3f369c4a9d3167e128b9b83113433ccf7d9cfbecb0d0596c1e1b2f1e67d3a507c0efc15e8e97f990
 EBUILD automake-9999.ebuild 3438 BLAKE2B 120512bd6dafdd2c420159c87ebb547f3fc9fb2fc7614bd6334032a6402e76e3b4dc6a39f9e331ecc5b8eac354af5bf3661697973bbeaa42ee77215dc5f039e8 SHA512 a0c14464bc86c69ca843333db6cb8c154219c1493ec49dfe53cea86b2681962f51a65aea1e80490f81bf04b2d1983fa0322608f7d4d0839b4f883594a2c3eaa9
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.16.4.ebuild b/sys-devel/automake/automake-1.16.4.ebuild
index 6f14fab673f1..4463176df362 100644
--- a/sys-devel/automake/automake-1.16.4.ebuild
+++ b/sys-devel/automake/automake-1.16.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips 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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
deleted file mode 100644
index 268548d1e9de..000000000000
--- a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH] bin/automake: escape '{' in regexp pattern
-
-Based on perlre(1) documentation:
-.. in Perl v5.26, literal uses of a curly bracket will be required
-to be escaped, say by preceding them with a backslash ("\{" ) or
-enclosing them within square brackets ("[{]") ..
-
-References:
-https://bugzilla.redhat.com/1239379
-
-* bin/automake.in (substitute_ac_subst_variables): Escape the
-occurrence of '{' character.
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 0c29184..c294ced 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
--- 
-2.1.0
-
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index bd6960e9a046..34b5787d1eae 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,4 +1,4 @@
 DIST binutils-config-5.4.tar.xz 7332 BLAKE2B 1dd0fdebf028e9d95caa395948037d51ac1e627f370921b56fc99a6fe2e2100ddb202c8027ad1e67330306de8b4cbc6a03753105d401198e515b22fca94f760f SHA512 79411afcbec3a6cce960be1b06e4a6efdf55081992f6a92157737f7ef41fc61eaec0005078a4ce0cd78ad6af14583ab85f4f2b7b43808238088d521e1aa31af1
-EBUILD binutils-config-5.4.ebuild 1104 BLAKE2B e4a56ca3a2c5d89e56114dc1e9dfd5087f3075dded3a773bc47726312dfe34f9664f81954ab818f1cb97d891ea235baf6272e08274497f08586f692d9eb79483 SHA512 fed4e014fcdc459c57437c37940f850cb14718ac6611e2f8c12c2d64e8741f64d3b1f8c828d88c443c452377096311d0bfa0b1ce314c3915e1aeb1ea2cae0b65
-EBUILD binutils-config-9999.ebuild 1112 BLAKE2B 9cfdc08cc6f249c0fed771bdcb490e6a62e41ccfba929a0cc5f29d9d7c3f31365570896652046e5ada30e70ea43b839db886d8fd508fcc5d77a1b47088fbfb25 SHA512 38f079f8df403624be980dd71f6f218411081a48f74f502f6392dd602eb151413d5db1650e070f744eacb59a0ea936b1688628f56d5af44ceca8f81b78a97c7e
+EBUILD binutils-config-5.4.ebuild 1101 BLAKE2B 407acd936b18ea59abe4eb231fa03683ca845c2654ff59ad419cd1fc171e45f27342346702b65e21a74df76e95e4ff95356a5f8ecda462f6c720eaf6d2010d09 SHA512 9c4821d7373d695690ac2bf239debf4aec1e8e80ad0200ab2310291cb6a2b69193132f2ca2aeb4c694295b9860dea444c759d59333c95844b3e79fdc1813ff68
+EBUILD binutils-config-9999.ebuild 1109 BLAKE2B 5d0b7c75e5c9dd654fa7bae0c799358111c33bdf28a2ea5640ea89870afdcb883b1779459a45a4ffb4a4d012ba2ba871da02354d4bc34b455133ddc5bee15b86 SHA512 1c173599fe4003af42b8303348107c3a1e1b3ac247ca2334efac2d9c7189519dc64c6939c5062af3a321caef5d351f8f3f9eb01528ac8efcd2d9ed002778a1b5
 MISC metadata.xml 417 BLAKE2B f165e42734eb89e8c79fcd95bdbaef4ce0e80380867998cb649a669fea3ded3ce7326cca436cd6a5509b7a8948b3c7f01aea05b344f71ea5262517e67719448c SHA512 ed23d5be8b16265068b32816b4984e8cd07e62da7ab6a0adbcea1a826366f2844ad06b087c7b753d1b3a145b761608b83794133c0f84dfbe24b5703fb93344ac
diff --git a/sys-devel/binutils-config/binutils-config-5.4.ebuild b/sys-devel/binutils-config/binutils-config-5.4.ebuild
index 20b16e75f89f..11e69fe4f773 100644
--- a/sys-devel/binutils-config/binutils-config-5.4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
diff --git a/sys-devel/binutils-config/binutils-config-9999.ebuild b/sys-devel/binutils-config/binutils-config-9999.ebuild
index 5e39f373e5c4..be7e03ed3330 100644
--- a/sys-devel/binutils-config/binutils-config-9999.ebuild
+++ b/sys-devel/binutils-config/binutils-config-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index ec5491402b83..c93b2c0c4db3 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 593 BLAKE2B b67b21c9d61f523ab9f32d53114763ce95348100e985d96c9ccbae2b9d5ad698fbc174001091c4f9184ecdf904a4d00a9449c28cd09a1e173d885dd1e7759949 SHA512 707eca3a5b53a104c3350cc42f5fe01df9ef17ba4863dbd00093b685a052da67825b7e837820ecd23087759fe2057ae1fbb00b391c79653dacf2c94fd1261342
 EBUILD clang-common-13.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
-EBUILD clang-common-13.0.0_rc2.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
-EBUILD clang-common-13.0.0_rc3.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
-EBUILD clang-common-13.0.0_rc4.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
+EBUILD clang-common-13.0.0.ebuild 598 BLAKE2B 4bcaeaa6c64e882067cef81c495839c752b54864284183f0383be63dc07ebaef1758b1e870486c2c09b8f42d0ffabba7988750c60a0eb4d83e42ac3a934239fc SHA512 d0fb7add5034bc118c6246d0b01954e07c8e401571ba9fa3a9f11140cfa1606a3b1f48f788e4c8bb4da1fa5a7bbc591e21a4363d3179e194d80b5b7e2da0bda8
 EBUILD clang-common-14.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/clang-common/clang-common-13.0.0.ebuild b/sys-devel/clang-common/clang-common-13.0.0.ebuild
new file mode 100644
index 000000000000..01622c6e875a
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-13.0.0.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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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-common/clang-common-13.0.0_rc2.ebuild b/sys-devel/clang-common/clang-common-13.0.0_rc2.ebuild
deleted file mode 100644
index 03e4441b91b9..000000000000
--- a/sys-devel/clang-common/clang-common-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-common/clang-common-13.0.0_rc3.ebuild b/sys-devel/clang-common/clang-common-13.0.0_rc3.ebuild
deleted file mode 100644
index 03e4441b91b9..000000000000
--- a/sys-devel/clang-common/clang-common-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-common/clang-common-13.0.0_rc4.ebuild b/sys-devel/clang-common/clang-common-13.0.0_rc4.ebuild
deleted file mode 100644
index 03e4441b91b9..000000000000
--- a/sys-devel/clang-common/clang-common-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 7f8b46edd770..6151267a29b0 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,8 +2,6 @@ EBUILD clang-runtime-10.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c
 EBUILD clang-runtime-11.1.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
 EBUILD clang-runtime-12.0.1.ebuild 704 BLAKE2B 5d728bf389420018e991091d36e5d289d1cc3f4c060b32287021764f6406dc5550c9c74a9b4ce9b57e106d500baa2aee697975c82c387f71f981d52eab5ec450 SHA512 1c8e8b81398526d51639af2363cc0bb434f422202ff89fdee90ba0b4ae0755e8714590ab682b1fe9174655a32c60fea5bc1ccce00ceed2afb9adf746b1eeb237
 EBUILD clang-runtime-13.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
-EBUILD clang-runtime-13.0.0_rc2.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
-EBUILD clang-runtime-13.0.0_rc3.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
-EBUILD clang-runtime-13.0.0_rc4.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
+EBUILD clang-runtime-13.0.0.ebuild 709 BLAKE2B 5b533ae47cfa4c8c5dfa8b0a9383c5d39cf8bd43d5ea3424fef3dfab89e18199c01e9263f94b354985be82cf3268a0b7accc09d6237d3cbbbc3e7f81e0099807 SHA512 28ff3e688a68b5070de307fb5a7a040488b1e1e8464ab440e2186b2ab20dcef4ade742180b74db91909ed79f66a511da4eb2012af0f1575ce0d6dc7b13f2c8c6
 EBUILD clang-runtime-14.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 MISC metadata.xml 579 BLAKE2B bedb10265d687b5c8c6af5ff9a9612076e7c17c3ddd479c8fe9eccf6e13e74d55b182b4bcb17d213aaa55a57f4b29ee8f90287d6f08e7ebc20b9c4724773f376 SHA512 d872f42ab248387aeb61a42a9858ef80e0c278079e472ccd9d3099515d3c6acc6b38ea2e992ff58df31798a71baea2df19834523bcb64c609a842b8f0abad532
diff --git a/sys-devel/clang-runtime/clang-runtime-13.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0.ebuild
new file mode 100644
index 000000000000..b3f915df904c
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-13.0.0.ebuild
@@ -0,0 +1,24 @@
+# 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="~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 )"
+
+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-runtime/clang-runtime-13.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc2.ebuild
deleted file mode 100644
index 218cdb1426f6..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-runtime/clang-runtime-13.0.0_rc3.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc3.ebuild
deleted file mode 100644
index 218cdb1426f6..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-runtime/clang-runtime-13.0.0_rc4.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc4.ebuild
deleted file mode 100644
index 218cdb1426f6..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 fe51b01ed299..9cc389da2f04 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,25 +1,20 @@
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.1.0-manpages.tar.bz2 191571 BLAKE2B d6f8e1390dd3e6e8bbcd66c0079ef89f2ff3479743499c36ab32f8bc8281631a96113df9a87f6284058365950f4df3c75dacfcc11920fc5ea7ef0233ba842b77 SHA512 2543e519f51cc7ecb51a732c658ec5d35c5225e30a677f24ead75e81fb1ab793a030e79f21d0b702a2cf6ab6da1a2cba839b49a98e1b0a36384e98076ed5c4b1
 DIST llvm-12.0.1-manpages.tar.bz2 191582 BLAKE2B a049cd305c257875d47e92d703c51aee8225854f999eddbd530c7a978704a981b05bc0819ba31a2f2a218d3569b078f0deb01b0eeb385966253b54a0fdc090d1 SHA512 9931a57f843709aed59193524fe980af695e4e23c8f53ec3cff308677ba4fc520ca58032b50b68440c7762305855317d9a705fe5ccbb543fb104f4deb5d10ea5
+DIST llvm-13.0.0-manpages.tar.bz2 202595 BLAKE2B 1a3a389e8c544675f7ba2692f92bb82a83beabd6c595211806ef7f473e1741ea633a773edf623011d3d011ef2ee7a1611fc9620fe921eeebe1b99c3b8b3a0652 SHA512 344139f3123169776e0fd603e605bbf537d15d80ff56ad60e66ed1639a9dec53a8ac5cd088c8e14c8b7a799b563268445562293ba1d4efeb8db438cbd9cb5fb0
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-9999-2.tar.xz 4064 BLAKE2B 4b29234f10ea4ab2609e83c71bcd5f968cd93abd275c13366146ca899bbc576d55a3364432cc7db353739f5da5762529436689b848857e839e230425d551265b SHA512 c0d40a81bd11dc6018d7b3789e4ca7e1cd784992d44fab8d750b8b5281db39ad9092d320d125cae93164d2dddc42177a173b6d5e4158e4b62d7507db877acb9e
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 EBUILD clang-10.0.1.ebuild 11423 BLAKE2B 865c3da940bea204f8e1136aa75409234523a03a6bcf2439a5dd6c0c7ec33888ba6a0738858e5dcd57fb1b804eb646a1c7d6ea87ecac4882ab7f2ee38a1a71b5 SHA512 7e1edacf288f45223f4db6555863287ca89759bb678eab91083422c1c1fe9d9b46c216c1afd5fe47817aff7bfcd86f841f6573a4a20049c47bb5d14f878d6166
 EBUILD clang-11.1.0.ebuild 11781 BLAKE2B e23c30f931cd121b8cc56687faa5900cacc71699a53b06ad2a9daa139537c9fb98bb2b1a0e9ab0dd997299f4afb013187e6f68e93942a0015a223332186ae082 SHA512 ce653ca4ebf0283e2ef9008d0781841a422703f81a9b6eaae61229a203fd65d6ee8ea58c577c5a917f8385c127ab246585b8576838d0e3c28d57afed834c7917
 EBUILD clang-12.0.1.ebuild 11934 BLAKE2B 475676d2f39c8fd4943613f38d370c38e54003843b3b9d66a36a8d922e61e284270ad0ce418e5654e3d68836e3e5a2da18f7632e6b7c69efb006ccf24cc1d04b SHA512 a0e45bb854a63cd79d10971d43c80a9db61b2841f0ff7d2ea74d4032ddd7cee1aa6cc46ab3774373310e005924fc92fe45ba0cd0dd2a3fbbd320bc4f2a7685b6
 EBUILD clang-13.0.0.9999.ebuild 11418 BLAKE2B b974e7829f010dfda3cfd0918bc49641a06cccd5702e997cc1912f072e4cf190ebdc037863732059283083aa14f7b1a1d7702869391ba7956694169f6e5fee98 SHA512 62edc3b9368f456618cd1a74ddf8c95d5bf698f2b7d1c27194da8daf7653354522b133614388abf29e9c749bf445a1bda31c240c3d488727e06616f90585067c
-EBUILD clang-13.0.0_rc2.ebuild 11422 BLAKE2B a0199f2280543aa22d5e7bc6da47d0326d34e794acb75f4dd059c9506810cad53f74bfaefa8ac0684a8747921f1b4761f30bc3bb51f7df0c1af6084be31fc2e2 SHA512 511a09a8d88c856472845d03a993f93e99654b10d4442e2cf43183b62a6626d504ef1206c838b911a5e9e73d1b2c037249a08ac4395fc25f7fa3caedd0e29dea
-EBUILD clang-13.0.0_rc3.ebuild 11422 BLAKE2B b94064371dfec96cea89164338ac5f81e0f416c83fb20df55d89c06c8f196c7ad0e9de841296f60ab6d6ebca263c665e8d3b81a3e3296281db4da64bdead9005 SHA512 d1030c58e22c8720d3f6647524ca51fb5ebc79c126762711cb730164488d230395dab54d2d276cb5ac1e69b81db002b56eb3d1bd55025a71ea1b6ce86d6fa6ca
-EBUILD clang-13.0.0_rc4.ebuild 11421 BLAKE2B 3d9f22720aed21b22770f824b65f6ddc60c22d3ea1d7675e9be681002daac90e7161e84f5edf587b5fe9d02000b4a8869de9070ae9f22ea798d8f61fb794bd09 SHA512 ebb77eb6134fd5c3363d18bccee82b2ccd167fb3e75a0136dd424b421cc236ece79c57e41f2fa99361d34c501b75d7709ec819735d72605eed12d48f42ea10ce
+EBUILD clang-13.0.0.ebuild 11501 BLAKE2B 44a93ccdb7f81e6868a74c47c96e3516b1a24d691d5766b46f8ac99f8a090a135ae614a5b76be37a6e608e63d3e6be9f3d1622522169553b9a9b423415e414c7 SHA512 fda8a93a3fab4c6ac95d9d05d8e6b948f419493d648fed14b3ba3878fb0c3155f32f312fbce8b4cc631da391f7aad12abfc30b241e6f0cfa1b99967437dbebb4
 EBUILD clang-14.0.0.9999.ebuild 11418 BLAKE2B b974e7829f010dfda3cfd0918bc49641a06cccd5702e997cc1912f072e4cf190ebdc037863732059283083aa14f7b1a1d7702869391ba7956694169f6e5fee98 SHA512 62edc3b9368f456618cd1a74ddf8c95d5bf698f2b7d1c27194da8daf7653354522b133614388abf29e9c749bf445a1bda31c240c3d488727e06616f90585067c
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-13.0.0.ebuild b/sys-devel/clang/clang-13.0.0.ebuild
new file mode 100644
index 000000000000..09c153fa3857
--- /dev/null
+++ b/sys-devel/clang/clang-13.0.0.ebuild
@@ -0,0 +1,426 @@
+# 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 multilib-minimal \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+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"
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+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}"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+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=pregenerated
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=${PV/_/-}
+LLVM_USE_TARGETS=llvm
+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/clang/clang-13.0.0_rc2.ebuild b/sys-devel/clang/clang-13.0.0_rc2.ebuild
deleted file mode 100644
index 5003b7995d1e..000000000000
--- a/sys-devel/clang/clang-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,426 +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 cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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}"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-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=13.0.0-rc2
-LLVM_USE_TARGETS=llvm
-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/clang/clang-13.0.0_rc3.ebuild b/sys-devel/clang/clang-13.0.0_rc3.ebuild
deleted file mode 100644
index 6ed4a618f02b..000000000000
--- a/sys-devel/clang/clang-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,426 +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 cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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}"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-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=13.0.0-rc3
-LLVM_USE_TARGETS=llvm
-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/clang/clang-13.0.0_rc4.ebuild b/sys-devel/clang/clang-13.0.0_rc4.ebuild
deleted file mode 100644
index 6fb09213aaca..000000000000
--- a/sys-devel/clang/clang-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,426 +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 cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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}"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-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=${PV/_/-}
-LLVM_USE_TARGETS=llvm
-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/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 3089bc167411..bcd79e541b6b 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
 DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c
 DIST crossdev-20210718.tar.xz 28640 BLAKE2B 1e9b9313a5c9a1cb4d82f00e4979794d61b9eaa0035c575ac55092c6c015d820a590c5816d212a4ffad95b96a3dd99a9b94ca7c20b78a7d7b062f16dec6ed329 SHA512 e1a37aebf759abaa30f071f43a528f9059b83456e71fd86fc8202a7eff5c506c1f34fdd260c7b91a03f491b9f2a107ce6a65c2314845a352176fcc5a27a766e2
-EBUILD crossdev-20210621.ebuild 835 BLAKE2B 7bd6d380e0f5350789565ae0015f0af94867dfb66a34f8e0444976628a882a339ed301604e52173c3198ccc356fcdd5c995df119751083ba5c158d46071be0f3 SHA512 e7878f12d7bc34b4b4071109f2aee8a2c97a3cead759dfc1ea7577a04ac5931b93bc450daef6f0ed7d24dcbd6efc2ccdbf53d2ab58775ae71b136d00ce9daecc
-EBUILD crossdev-20210718.ebuild 843 BLAKE2B 7b7c9367ce02aa03ba5bc7a011cf34c34d834e901b8ba70fb9794191ef5fd03e76d7a1fcaa0e7b422385684c899c42b344ca639491a55af23533e3ab6aa14c44 SHA512 d8b99fbc92399e8a5c54a7886f797a4c2de314de7135d055da252d118212b5d15e7cd206db7fc9fd0d2deabbd5e9c573647c1d42de25e7b20508d59afe875884
-EBUILD crossdev-99999999.ebuild 849 BLAKE2B 4cfec8c7a42eef2c0802ece43629d0ec28a4d0aa5dfe8202c7b18cbe1605692dbc26d3c30a37ced649b69aca04d7d78a26f7811079d4803d8346b53578ecde91 SHA512 0b0b84ff9ec78ae09dbc4ebee6f2e6ce80afe116d0e1fb38bb82b73d378860ece7a8426f454344717e65b3268186cb25e2e003eb718aa3117e34b88704ea0314
+EBUILD crossdev-20210621.ebuild 832 BLAKE2B 3253956c99cefc7045f6e127dc319b0861fa251755db320ec0bdff9738b3f9480df6c94fe29a6a4597a25f30baee8a86bffe2eade232600d556136840c741601 SHA512 7ca8f2d6dabd9cd3f47b9fb9e09647c70c1c5d321aa832a2ed515c723903a87acfa0b90648c512c921e7c955a53ebc312fefeb6e459b2707a7d5c0c4140250a2
+EBUILD crossdev-20210718.ebuild 840 BLAKE2B e4774046a16df9e3a9956db328aad6ca3ac95fd00b683d4960f52bf28178b05baf62b471447dd84139b4d5942b9b33e8b8f39b5316d32e9ce93ba3317e3bda77 SHA512 4dbcc4d6cec4eaf17cf736b81ffafa0ccfc61737f949e277feca6b266b709dffbf4051a228d017140cee58abced205740209067daea452f3f10d64138c112741
+EBUILD crossdev-99999999.ebuild 846 BLAKE2B 98fc8f0163037fd839dfd9f386b0409263bafb7796fbb6f0cf35f557b78145280b91d4fb1307999240cb03f48ef7f16c99cfad703b69338878e3032b786fe2dd SHA512 6f3019e3796dd91303425d249ecd661347efad4251b80ca2baca739551828215d7e5613512be0e50f772130dfd00afacdd3f3c832581154ae7abe7007d2d106a
 MISC metadata.xml 381 BLAKE2B 1d383a0b95cc180ed7be66205a9525f0a3e973a9b7e296c463e3a735163e1b673140a82dfc0a21ad30d71cad1b482770fb3a0028fef32593e6f7b53df127dcef SHA512 8074c54c17718021de7fcd8aef8b6c137eae75cd41c5dd02f86c987f7465d98af449f92a67fccd489a4f0ab0670ae89fb737e290be37a225acb81b8f1074446f
diff --git a/sys-devel/crossdev/crossdev-20210621.ebuild b/sys-devel/crossdev/crossdev-20210621.ebuild
index e0b929130ecd..59140a11c278 100644
--- a/sys-devel/crossdev/crossdev-20210621.ebuild
+++ b/sys-devel/crossdev/crossdev-20210621.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
diff --git a/sys-devel/crossdev/crossdev-20210718.ebuild b/sys-devel/crossdev/crossdev-20210718.ebuild
index ffa357b2d207..b7f11a2c01de 100644
--- a/sys-devel/crossdev/crossdev-20210718.ebuild
+++ b/sys-devel/crossdev/crossdev-20210718.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 93a07aa0b20d..72dc1a5881fd 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 42a8c6d055f9..ba90fdb68935 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,4 @@
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
-EBUILD gcc-config-2.4.ebuild 1275 BLAKE2B b6340119be04417ad3445d2004ea0bbf9502da36b46dd2142790a434700a6bedde3b42142b5905903ba00456ed90849a07da276f35c7d4789066a7aa8de2ac9f SHA512 1d1d4047dd123be6869cbf912a331f960d48f292ded426f05000da11b01ddfb256918bfecc890dc3ed71c1d0f242d27c0b0910deb418d82905b0d7ff96beec57
-EBUILD gcc-config-9999.ebuild 1528 BLAKE2B 2748dbbcd43c80df61ee32e744059d421691298f696d3db52d51bc8084b72da0971df1bbc22a224713690268453585e9d84ab57de94c6ba7fb25d9807c049986 SHA512 bd50f91b0ea31a175ba83180db0bfb6e3252f8c3afcfe64fe11d4abb7721accb6aebc49288fc9ee4989539adae5fa82fcbc41c0f042c7a625ab600b47806fe52
+EBUILD gcc-config-2.4.ebuild 1272 BLAKE2B 31e191e6b22c9cd3487f4c19313d1494c53d6723a98fc8de8d166e660cc9971ef9b67c1c59a40b28ddd84ff48120d13c7483cc16b3d19ffb756a968158e3e222 SHA512 68251bfc3a5bd36393fba65ba49ed7f4eb7a758960ae68f0ba52b4eb18f79bdd016e137df5a02b5ec1a5094591a47ca121cf5688f87581136c3ea86fa62b1756
+EBUILD gcc-config-9999.ebuild 1525 BLAKE2B b4a52226ab76034d1af330a90408276a107e01cdfa727050b84e76392b3179688d37c11cb3de6c7295a66373095dfcfa7481121cd2d1de0b52697b235020fd73 SHA512 26017e3c01a1ce72795ffeb194c8893fe9161c514b32ef686068cb2b33e204b85418b4b5ec349b20427d304c0e1b285caa205268a4caccb1af5ae6d816438555
 MISC metadata.xml 533 BLAKE2B 09d7ad23670553dc578f92d35dddd92b9421d7ef75e8920498bb16e451cce64a626a7479ece4c1ae1f8d7b67b5cd79c7033d0cf87cd48a788639b6f746fda5cc SHA512 ce12b8cbbe543ee3a1f51cd06c577ec5e99f48863445053858f36ae50ea68e1100da598dd44cef787de0cce8ad392350f95e7fd9071b70aa488a0d31cce7e22c
diff --git a/sys-devel/gcc-config/gcc-config-2.4.ebuild b/sys-devel/gcc-config/gcc-config-2.4.ebuild
index 2a704b191de1..7eccdffac24f 100644
--- a/sys-devel/gcc-config/gcc-config-2.4.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index 2af22f6a6333..a2b5cb735263 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index e9b33c21610b..ec032459fb54 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,17 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf9351cd2fd262fb3cf1894013b3059800dd856bc0e896af7fc75b381bf353e1d22d43fe36d5859a2086b983 SHA512 6d1ba9cf7ab959da15975b4d1c3117f0a235618bfbf0bb743d73447105ab6672b25e839cadc34415b721c8755eb28abb2ddadb8c4793d3d7f4506f032e4d868b
 EBUILD lld-13.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
-EBUILD lld-13.0.0_rc2.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
-EBUILD lld-13.0.0_rc3.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
-EBUILD lld-13.0.0_rc4.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
+EBUILD lld-13.0.0.ebuild 1671 BLAKE2B 8f04ffcf0837a8000f5de80d36034b33b83458918f76dbd7ecfc5640d07cf2c9fce3b6b8e49138cc97e9d2a05051a4e5cb9d68b1a77db5060c861d018699ea28 SHA512 e054b3d29377f6b396366370026b54e362de3ba20e4b5ef971b32610a1b7de57ec24eec94d4586b7c453653249840260eb16aca795a36c2a29a3039fa37f8d8f
 EBUILD lld-14.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-13.0.0.ebuild b/sys-devel/lld/lld-13.0.0.ebuild
new file mode 100644
index 000000000000..28e940174a88
--- /dev/null
+++ b/sys-devel/lld/lld-13.0.0.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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+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/lld/lld-13.0.0_rc2.ebuild b/sys-devel/lld/lld-13.0.0_rc2.ebuild
deleted file mode 100644
index 68762b0a03cc..000000000000
--- a/sys-devel/lld/lld-13.0.0_rc2.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..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/lld/lld-13.0.0_rc3.ebuild b/sys-devel/lld/lld-13.0.0_rc3.ebuild
deleted file mode 100644
index 68762b0a03cc..000000000000
--- a/sys-devel/lld/lld-13.0.0_rc3.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..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/lld/lld-13.0.0_rc4.ebuild b/sys-devel/lld/lld-13.0.0_rc4.ebuild
deleted file mode 100644
index 68762b0a03cc..000000000000
--- a/sys-devel/lld/lld-13.0.0_rc4.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..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 3218c233fa1e..31c547fba587 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 608 BLAKE2B e34ba1cdf1c8522f3622106a88a56dc7c6cd5bd227db31dd610d1879f39842052feec45235a197fe63f8834c8bb77a410632895746b448e50931abe31275b49d SHA512 83df951b72eb186aa705ffdc3b688df2d0bba4884f76c526e1ae4b4f7acf5afc4ec420038bdb89eed41938d84ed1feb52df8bcf4454fe9d72e5cdd0d48788253
 EBUILD llvm-common-13.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
-EBUILD llvm-common-13.0.0_rc2.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
-EBUILD llvm-common-13.0.0_rc3.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
-EBUILD llvm-common-13.0.0_rc4.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
+EBUILD llvm-common-13.0.0.ebuild 613 BLAKE2B 960b0e06a84ef48bf0f0ef0e174b475572689d9a8a477f8b0a1a336203e1c8a3c5d034010a8e3e36251a0e0af95e8be9891d4ef77527122c173d65ff6e45e48c SHA512 7e4fdb7fae1bf619a2c2bcaae1486b8687431576bf3dfd856cfe2ecd618a77fa20a66f66ad692131cea71b762f3c7818ce677dceb58c3d45b145a4e2a9a3cfce
 EBUILD llvm-common-14.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/llvm-common/llvm-common-13.0.0.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0.ebuild
new file mode 100644
index 000000000000..a2e51ece1ffb
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-13.0.0.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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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-common/llvm-common-13.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0_rc2.ebuild
deleted file mode 100644
index 53511a0a20e3..000000000000
--- a/sys-devel/llvm-common/llvm-common-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-common/llvm-common-13.0.0_rc3.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0_rc3.ebuild
deleted file mode 100644
index 53511a0a20e3..000000000000
--- a/sys-devel/llvm-common/llvm-common-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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-common/llvm-common-13.0.0_rc4.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0_rc4.ebuild
deleted file mode 100644
index 53511a0a20e3..000000000000
--- a/sys-devel/llvm-common/llvm-common-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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/Manifest b/sys-devel/llvm/Manifest
index 320e19d9135d..d982bd414600 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,25 +1,20 @@
 DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
 DIST llvm-11.1.0-manpages.tar.bz2 191571 BLAKE2B d6f8e1390dd3e6e8bbcd66c0079ef89f2ff3479743499c36ab32f8bc8281631a96113df9a87f6284058365950f4df3c75dacfcc11920fc5ea7ef0233ba842b77 SHA512 2543e519f51cc7ecb51a732c658ec5d35c5225e30a677f24ead75e81fb1ab793a030e79f21d0b702a2cf6ab6da1a2cba839b49a98e1b0a36384e98076ed5c4b1
 DIST llvm-12.0.1-manpages.tar.bz2 191582 BLAKE2B a049cd305c257875d47e92d703c51aee8225854f999eddbd530c7a978704a981b05bc0819ba31a2f2a218d3569b078f0deb01b0eeb385966253b54a0fdc090d1 SHA512 9931a57f843709aed59193524fe980af695e4e23c8f53ec3cff308677ba4fc520ca58032b50b68440c7762305855317d9a705fe5ccbb543fb104f4deb5d10ea5
+DIST llvm-13.0.0-manpages.tar.bz2 202595 BLAKE2B 1a3a389e8c544675f7ba2692f92bb82a83beabd6c595211806ef7f473e1741ea633a773edf623011d3d011ef2ee7a1611fc9620fe921eeebe1b99c3b8b3a0652 SHA512 344139f3123169776e0fd603e605bbf537d15d80ff56ad60e66ed1639a9dec53a8ac5cd088c8e14c8b7a799b563268445562293ba1d4efeb8db438cbd9cb5fb0
 DIST llvm-gentoo-patchset-10.0.1-3.tar.xz 9244 BLAKE2B f568b8eef92f048f08fb6618e7e3c69f218c73c71f85c498a341cfc06f892c15fa51011913547bb61f3f8cebb826b75276304fdcc4552b78d103b7fc6113e240 SHA512 1d90d5c990e6b7819681609a06c8b1cd5e094b9f9647ba486079abcdec375cd7c261ef1c5b41aa614decdc595bf830e1d325fb66b070cda1945bb6c7f08668b6
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 12620 BLAKE2B 34f9ebd56f6381d3d88a82d98abc9cbec2c8ec7a35bf2fc297f9d82afb3927d991baecc95c3d76db35d1f47d171ffd6be0b1ac953b1c6605866b94aeeae9c9d3 SHA512 fbe11d194f5c049f1bfbcfb606351282e2cf5c74a58a1980f5b9b663d3d811bc6906e084d557e4169b0c15017e9d4c0c73c842116547e60946d883b91f38aae9
 EBUILD llvm-13.0.0.9999.ebuild 12097 BLAKE2B 5d514804e1296ab9f37e2da9fe2e1bb48f670f088ed9a472bb91ad42126785c444d6cd30ce172127d0146c3263e3a635570c633b06f90455bef2e3ace27f75a3 SHA512 8b9d9309a92d2b6319e467716725754810acddcc4a49daffe86177f0114687749611281a140eddc6562f06211afad852872abc7904517f816b04f54b9720ffde
-EBUILD llvm-13.0.0_rc2.ebuild 12101 BLAKE2B 3eedc6c4b114572bd5afff7e782d45b0494ea61dce46267b56defd2379d427096ffc462989bdf0486a3ea6bcfa412941083140e20c67dfcd79ab1ff9b04a8365 SHA512 e764117a06d6f5627c5873863bdec3138a3cf03f6dc528ab91b01265657104e0e4a601afacdcc5458ea688308d7f254985050a5aa48f0104f92fa8a3048ae508
-EBUILD llvm-13.0.0_rc3.ebuild 12101 BLAKE2B f7afccd0377ffa69fdfd00cfcb554b216e1b5f8a1f143409915a8fdbb7bb70b87aae5bf05860f8ea33da56cca19916ec49884597b056d8524e30a7dc54413c00 SHA512 67ee4262a435781484b716cf667700e86e9fcd505fdb7d7fca960494e2d6cc6a93e43c6f97f808c828aff417c75c5ecd2175ea824451d03e9ab3eda62854ebfd
-EBUILD llvm-13.0.0_rc4.ebuild 12100 BLAKE2B 6342babced2c7e2879fdc045e575976902970a8c5a40271a2a7c93041e0d5444c5e9faafccdab66f65b24142a525595864b597519aaacef5b2b8cab8bb37f3ec SHA512 124a9a2f996560063599bccebc84d4598940651a7068c403ca4978161e4014f552278505f16f66fc1b29503da2201d64a1bbf81c083ab6ccd345240903cd324f
+EBUILD llvm-13.0.0.ebuild 12191 BLAKE2B b6d7823e2f97b3aba292a32579017836bb04c406dda05af68d7bfc79a9a320de66b18abf91f510a6cc212cec73315c921961ee86ad6b828a5d2e6f5840cf316b SHA512 06d9ec5df9adededdad43544ec94bc30bd314936c686f55ecd396fe6fc0b0b67d4f0dd1db8f861970a7a837e4329dfd1864ceba90b376be702e18e611ef87f02
 EBUILD llvm-14.0.0.9999.ebuild 12097 BLAKE2B 5d514804e1296ab9f37e2da9fe2e1bb48f670f088ed9a472bb91ad42126785c444d6cd30ce172127d0146c3263e3a635570c633b06f90455bef2e3ace27f75a3 SHA512 8b9d9309a92d2b6319e467716725754810acddcc4a49daffe86177f0114687749611281a140eddc6562f06211afad852872abc7904517f816b04f54b9720ffde
 MISC metadata.xml 2564 BLAKE2B c7b78f9245daf8990548c13cb0d2c773616b6b17713794f3887028a452649bf0b9aad10d6e9366839afec9d4fbd5a3fca923435cd91a738648d1e22e2b47c89c SHA512 57a6324a8b3c0780459fd37750532d28ba8e004885c7ca4b78c91d22e97e168e479a8ebddcf32803f8825a090eac2353ffa57775b95a49c08b821ae502c86218
diff --git a/sys-devel/llvm/llvm-13.0.0.ebuild b/sys-devel/llvm/llvm-13.0.0.ebuild
new file mode 100644
index 000000000000..0d80c618e3d4
--- /dev/null
+++ b/sys-devel/llvm/llvm-13.0.0.ebuild
@@ -0,0 +1,511 @@
+# 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/"
+
+# 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="~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"
+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=pregenerated
+LLVM_PATCHSET=${PV/_/-}
+LLVM_USE_TARGETS=provide
+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
+
+	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 [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_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/llvm/llvm-13.0.0_rc2.ebuild b/sys-devel/llvm/llvm-13.0.0_rc2.ebuild
deleted file mode 100644
index 31f75d41c825..000000000000
--- a/sys-devel/llvm/llvm-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-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=13.0.0-rc2
-LLVM_USE_TARGETS=provide
-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
-
-	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 [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_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/llvm/llvm-13.0.0_rc3.ebuild b/sys-devel/llvm/llvm-13.0.0_rc3.ebuild
deleted file mode 100644
index 6eaee99b46f7..000000000000
--- a/sys-devel/llvm/llvm-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-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=13.0.0-rc3
-LLVM_USE_TARGETS=provide
-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
-
-	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 [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_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/llvm/llvm-13.0.0_rc4.ebuild b/sys-devel/llvm/llvm-13.0.0_rc4.ebuild
deleted file mode 100644
index ee6e126425ca..000000000000
--- a/sys-devel/llvm/llvm-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# 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"
-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=${PV/_/-}
-LLVM_USE_TARGETS=provide
-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
-
-	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 [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_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/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 7a1c5a77e934..f345a124be1e 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,6 +1,6 @@
 EBUILD llvmgold-10.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064
 EBUILD llvmgold-11.ebuild 571 BLAKE2B 43b8417652b96027c4556aa936f6bd00e81e9826a2002afebd0f7ca3803337a33eb5e31d3c454bc094f5bdecbe30827bfe4a5c65a86c511478ff5ab0b4d0e4df SHA512 717119361f1c86e436947ea74ff5a574c6c936d1bfd6d9ef30e3277094994e69bdce9c7f496192667a28de44443f819e94f719004ef2dbf6006f2c755a11d5a5
 EBUILD llvmgold-12.ebuild 563 BLAKE2B 65f91448d0a5995875cba13b41844f47761f833f28f023911ed96a9ba8ccd42419ba7f6fa7d59c65826a807c793a2d62c7269ff912717d3e92ac2d94a153fc5e SHA512 ba55b6ff2d801b227435f5c2d425c113566caa0f522d80a9f52154357f4772a5206c0a00f99c2422d59098b1632ae98fa707f2ec33d68918b3c463b5e11685a0
-EBUILD llvmgold-13.ebuild 544 BLAKE2B 30824a2e7dfa3cd1d94a6edb202e8ee4ab1f58e42c2b758f8f70672ae5e0d5f28b90d3b8e3335a603944bf198bbe96da99cb99012c4476ad8d04dfcb957fa55f SHA512 0d7c2e55023f389fb43d92dbcb5002738010142cfe637bedf4277240e09c2d644f4601d0e1ff7f1412902a72f4df7e3234fa3a53e401bbdc6c6a5425f78f724a
+EBUILD llvmgold-13.ebuild 568 BLAKE2B 50879838b655d97f262de3746d98352c25c589d00cd77b6319fe77ea015517a6b69e6817541a430ba07cdf35637553627cab25a405f11147758c4cfb5fbda690 SHA512 1bd4272d41fb7f500993a33609881739b47af5683908ae091e15cfd1a0d521f2d23baca586f9243e4179350206175f1e780e6315efe0b125bf403589894e6fdb
 EBUILD llvmgold-14.ebuild 544 BLAKE2B ed40bafc272fcac21165e838269dc10ba282a0166e2ae67b56150156e5b5faf1ba473cccefd557d98eebc5af3f396bb505d65329a0fed58f5b846208ad286ef5 SHA512 1c50636022ab1c5467be5305ba5d8501bf5c121518c00cec0d5d6b0977f2b406c1c2911ebcb7a37cbbc29ec11509bf1079ad054f626793828ed750e80d6e21ab
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/llvmgold/llvmgold-13.ebuild b/sys-devel/llvmgold/llvmgold-13.ebuild
index 3bb1b5358af3..2237d20d0a2c 100644
--- a/sys-devel/llvmgold/llvmgold-13.ebuild
+++ b/sys-devel/llvmgold/llvmgold-13.ebuild
@@ -9,9 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
-PROPERTIES="live"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
 	!sys-devel/llvm:0"
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index f62c57aa2d66..73822330ab31 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 7864d1b65f9f..e8b3813cdb62 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,6 +16,6 @@ DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c
 EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f92f7b915ae546faf831cd52954b8f78e98419faeb54200189d0210c2d72057fa05997fa848fc10a42cbdff3d665a47 SHA512 9a9fe25e5766f9fc88fc22ac3fe796a3229a36bdba5c08a7648df8dcea0e8502fa9ada2ab3ab1aee2466f67bbb678e3e500ee99e2fe24b3e8b77c4bdded33a32
 EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
 EBUILD seabios-1.14.0-r1.ebuild 3921 BLAKE2B a09d2c72a1403fd258a62e6b7af04efa19316ba3a9c042467ad1afba80176391c27b8e5f10d45ba7fa5894b541c3c7af1d4e4878d076a93ea530b96e14f26535 SHA512 8b9793cd7d7dada46e7b6e25c314e5227950e7eeed7608ecc2768b9f640c7d10a91db2b6e6d8b54e36c2c196ac907db781023b440ec360caf7dbeae6c6a9cff3
-EBUILD seabios-1.14.0-r2.ebuild 4300 BLAKE2B 8e38950eba25614f57641b009f5dfd5915063589fa4ab0e4c9727be0bad83232e32782dc1431a46c624243bca22f088af3434ab24681dc4068db3dacc8da95b8 SHA512 e61accc0b997bdf5c63f2b17c1997ccb1ea1da9aaee15174e7cc45332199d4153d293e9685f6bbc5a9ba44b541e04f84265cf78fe232f344e7597a6ed1428c90
+EBUILD seabios-1.14.0-r2.ebuild 4297 BLAKE2B d29c5ab488a101a9a97e3f06a35ae6edea6accc993d3cd07db42c62f83641f111547d86843da3f62ef0ce8f278dcf51b1c79a9d75433002e8f2af2f46e28889c SHA512 0cdb384eeff86d6deddc4dc91b0bdb547c1057f6ac6dfd54a4991abeb5985a219daa0a2bb9fd9226496f41d55985a0cbdfe7b7d9d70bff5176269df0361acb56
 EBUILD seabios-1.14.0.ebuild 3772 BLAKE2B d85c7bcbf55536018caf679e2d611eedf5536557aa6e6f7a76e664b9db3922fcb40b4d19c8dd2f29b711f9afbea824537dc7029dfd3595ef388c8fa04e6d482d SHA512 7b67858c146b4e7a515269d32363fc2cdbee0f4a36b094ddf60b9f2c8fc34f74d82d9364d19c6dffe3d1d56f158b2c232b4b3b114e37c13d0f84907cd87dd033
 MISC metadata.xml 552 BLAKE2B c04d6ed849a522fa91d5698915ce4a2344cf68301fa7a4a1b1c3644be4892a36920b1daa83afff6c4296877617e394a2565699c3ba34e92acb9b6dc52be34adf SHA512 4c92f35b58ee8f41b2a9457f830ef33962f831e854fe87982579a78c65df7ae5d74c54fb7a90ab837e51229a8ca0d75ae84c989e92c2f679ec9a91ed5ebb7561
diff --git a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
index 22c08e1b9bed..37b8af0969c1 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
@@ -24,7 +24,7 @@ else
 
 	SRC_URI="
 		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~slyfox/distfiles/${P}-r2-bin.tar.xz )"
+		binary? ( https://dev.gentoo.org/~sam/distfiles/${P}-r2-bin.tar.xz )"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 79d967a0a4d1..580634af0b56 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 18137fc3c6dc..ada32c77aa4e 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -4,6 +4,6 @@ AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
 DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10-r1.ebuild 1584 BLAKE2B 071ba66543118ba53e2893a9226bf6716d12250f226759c38697e43eb6818ebc5904389de3a9b839e20f912a211021cf7a2cd60594ffbfa3a0a34a01a7b23f9a SHA512 c158d7c153336ccbeceb63a1ba2c26dc3779fad2ee92ae3032e4a8e5275ef7d3814a2dc692a20d0f983587f396081794f43ccfe9993f077c82658af299e6b4a3
+EBUILD cachefilesd-0.10.10-r1.ebuild 1591 BLAKE2B a3d6ebd05893d4c76c6950ba663c0bb56032ea7afa588918a521cfb6fba2071336cfb06a892cfc4129a81e19ceea3199a9b5fe9a0c2dac8cb83b6d66943103e6 SHA512 131abc35e1a4ad7085d7510e0f0fe94ed1045ccb85c4c0bf902b630932d479d3c799f2967db63d94aa887c25340fb68e5cade54e8e4acf8c8c7dc6e301cae05e
 EBUILD cachefilesd-0.10.9.ebuild 1501 BLAKE2B 40541a5c37516de1694a7bf485debe1ea56cae9a091e2456b34947c5d1b169083289150809c2777447c1ddb949650751d5a1e37b1f3ad0ac3896c7b5fab723f3 SHA512 80a5038fe9cbf257e981f1d54ebeed81c49b7a69adb7cf55092478a474732ad0c9dab4667b50913873ae39c8cb3cae6556f55668d2d47c76cc39ff9aebe23e94
 MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 48fbad06a93a..7b7c61767c29 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 3753ca43846c..71fe504cc25c 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,5 +1,3 @@
-DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5
 DIST duperemove-0.11.3.tar.gz 158445 BLAKE2B dff7fdcf8468933c21753a8253067dddc400d2baec4052cd70cd3d94e92ad6e612bb24ffc12ad4a79e356747dcf4ceba15aa3bf6b3fca4a7a0b829f7c2783391 SHA512 0669cbb8a08082b9c2b62aff26759951e3e2c1b2236676ac6d79b9639027f775e4e5a218d1c7930b33ad7cca39726764cce5ac3063dc7d2049eb65fc4431af89
-EBUILD duperemove-0.11.2.ebuild 701 BLAKE2B ed3758942b72ff9eab25d5244f2fa6f2c476f921e1e89da8c2274b2b460e7d88928592d21e27f9d9000647865d4eb1d31156a880542b72422dd5f0da2a64acb9 SHA512 26300436e69b9a46bc0e52bb70fd29cd178a5a7d83b0f86a07a36bfcc40a01995461e2eafce0060c038297793ea92f25e8d0eee1b0a609d722347ac0935be3e9
-EBUILD duperemove-0.11.3.ebuild 703 BLAKE2B fd83f57c2e03341d436ff6fa65beb9b49a774d8c362dd5d207e87a6649cfec66230fe7e76bb63a54c1e7fb01068863462509f3119478b0e0c5143fa6b0fbe900 SHA512 e7f8f0177dddc8c94d73d093e363635da90da24f1c8beb2ddd240e122aaa0188a53328788febf5e803ca954301d2cc5c7d781b176329f25871e719b17d62c852
+EBUILD duperemove-0.11.3.ebuild 701 BLAKE2B e97ff112928f733e72f6bdaf1687fe4aa4ea8a8ec3c39a7a8a5393095bb78c841ee3047118ef6bb80b39a30847d433d554b34b6077730e9788021332e6ae4a1d SHA512 6144301b1501f93716df4b59a339658526eb9a0993ce91fba393fe5841e3db7f8ca3641d51d2f0720aba10130c2b921b0c80e61a6871dc733da9ffbd5d6aa6d6
 MISC metadata.xml 334 BLAKE2B 375ee51b86214e9cc0d3b68727d83314d2694fa25f36758f7af1e691bcbc620896576c4f957809429d527ab0d9e6c6464af4850d13991b7174f8118901fd9985 SHA512 6ff5e136e085723546f070d388e9da22a902461629c799985fb2563c3eb3ca7b05794b4bcc96bedee97dd5a65551b2c74aeadbb3e2880a3ffa6426a9fea05bac
diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild
deleted file mode 100644
index 62cb077c58ad..000000000000
--- a/sys-fs/duperemove/duperemove-0.11.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-src_prepare() {
-	sed -i -e "/VER/s:0.12.dev:${PV}:" Makefile || die
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.11.3.ebuild b/sys-fs/duperemove/duperemove-0.11.3.ebuild
index 116961235a22..e26abe5c4f9d 100644
--- a/sys-fs/duperemove/duperemove-0.11.3.ebuild
+++ b/sys-fs/duperemove/duperemove-0.11.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ed700e6e8e15..903f85136dba 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5
 EBUILD e2fsprogs-1.46.3.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.4.ebuild 4014 BLAKE2B ac2a45cb2877a952fbe58fbc0d15d3110ff250a65a103933a0d952d371ca0917bc9e481b141da0963522d312ab72fddc59200bf178c6f64627963d3be5b17bda SHA512 81971cf3e057093ca600fa5041b01449ee321bd8293f07d62283b62fb755bace5791b9eb173d080a668d39131cc64146092ff579ecdb7792e93e95f53f805b29
+EBUILD e2fsprogs-1.46.4.ebuild 4012 BLAKE2B 5e466745b9bd6535ecd6df07130084f0d78f0077ae6d021fbcd7f480693a3a26bab4f7f5b8727a1240a7ca7d5abf1ee8f58252da5aa45ed2fb2aa98da35bc45a SHA512 a2dbd3e5c3a9afcef08180fbe3729bb6c383f19d305325d9656179841d65456c2c74e62a4957beaffe69adac21721e53fe9120cbc03aa4573d3e28dbf1f7b857
 MISC metadata.xml 704 BLAKE2B a3986eb376f5e2416b1588bba5de134c62c45f0f0d952973f8a6adafbdfac19e81111f0b558592c914c71b072d1e51a6d98dd89f2488f9abbd5b81ebdf3906db SHA512 3059a0e8fd73db411e44749af435e061eda76fe908cbde14ce6e1ed3cc316f5f3e895632e92f789ced0b96766124eecf61885444755615ced25e137b32e9f7e7
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 2449fbcf989c..31c0a571616d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index 64e2fc33c855..3efc32a07f2e 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,4 @@
 DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e
-EBUILD exfatprogs-1.1.2.ebuild 610 BLAKE2B 1b5155d52daf7ea081cf27d271fd177a8faa04df22e2e386276083e60dffa23b13a6d82645fc61b7b7f1c0bd9703aec2e971d0896e980a47239646a966b04cda SHA512 1f9e98d10ec4bd64db27f7b78859e22866d51e6c49b4727e4c7cc0ab6a3db95998c50a5656b139070a8eabc051dcc89e72b9bc1988dc4ac2a4f067aae3d57247
+EBUILD exfatprogs-1.1.2.ebuild 617 BLAKE2B a1a86d9e39e1fd4dafb16f7a2c0ba0aa368d36ee343e10d39f0001de8cd2c5b8067835ea9da556b30ed8b9a414ef093d034f59e0b423910200bc1ae353308183 SHA512 a55c4bd6113876be8ab39330bd3e50736a69165728b941359b984853b1ae06f49ba93b0b872a2a6dde16a5997f0abf747154d4f41b2c0e9e53a95745f8e07ec5
 EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
index 51882e697520..2746d008abdc 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index caf061d2e16e..5c95ac13f228 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
-EBUILD f2fs-tools-1.14.0.ebuild 823 BLAKE2B 6ddd43860f467c53c5abbcf0b0755b9a0980eeb0848d66cd4d559b89040e03c48b5ffc1db6db8048110217338e6084ad25678038a17f34d1bc6fdada25676b30 SHA512 29c40a964b8a0273d1708a270a3d8f39323ff5e996d5487ba7c0d51e3c0613f7d79f75a305a04096a57070ff09e4d0bcb9a483d918b867410f637cdaff714c11
+EBUILD f2fs-tools-1.14.0.ebuild 830 BLAKE2B 0a28f29ca8c4e1ceae7d119bc892413387c22772f52f0b5bfa7b53489e690970e5e186a4ebbf09b23c030c4a2fedf33c6ec15ba2534a69d4cf7ded95dade5d12 SHA512 610cdcab1942c5c8b116c7772bce50e933509035cad24b6a3c6bc9421e6113d5e6c09c78b94ef06a9fe496ba59bc34238a59706cdb856851d10fe19916ed73ee
 MISC metadata.xml 439 BLAKE2B c7c467cc754472343e7e4473b79e8a70ed5f2f34c94292db772c93ce8018373dd8fa2ffadb26c93febece4c5b5faa1e7eb1338dbd7f516c208f1e2e17bfea82f SHA512 8045798ff0308394ee5cdc172e13776291089d63769007d2b5c13a4d50f27fa1a1fec3eda3642cadd068d91780788d0d504faa6a17e754521d3f7e02934eb41b
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
index 91ca217cb65c..abdb5ccaff97 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/8"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index b0f189357c68..19fef16b1344 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
 DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
+DIST fatsort-1.6.4.625.tar.xz 123964 BLAKE2B 4d958886af48e9f6d6a39b128b5ff96b809e67667026483a5abfb3db6f16d8a5ebb257433f2a7fbba6c7e4d81614477cc4cec437bcfba868a2c2fb6b13b15c42 SHA512 1d67c3cb515295d0a47054803e5b2a625875e71f41b2fad17f9d495b6aa4a291776696692545800bb4d5b826e9d622ea34077c81f7f08f41b8dfd70491e439ef
 EBUILD fatsort-1.6.3.622.ebuild 709 BLAKE2B c55f68dad837981f511e25ac7d2dc5071a5efb025022fc8a9ccb54c231fc91db94e1ce3f8a438d44293071a7f0f52d207f7950d0e43ca57fb6ffd43c4cdadca0 SHA512 4eb71498be5f0667a82f8b0be259c6a7c599b9e34c13c26b408165a38b41e31aa3e6eb8e657e8b0ae27cb1eb2b4d792cd0a781c922ca3199cd46d3065078ccf6
+EBUILD fatsort-1.6.4.625.ebuild 711 BLAKE2B 98a7271583e4808a605fea798490cd528a5a294736c7b53e219eed05250145b5e528be8d8dc8b4805c7b97eaf96ceff7a98ef1adcee79afd4501b4ce6ebf35bd SHA512 4f2149fdc9eae0503a0451f4a749fdd664bffd97f318ed1ab94bf67c36ba94c862719cec8adb889f4239bb0618432f6098839b09d1a466153fb7bace3f159bf0
 MISC metadata.xml 739 BLAKE2B e9c57a69520793f24cfafb131edfb6b94cd1d0cccbe74494835cbbd597ea6ae0c5d6eacb54bb82bb21acbf2db0ed0b27988cd5e228bfc092c847aceeacac10da SHA512 1983abae2f5d444b6a20039e50606dbf9a9894dae4a0f95b2337f60e451e61f0b7f556c8906d4bb5611ed1bf5201412a677e3dacf6344a4903bf44be13d507aa
diff --git a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
new file mode 100644
index 000000000000..85bf5c3f3520
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/usr/local|/usr|g' \
+		$(find ./ -name Makefile || die) || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		man
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 0c1fcc61a68e..329247a5153f 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,9 +1,9 @@
 DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
-DIST inotify-tools-3.21.9.1.tar.gz 91378 BLAKE2B a7d5d7ed2f63e186ed68d42ec443c43ae75e575d553221a11cd6991421d5d5b8c5447144a2e5cbc7dbad1d603e3cc120429ef5c91ac67994a82ea530c54142c0 SHA512 2a4d9f2e98b1f0263745c533fc06cd9f23bf9c793e9a8a3a944c7312f8d2b8e223caafbdd17b81e6dc0e29d85dd1730aef9341ed282992b4333d6d79cbfb3f99
 DIST inotify-tools-3.21.9.5.tar.gz 91711 BLAKE2B cf6575cdd445a823c8272a9f8394ed241af1cc729784ec363c9dac6cd3c5cf37856076e88d389669d9da768b899e7ecb64c997e25b42cd5fccc2ebbbf145b273 SHA512 d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97
+DIST inotify-tools-3.21.9.6.tar.gz 91668 BLAKE2B cfb279d69e650b275af03052f4f76522670b7a563aa4e81bd5883b3ff825ecb70382cd4a5d48a9eb50b59930685a60b59a17376958d111d129c61fbced47a6bb SHA512 206eeebfd948499d81e6666b153cd7d9b05df618291fd3ada6479251b0773ce629c19f73117442a9093f028e294c5ba2dfa0aa4cf711510284ab7cad657da21c
 EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7
 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
-EBUILD inotify-tools-3.21.9.1.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
-EBUILD inotify-tools-3.21.9.5.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
+EBUILD inotify-tools-3.21.9.5.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c
+EBUILD inotify-tools-3.21.9.6.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c
 MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild
deleted file mode 100644
index 1cc912c8d9cc..000000000000
--- a/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-
-	# Remove -Werror from CFLAGS (#745069)
-	find -name "Makefile.am" -print0 \
-		| xargs --null sed 's@ -Werror@@' -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# only docs installed are doxygen ones, so use /html
-	local myeconfargs=(
-		--disable-static
-		--docdir='$(datarootdir)'/doc/${PF}/html
-		$(use_enable doc doxygen)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
index 1cc912c8d9cc..f9459bef6394 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
new file mode 100644
index 000000000000..f9459bef6394
--- /dev/null
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
+HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror from CFLAGS (#745069)
+	find -name "Makefile.am" -print0 \
+		| xargs --null sed 's@ -Werror@@' -i || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# only docs installed are doxygen ones, so use /html
+	local myeconfargs=(
+		--disable-static
+		--docdir='$(datarootdir)'/doc/${PF}/html
+		$(use_enable doc doxygen)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index a0f68a97304e..ead90bd8c3a7 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,5 @@
-DIST loop-AES-v3.7s.tar.bz2 376972 BLAKE2B 0a4dcc6aeadfad5c33b01b48c53d6df55925be2cc0f85c2e96b61b15a60d42d7868fa9c32ad5ef3a13caa5e1ab4407792aad32cd60a57b094348b355cd688b22 SHA512 25f7d9218ae83c4c1fb5294bc405267c3a4e20954fbd7a45effb70ebef4014625b8cc93c7d69be220da4a04f4cd4b429763273cdb6cda497a6a31888d47ca1d1
 DIST loop-AES-v3.7t.tar.bz2 377808 BLAKE2B 77a6baa31be9efc84504e6eaccca87193180b26ec6f6dc824480453e78905f8763c08fd72a63c18950796ad0b70ad8be2ed26e107cded6dcaddd96433dfa7f56 SHA512 cb0dcbfa7639f8d2c1990465a44cbcd6d4bf065b1df9178f4dd524a8b8ddd05ebb860e6a9d9425b4a22b9c74342bf3ff232ff777be9b5458bdabe54f4097ecef
-EBUILD loop-aes-3.7s.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275 SHA512 62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
 EBUILD loop-aes-3.7t.ebuild 1751 BLAKE2B 318ecaf349eb7ef78e506352c9a20c3ac5d77b7d8e95dbd14c5ea8e8d6000018fdc16ba10ad7806d51539167a5a42978465ca4693c8b9b0796139bee05aae57a SHA512 f0dbca7131097f5c9e58623991085a60bfaea2d6f70072da714485ede0f1b89b27dad78f322a8bd4e77d8b081ca95f347d7d8098a3c3735814f47aadf4aca94b
+EBUILD loop-aes-3.7v.ebuild 1528 BLAKE2B 9774785e6db9f11ad9191e3b4b761b05507b6f613de6d347a3a756aa5abc4d63b7db56826b6345bf836ca837fcb8bc4f81fde6555c027772d2434931e32672c0 SHA512 8edae2efb1686106bc3f4a625f9a7e0e5da5034e80019b37be5ea568eefcc289916aa81c919e7d64223efcec5e21172994aa9db557f3b3d2b675102ff443c58a
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/loop-aes-3.7s.ebuild b/sys-fs/loop-aes/loop-aes-3.7s.ebuild
deleted file mode 100644
index 6879462d4158..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7s.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
-	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-
-	into /
-	dosbin build-initrd.sh
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.7v.ebuild b/sys-fs/loop-aes/loop-aes-3.7v.ebuild
new file mode 100644
index 000000000000..3061d50ad0a8
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7v.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dodoc ChangeLog
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+}
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 470cbc9260ea..bfbbab0a40b7 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,5 +1,3 @@
-DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
 DIST mtd-utils-2.1.3.tar.gz 383897 BLAKE2B 75aa73440101bb4bfc753b7e0b8371c141ea6b648aa3928c5c121f4976e01c37770d09da3683376891a9899d46c6ccbb7685b32c70f925e63916c552ae720037 SHA512 68efffda2077e14560b9c0b0e40ce8567aee21096c2a3e19bfb6febc3bc11d56c4ac5682728f08b6d215754e7cb39f956a3ced1f6bde3142f0d6ea8492b9bfda
-EBUILD mtd-utils-2.1.2.ebuild 933 BLAKE2B 245fd61df8a47518240c74599b7a1685df48f57cf6fc3f4a77768d95dc5a7199486260be4d92ce3573a500456a4b9a898ed23c3cc0280c93b80809b23bbb00ac SHA512 fafb5d790b20eefd5948a479e1926b768be4e148080530043d2c0fd3619f864101c7db8b4c20c0add9d47d237a9b33d15ef463587c5c717b4e9c9fdee384731d
-EBUILD mtd-utils-2.1.3.ebuild 940 BLAKE2B 6c008f89ca77212d9355948e4ab9cc1fe295f1a6d5298a2b7faf3912a69779e391200af47f994908cd001d822d994775e5c957892a3bd7a33e6a8ea9fbceff65 SHA512 80fbc3648d2de7dbdf342c291da1ed2cc5017ea176c7739a9172a39d361968c6153700b419a4e20ba313bd324dce9a9096ace83a3baa6146b5d94f26508ef500
+EBUILD mtd-utils-2.1.3.ebuild 936 BLAKE2B 83f6ad80a8fb59eeadca556df36f5f46b86d48409cdc29a26cdc7787b31ede27f6a371833d53943e143190cd8aa4e668a88299794b0d2503c1acabd56302e4ac SHA512 64e9e1a4485e4fdbd586aa0fae77a817318f37f8f92f91b0113c74a7babf97bbede2f26b1799d36d0b6bf215d341bb908e7e2e69012823d004c61e57593ae99a
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
deleted file mode 100644
index 88222eda3de7..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo xattr +zstd"
-
-DEPEND="!sys-fs/mtd
-	>=sys-apps/util-linux-2.16
-	sys-libs/zlib
-	lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/acl )
-	zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		$(use_with lzo) \
-		$(use_with xattr) \
-		$(use_with zstd)
-}
-
-src_install() {
-	default
-	doman \
-		jffsX-utils/mkfs.jffs2.1 \
-		ubi-utils/ubinize.8
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
index 0f873521e8eb..0cfd35235d4f 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index ebbd4969922d..b08e838004a2 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,3 +1,4 @@
+AUX mtpfs-1.1-deprecated_lock_init.patch 803 BLAKE2B 1e7e1cd45cc14ffd5300583f386bc2ff1199e9086efa148813f6b03fdd4254cff4b8136d5537dfbd9d8262cc1f17fdb9a0ec2811951a346d59444715b138f3a4 SHA512 d93a2fc04b4d09de89b4227a05d88f4a1d139098cd50bbd6970c746c090b44600572682721b48c5a59ac62f9584592aad0e6c17dfd6740f98e372346457620c7
 AUX mtpfs-1.1-fix-mutex-crash.patch 2115 BLAKE2B 13e74f735cf415d3b8a1139244d4c8f90a4d7d4482cda4de732ba6141e5988b5bd04faf29c8855897469f7e221414dd042be7042ff6c0a1349eec63c76df417c SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1
 AUX mtpfs-1.1-g_printf.patch 166 BLAKE2B 73c28b822a2ec2cc016bcf4adb037ec4b7b24dc49ecd7c5ad118edc09e970524c7976a95c04de4c5adeae575930912fb7eaf65c175226cff4f5665d2801606b1 SHA512 97ba9291dbcad22c149f5edb89fd67a92b678843caa7b1fa397c9d2c6205bfc591c31696f108732eef9b20bfe767df8e33d5a356d8e975c02eb0a28f773f2006
 AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B a0d2c486ecb01a11af0f4ef486a28d8dd7d09fd5516372fb37e8adf5010a00e4fe6972bfc5f0ee4baa5e801276df5a54d55c1c9942f0790477384ecd015b1d1a SHA512 a61beb4a5c5cfb2d6682e3962a63697c7c9bfd2692780c2a9cb0d0c5cf3f8e2ef545a1c3cb4c91329e9991ee27db37322b030c8fdcfb0eb40a81b1293d48f884
@@ -9,5 +10,5 @@ AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.1-r6.ebuild 1252 BLAKE2B 286cd29e1a7d613d10f03faf234056f48eb8f2c4659cf7734503dea215533a4d4e07bd2de048c365b4d949f59ce494ecb55fe6ebe35f99228997800805d14e39 SHA512 bca08bc35807b316c4b0701df9fc0c413686c7bf5886a9a86204500751e7b92e59e2f1b8cf25b5d9d25fad1a6d803d47aec0ff573187c433a315c62c7e238c6d
+EBUILD mtpfs-1.1-r6.ebuild 1299 BLAKE2B 0b570be9013efdea2c897cbbb7854e01191523f6caefd9fbcb86aa0194726fba8571edc2d0a721630238687e7cfe919bc1b629e6ce9049dbac652052553bf9ef SHA512 a591ca2d241b26ed7294815c35c4f44e4dbef35098d87f45263f80e98794ebf1c5258cf4517a7e910d9c7c21946a35c4066bde92a483531aaf56a6ed2b55a911
 MISC metadata.xml 572 BLAKE2B 7a7e36f2ae5612b21850553cfbe139d1890625ab35c6af5e6ac7743283b60418fab05fdda51bca45131b033cd6f66d38ff8341414b753630c0e2dd3d15287b06 SHA512 0b400a93a50484a42d5cb9be206d4c233947de16692dedbd4163b692e5175ddc51d429ea0d3bf88c8f60502308fe29cc3ea94df7efdc58d17834be1a96a3c863
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
new file mode 100644
index 000000000000..d369ebfe1f2a
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-deprecated_lock_init.patch
@@ -0,0 +1,24 @@
+diff -Naur mtpfs-1.1.orig/mtpfs.c mtpfs-1.1/mtpfs.c
+--- mtpfs-1.1.orig/mtpfs.c	2021-10-01 00:15:15.763423589 +0200
++++ mtpfs-1.1/mtpfs.c	2021-10-01 00:16:07.626486888 +0200
+@@ -1371,6 +1371,8 @@
+     extern int optind;
+     extern char *optarg;
+ 
++    g_mutex_init(&device_lock);
++
+     //while ((opt = getopt(argc, argv, "d")) != -1 ) {
+         //switch (opt) {
+         //case 'd':
+diff -Naur mtpfs-1.1.orig/mtpfs.h mtpfs-1.1/mtpfs.h
+--- mtpfs-1.1.orig/mtpfs.h	2021-10-01 00:15:15.779423609 +0200
++++ mtpfs-1.1/mtpfs.h	2021-10-01 00:16:20.322502337 +0200
+@@ -77,7 +77,7 @@
+ static GSList *myfiles = NULL;
+ static LIBMTP_playlist_t *playlists = NULL;
+ static gboolean playlists_changed = FALSE;
+-static GMutex device_lock = G_STATIC_MUTEX_INIT;
++static GMutex device_lock;
+ 
+ 
+ #endif /* _MTPFS_H_ */
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
index 3bc2351e26c1..04dd5b86b903 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
@@ -27,7 +27,8 @@ DOCS=(AUTHORS NEWS README)
 PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
 	"${FILESDIR}"/${P}-unitialized-variable.patch
 	"${FILESDIR}"/${P}-wking-patches/
-	"${FILESDIR}"/${P}-g_printf.patch )
+	"${FILESDIR}"/${P}-g_printf.patch
+	"${FILESDIR}"/${P}-deprecated_lock_init.patch )
 
 src_prepare() {
 	default
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 9d902b6218b6..2b8d7f2f0380 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,5 +1,5 @@
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
 EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
-EBUILD ntfs3g-2021.8.22.ebuild 2094 BLAKE2B 27766b0410ed323c997bbcfdd5d1e302aefdfa985b2d38a1ec60a1b34ba90da4c0fbe5ea657bcf3c7461cdc5b10637b7d83eef3644c39523d0cf7401974b5346 SHA512 93848999d1b2a48950b2178c56dccbefbb384a63f936871fc2877052f738f50403655f8e3b909b32ece9b1b988930fde0554d35fbcf9d6314e7bafec2e300c66
+EBUILD ntfs3g-2021.8.22.ebuild 2101 BLAKE2B 5f4b74c7f0f149215ed69d120dc2b0bd556fde2646b4ff641a4a081826b7eb00198b999a2846cf8165cfba64e8ad28f40015938e2041b95a49a0b6a903d24306 SHA512 055b4a7aabe659361a52a6c469e195b4ef50bbfb784918e5629b270fd03e2d5f515e8a834d66e7d1c2248b9002dd5a6faaa2ad05651c70bcf3d1a32a3e9f2dba
 MISC metadata.xml 1072 BLAKE2B cbfb93f83a25bb707c6584f035d742513da2e423ec1f52fcebf25b6b34829bc429f7fbc38e2e3e76dd5ad2eca5f28d91072a0000ef83277bf84553aa6ff1e6b5 SHA512 2afcc34189ca0708f6d1cd15e9e249dc3ac0a150f4094c97a0d5745ca0b21f426676c3090df031cc8f234da38b2d13abb8ddf1583b9049d52ce2737833ee9314
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
index ab40a1ab9931..7e4c2ed5669d 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index fc9a33579111..6f5e110bab31 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,3 +1,3 @@
 DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104aead15e03196acaaa64ad8cab77b928fec7c08be7b9f5753594e1de1c21c9a9c3e863bcf5388d6e2090d04e9a9 SHA512 17304264388ae53e348d6aa870f0d23c29477344fee848236b46886c086221941872073974f804c0735eafd0cf9f7acdac7988132f03c0a87dba37467b5bda95
-EBUILD udftools-2.3.ebuild 553 BLAKE2B 82cceec792b3c32d351b79ed093bee70bd99adce8ad8ed072cbcd28a39e0c142c729783796aadc759839fcd6d74f0b35db7e98e6dc07b9dab8c19d3c306a284b SHA512 cd3fd750cf88ef890d491ceb87b37f1516faa2641cbae8ff13b4e23354c84de0b96362713cb436e2408c4b4f7e4165c6d346948d8fc4a15b4b2510ff34c2f436
+EBUILD udftools-2.3.ebuild 560 BLAKE2B 3da42d397004b68021c51a6fdaddc1ede14b2f669024ddfbdd20e1ca217cf960ed663c34c6c616fc63c800793b240583fffc8cdaa415d7e5d79c552652a7d245 SHA512 9e56b3cc0f15fd2e50acd993d132165f3fa3e1d65984d4b0f46303258b1756a0ea9c24efbee4c73e11612527a18e56a95f877d26fb099d89bc7d18cdb560c159
 MISC metadata.xml 390 BLAKE2B f13ee3ecfadfa4d89abd4afd55cd6c61cab21bb05094ef8f6ce70e81d116c3974f860e9839b5b1bc39bc31d439b6a5ca267fa7475040247718f51ba0f7d942f1 SHA512 37d975607cfb79777c4a77c73c1c8b9b1dbbc0cb6568e94bec8b6ad65ce24a2e951939151f26bb9afe80e3ea09399712a4f0d270e1287f6947caa64e447cfd94
diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild
index 8bd6a21db085..e3ffa7b9458f 100644
--- a/sys-fs/udftools/udftools-2.3.ebuild
+++ b/sys-fs/udftools/udftools-2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index b6e483499baf..cd0b8420bbcb 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,7 +1,5 @@
-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
+DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
 EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
+EBUILD udisks-2.9.4.ebuild 3652 BLAKE2B 255dff40822adf438c750c3b53da385d9adaa55e8cb2e75910b185ebe2f8471a33142f26697f5369dd8088910e0ec4d2b234016d7d04bd31b1e23183809f3831 SHA512 549a74771ddb6a89b3794ac3e51e6a0b6e5ef2635a9aa22759deb662f1e0e5865bda28813fd94600f0a7a37fb145d4b0a371054addd655361303e8cd57c75115
 MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671
diff --git a/sys-fs/udisks/udisks-2.9.1-r2.ebuild b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
deleted file mode 100644
index 57047f60efec..000000000000
--- a/sys-fs/udisks/udisks-2.9.1-r2.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
-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 sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-	zram? ( systemd )
-"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.24[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.24[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/udisks/udisks-2.9.2-r2.ebuild b/sys-fs/udisks/udisks-2.9.2-r2.ebuild
deleted file mode 100644
index 480609ab96ff..000000000000
--- a/sys-fs/udisks/udisks-2.9.2-r2.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
-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/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
new file mode 100644
index 000000000000..b15fdab52bd3
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.4.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.114
+	>=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 fa8802067160..1a36f1a56379 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,17 +1,11 @@
 AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
-DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
 DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
-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
 DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
 DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
 EBUILD zfs-kmod-0.8.6.ebuild 5481 BLAKE2B a367b1cec0374f6c9266bf599944ef5493eae21a91704572f806ec2486707a6d3cae876f52f97d527744c66596204b2dcdb435b2beb7cd182ca524cb991f8915 SHA512 014332fa562aae19d65c3f31ba1179e0c623dc3293e45e51323bb2b279641ee6926ac9d8cca3aba8407b44a2787be19abbaa3945f48e6e40f9aa27b1458e647a
-EBUILD zfs-kmod-2.0.5.ebuild 5524 BLAKE2B 09188fec56c553b2a5f1cf8f0047b155745ac023cf3656b9f2d6550cd3e208a08807f2eb31fad1c6412ea161a46d26fa82e981fdd29b843cc47ba647fc88952f SHA512 54ef09279cb6a1ae2610c3f78a3384da40af545a368e73701c1e3377972949000337bff9dc9daedc76734dcf2b641457a6a8ba4fae60ab8cec4626fcf64aa135
-EBUILD zfs-kmod-2.0.6.ebuild 5527 BLAKE2B 6f420e4b7ecfe938f73b14f4d735e91291d53608bbd784dcf60f74cc84454fc9a56a0e5f87397f1ce942888a1db46a62fe37aec60b03d915058c5539da69f22c SHA512 b3c13a5411ba13da36a729e5c258724ad3945a0b820953333d465b51fb601c640c4315977c3ae3abf28c5a39168c59c62b9b4e0eb0401fcff24761ebbf3ceec8
-EBUILD zfs-kmod-2.1.0.ebuild 4733 BLAKE2B aaa6a4be69435f30069a329854e0f33e963401c70e5b95ff1c418562d0556180659cb52f867475112c889a9d0596f2919fa5e9519c9ec41247f8128da394e447 SHA512 1f2829c7c1c317198e83594066c3e2aaa5931639cfa87920b1a1e1aff827da12c18cbc0ef340d1bda388efae6d59f4135f0ab85fb9f3923e2d8e6e7328deff41
+EBUILD zfs-kmod-2.0.6.ebuild 5524 BLAKE2B 92a1d66c9d994129b54957858eb2235f018df88e4a564a7dcfbe0a7d0d558dbbb81661a48fa0d6bc8a745cfff08b2d5f01a1263d2ef7a6b509d4ea4439d06e39 SHA512 37ca8be74fa3dbca773c76ddd60dcb9ce790e92174d400c4abb0837e6bce6dee24a3cdfa0366fa5e6bb196691ac9a17c976ee272516b2a918b872741f7c9fd23
 EBUILD zfs-kmod-2.1.1.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
 EBUILD zfs-kmod-9999.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
 MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
deleted file mode 100644
index 74e838c5764e..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV="${PV/_rc/-rc}"
-	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.13"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 arm64 ppc64"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	# Set CROSS_COMPILE in the environment.
-	# This allows the user to override it via make.conf or via a local Makefile.
-	# https://bugs.gentoo.org/811600
-	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-	local myconf=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD=:
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		set_arch_to_portage
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of OpenZFS includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
index e7c85c6b3e47..5c445cce099f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
@@ -22,7 +22,7 @@ else
 	ZFS_KERNEL_COMPAT="5.14"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64"
+		KEYWORDS="amd64 arm64 ppc64"
 	fi
 fi
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
deleted file mode 100644
index 3aa1db85dc33..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV="${PV/_rc/-rc}"
-	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.13"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	# Set CROSS_COMPILE in the environment.
-	# This allows the user to override it via make.conf or via a local Makefile.
-	# https://bugs.gentoo.org/811600
-	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-	local myconf=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD=:
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		set_arch_to_portage
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-		ewarn "create a newpool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features."
-	fi
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c2cc068a46f1..c91e5b826deb 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,18 +1,12 @@
 AUX 2.0.4-scrub-timers.patch 2873 BLAKE2B 40986e258ddc3c5b4dfdebc8c2126fbb2c0ff9ac947700fa30c547795612fb98b2778f364ee10ec47c05a6837c4d4129918a6efe7cf3ab5854910e1892a3e348 SHA512 0e557974fe8992a7b0e6c15e46fac55d265e469aa13f85e85b0abe449b5fe2e8c51cf56510863fa2e33c060f2b38c0c43a910a740172ef1d4c42c0aa85e04ab9
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
-DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
 DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
-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
 DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
 DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
 EBUILD zfs-0.8.6-r1.ebuild 6315 BLAKE2B 063ec7b7374c26035f05614ce2cab7e9d73993571edd22fbaa6eeff51b26ebdeba98fe7fae398f4201a12774a672fe444c1f0f56cfae8da7acd1ec35d92cd5c4 SHA512 5ee8f85b288eca30d3540b1fa8de11616f9095385190139478aa59942e0df7e5f089522e145c35ce900c288b1a4f1d13dda66c569a206da73050630b2f3e787b
-EBUILD zfs-2.0.5-r1.ebuild 8035 BLAKE2B 757cfe559c0f3f97f8feb4dae98938cfef68336947057a4520857842e3ff037ef26a78a7cd191183a439b3aab123a4b4b98bb544c5ea31b144beba6241a820b5 SHA512 4a918715cff7d63c00a4d6bcd7b72ecc0f9f76a27180552a98bbec59161ca920b53b077127163f81944a0d3afda7000bcc2dc5aecb7cc3a0d1bf12c347ab0b2e
-EBUILD zfs-2.0.6.ebuild 8038 BLAKE2B f7c2ee5b3a66001d1904aac338fa1c02252d283d7fbe85a39d1585eb2baf87f3bc40468f68051cb953129fe15090b5462999e1f13a52ba9a77c7a28a34518691 SHA512 00ace24909653a236cd742c688e1da57bad38cfa3d5c0261d0f2900326c85719dec9c4d6a554aa45ec170bdd9bc46002921b70830f18ea71505770143a5f0f0d
-EBUILD zfs-2.1.0-r1.ebuild 8088 BLAKE2B 02df4f77ce32bad5454b3a772447da4f87faae5a0fd247113236bc3001f37fd6a667ff6ae64916d2c98e767e14b8fe5ac682dda928aab80e6b09398c48906e43 SHA512 982e62c15298bef0ce0cd4f35835ee415c5f32082bbfcea30919f120c2390e8707c68d9e01e1509b801549e5293a731d5a75da5a7a27a6681470f9d89dafb33a
-EBUILD zfs-2.1.1-r1.ebuild 8213 BLAKE2B 599e9a41f8c47bf5d120bd0509f8bd1a5c0833ec1ab1981602148cf9f33012db3363d3e4b9f5fc1ce56b00d1732e56dc2e24561f3f2b0c6492290aa095f43c50 SHA512 3dc47e1c9ced2ac9c9c4f7f8532835da63f26d85e0b6713ec73b909ae3f4153c4bddf98224517da910441fad22b1b9a38d5c3f7ccb86a046d8b108ab663892d0
-EBUILD zfs-9999.ebuild 8254 BLAKE2B 85816fe265223812d55b688dfce5ca23de5be4f095cfa64aeed54a6cee481a22c749ca461e34fb774a02f96d91899bdaf103474a2f9a54c72dea01f61fafe66d SHA512 6677231a44923f7903f7da2d5631e1acb8915af272a0bb7c61afca1e3204dd26041be873cf79b99be404c2afc9afabe6dab06584318888833458d484b6bd37f8
+EBUILD zfs-2.0.6-r1.ebuild 8150 BLAKE2B 97f5d5db28d6202b7585be544b7fc4f70d19c04b85356525cea2a12a14840f4f5b09119fc51fd5ff7f7b83eee042fedab89f24ca0cc204b2f8e35be21cde38c5 SHA512 2eb2544cdfbfcd24fd9da53afa15c24afcd12eea817df3553022161f250f1d65ed0bac4600d0dc3c34c152df4577248aae3bc56d0a3b8193da9c83f6d2f5ef96
+EBUILD zfs-2.1.1-r2.ebuild 8328 BLAKE2B 4ced1d769042006a93d2a77fdcb89097179cee184704a2eb7ca6a0a1e651c598d17781ac2974221e68dc9bf10107be2a5e0c569f0e0c8efa9c84697f99538b59 SHA512 bcbf86059b5f49f52d408e26cc7fc49eb888b07114b3e0d9675931a5c88d70f4fa8e4daef0bbc87912ee4cb2e84aa507d402bb96163e7ff47f08e2789d929572
+EBUILD zfs-9999.ebuild 8369 BLAKE2B af151107e258c8d391616a9860b12f4394b81e0ef05eea989ee23d9f649f78c126a73a8067873145574c2e3798044363ca5ba5f79fcdec9a4dead46df63103ae SHA512 515a0f26d5c12caeedaf6f8b4c3a1b7c3c735e045980b2c600857ed9412e3b167cf1c02d921efad68c4ee97063a9db71dfff78ce7639357644e70db7d90cbe56
 MISC metadata.xml 1001 BLAKE2B 8e94a0d8e1afff064b3f8e4a7e3e6d34ad12d5fa550df2f3371b1593b0938b3ea0dbfdcd2e40023f4e91bbe12cf1f3633d92977e4f5b4ee10b56d5040f065f90 SHA512 fc7ba310676715f5daa59b30107560f9ba61cc7dc79eb74ff866e4c8f36bd6a414474a216f5c833dc46c6426e4c80a6672b488fab4178a0c00a47b0de1caf6eb
diff --git a/sys-fs/zfs/zfs-2.0.5-r1.ebuild b/sys-fs/zfs/zfs-2.0.5-r1.ebuild
deleted file mode 100644
index 6b91c6f5b816..000000000000
--- a/sys-fs/zfs/zfs-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${P%_rc?}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 arm64 ppc64"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/4"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	dev-libs/openssl:0=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	virtual/awk
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/2.0.4-scrub-timers.patch"
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..e12aebe76f0a
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="amd64 arm64 ppc64"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/4"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
+
+DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	virtual/awk
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+	<sys-apps/coreutils-9
+"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/2.0.4-scrub-timers.patch"
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-2.0.6.ebuild b/sys-fs/zfs/zfs-2.0.6.ebuild
deleted file mode 100644
index 4b474020cd77..000000000000
--- a/sys-fs/zfs/zfs-2.0.6.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${P%_rc?}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/4"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	dev-libs/openssl:0=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	virtual/awk
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/2.0.4-scrub-timers.patch"
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-2.1.0-r1.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild
deleted file mode 100644
index 2ab356846cf3..000000000000
--- a/sys-fs/zfs/zfs-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${P%_rc?}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	dev-libs/openssl:0=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		|| (
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/distlib[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	virtual/awk
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" )
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-2.1.1-r1.ebuild b/sys-fs/zfs/zfs-2.1.1-r1.ebuild
deleted file mode 100644
index b18fbb260614..000000000000
--- a/sys-fs/zfs/zfs-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${P%_rc?}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
-
-DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	dev-libs/openssl:0=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	virtual/awk
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" )
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		# Building zfs-mount-generator.c on musl breaks as strndupa
-		# isn't available. But systemd doesn't support musl anyway, so
-		# just disable building it.
-		$(use_enable !elibc_musl systemd)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-2.1.1-r2.ebuild b/sys-fs/zfs/zfs-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..36d16c857de2
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.1-r2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
+
+DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	virtual/awk
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+	<sys-apps/coreutils-9
+"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" )
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 43755044ed6b..6cf9307c40d0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -88,6 +88,12 @@ RDEPEND="${DEPEND}
 	)
 "
 
+# temporary block new coreutils
+# https://github.com/openzfs/zfs/issues/11900
+RDEPEND+="
+	<sys-apps/coreutils-9
+"
+
 REQUIRED_USE="
 	!minimal? ( ${PYTHON_REQUIRED_USE} )
 	python? ( !minimal )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index e70bde332b00..217025a276ab 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 6eaddb78bb94..a384b7191542 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,3 +1,5 @@
+AUX genkernel-4.2.4-fix-dropbear-depend.patch 1058 BLAKE2B 4f224d4b429d0f6f9d2d4dab7bcf0be79e1d5303ea69a17a0b28151881c50168577af5f622f5180f4c8d6cad70708d896655e10dc9771558ab1a5e5c000ddab1 SHA512 a88887e1011cefcc6cb4e788478de3b7e3f25083c46365c23feba530df7393005bc8762ec8a14630b840d1fd0a3f4c91ac7cd3e849aa9bfce3df587d4bb4ce84
+AUX genkernel-4.2.4-modprobe-d-fix.patch 1597 BLAKE2B cc0aced3e6a27f307de084017b2a8452fa6f46ce4292c994969e2b632b59caf47eb0d283023aa98035802a3c31f006a49f64080211a486b602f84dfd05cc9955 SHA512 43567055e1b05b21245f92418b30a1a307fb076d0da448c15c00ef9d6d2330ac4bdde7eb1c949eec3ad662d11f65fe35653273f554c737807ee9658be63632cf
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
@@ -23,6 +25,7 @@ DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
 DIST genkernel-4.2.3.tar.xz 486688 BLAKE2B bd6546ef3c7205e14b8d7e563899fc13bd0c1f90e929c6a805f9e89758fb56fac5cc4ebf6f44d708cf199fc6e2a42704a9d4314bdcceb11e402afb9877608cc6 SHA512 a35b87931e080fe1b61032f8ea655b774c29d652086b7bf31f98aa829490edf8a9e9dbd41c5b8274b64db1946b162977d907f3665da1d99a62666f745f62b6f1
+DIST genkernel-4.2.4.tar.xz 472744 BLAKE2B 712edd219611ce2fa43ec5987ebeff0e21d96d2199fe9ab5d65bd957d20b15d8d9c8c61b8432e820afc70844888553b433c3acc59148fc1eb8aa2426027c5b65 SHA512 0c0638ad5b345cd9450fb28981939fdd9e31e55871c5fe73438ffb3067c50e6935b2bc0f8ce22af03153710e48063fd327ff64e9c34f59ee760917bde8c51578
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
@@ -53,5 +56,6 @@ DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD genkernel-4.0.10.ebuild 9572 BLAKE2B aaa3dda80524b29233e333e13e9076148d1c1fdbc36c9a700c1974c3f924a6d5f006265a44029ab75888966cb634d2a642ee984e1a91a4a6cc4fd61b7d3d7a7b SHA512 1cf0391bfc65f9445030fcb5aaa22c65bb8b72bdd376b37e915f9080bde240cf0118cd337feb18aee7fc0d4b0603540f5d55f2856e3f04cca4a120c5915db5b4
 EBUILD genkernel-4.2.3.ebuild 11455 BLAKE2B dc4e3b2d08c0673844457bde4d72cef8189836f4723445e424629efcb2a1f223f193ed50eda633fd742c66b1efa805d4deff6286b11a545f726a9fb34cff87f0 SHA512 2187379b6171c175930cb361705862e57d975945b90eadf7468a1dfa4611d868dc868ae18857a5c77f142ed1ff88e0cbb3cc49bb6ddceaffdd0c220a63df8bd4
+EBUILD genkernel-4.2.4-r2.ebuild 11563 BLAKE2B a38acd157013f9000cfd4a6d59fd8ead504ec63b75b08c568ac8740f97dafd709554c7ffafdc1e280fad9a55057ee3c97d98a583e98c9446f0fb5a7987bbe802 SHA512 310fa28b66fc3ec62a1810a8b95efe09d3de7aa9ebe40032d80517fe7f37630aa29ef63d81d6e9ec144e1a0d18d62d7d0345ea33ade501c263af28d17dbf9b5d
 EBUILD genkernel-9999.ebuild 11463 BLAKE2B affad651c75155274cbdb43ae73267d9d20b7d6a62f4d4e52bfd8f14f33922d38a9e07ba8380ea04dd6029f0dfbfa46052d75a0e49434428ceb856ace3b57cc3 SHA512 cd678a9141f05971833d122217ee4442214b8f81544e1eade762b1ad0501c89fc9805c7333ee026abec11a48e7ef435a78861befb45791486fc5d360396ed833
 MISC metadata.xml 530 BLAKE2B 9c3b648bd9ae40e3750631e8087a82f6f11e1d316084782db2aad40b73a8578b104b652c7041dab2599731c585f6b98b5ce2f3964079f4b9d50183a1764e2317 SHA512 b28f46ae3d38048a0254a08fd4dd05eec342118beff64b2906764d6bbd3f8c096a624294f576b0c4971d488bb4fbe9b6991db1c9c8d64bb33edaae2aeba862a3
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
new file mode 100644
index 000000000000..ab74620e0fa7
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
@@ -0,0 +1,26 @@
+From e43878aa62e563fcefa7c1da5c44017816ac65b4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 29 Sep 2021 20:15:56 +0200
+Subject: defaults/software.sh: dropbear needs libxcrypt
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ defaults/software.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 54836ad..9f64ab0 100644
+--- a/defaults/software.sh
++++ b/defaults/software.sh
+@@ -67,7 +67,7 @@ GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
+ 
+ GKPKG_DROPBEAR_PN="dropbear"
+ GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
+-GKPKG_DROPBEAR_DEPS="zlib"
++GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
+ GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
+ GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
+ GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
+-- 
+cgit v1.2.3-18-g5258
+
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
new file mode 100644
index 000000000000..09ac6422e16d
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
@@ -0,0 +1,46 @@
+From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 30 Sep 2021 23:12:52 +0200
+Subject: gen_initramfs.sh: append_modprobed(): Adopt changes from
+ sys-apps/baselayout-2.8
+
+In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
+
+This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
+no longer fail if one directory is missing.
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ gen_initramfs.sh | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 8f11127..56d6a03 100755
+--- a/gen_initramfs.sh
++++ b/gen_initramfs.sh
+@@ -1832,10 +1832,19 @@ append_modprobed() {
+ 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+ 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+ 
+-	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
++	local modprobe_dir
++	for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
++	do
++		if [[ ! -e "${modprobe_dir}" ]]; then
++			print_info 5 "'${modprobe_dir}' does not exist; Skipping ..."
++			continue
++		fi
++
++		mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!"
+ 
+-	cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
+-		|| gen_die "Failed to copy '/etc/modprobe.d'!"
++		cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \
++			|| gen_die "Failed to copy '${modprobe_dir}'!"
++	done
+ 
+ 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+ 	log_future_cpio_content
+-- 
+cgit v1.2.3-18-g5258
+
diff --git a/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
new file mode 100644
index 000000000000..dfef98dec331
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.76.0"
+VERSION_BTRFS_PROGS="5.12.1"
+VERSION_BUSYBOX="1.33.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.3.6"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.81"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.4.1"
+VERSION_E2FSPROGS="1.46.2"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="29"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.9.3"
+VERSION_LIBGPGERROR="1.42"
+VERSION_LIBXCRYPT="4.4.23"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="5.12"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.37"
+VERSION_XFSPROGS="5.12.0"
+VERSION_XZ="5.2.5"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.5.0"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	dev-util/gperf
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool
+	virtual/pkgconfig
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-dropbear-depend.patch
+	"${FILESDIR}"/${P}-modprobe-d-fix.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_XZ:${VERSION_XZ}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} > 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 819ded832742..e3664ba1e325 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,33 +1,69 @@
 DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
 DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
+DIST genpatches-5.10-75.base.tar.xz 2308144 BLAKE2B d2544579afcdce0849fc64b283d00b6bf4b1674a2084cb1b79fef20b9e5c6c8f4e2409e505861637221b30f29d6197edcd5f1f73a6929b709adc404b8bb64cad SHA512 4e1c48d5f5eb5ef20ab2a228df6cc499110de1e901c288fa23c2c4619a13038f8ca6b8d25a15813ab001de48270e8d09dfdcbc9746e594fc9070cf529528ea95
+DIST genpatches-5.10-75.extras.tar.xz 3848 BLAKE2B d8e5de1d9129e5afe1544ef2b28b6cb13f3e0706acc569716373c1dabce68004ea602aaf54b1263041cda810d66792e26f4770d0dbcf5884e0d32e27cf09b234 SHA512 8bdb699a90ff43dc5d9359e2d3792a497253c7b163d3e047557079e5620f22defcf4b1586b40c4f37b38ee5912ab54d89e3b583845d363f186291cdfdd5aa4f9
+DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0cfbbfb76e800b67e40d8c16b77203af22e245c7ae1eb89265e0248924d31a0b035617e559121fc798921cc5d715156fdbfbed SHA512 cb46fddfed81f89bc78f4d85f28af5400641a9c8884f9502a01cba591fa2b3f428e1d9bad2e16c11c2ed7eb3db4b0e6e840f9f6e03639d4aafe2f7ec3b4d3af1
+DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
+DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
+DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8 SHA512 7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
+DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
+DIST genpatches-5.14-9.extras.tar.xz 3848 BLAKE2B be3a00343649275e63e4c2b91c442f4b9ee2724b803858c1d2e9b15464b3ee10bedf9f2afd879bcd41ab10f0d1b140e2a8714661fd4509614b57dbd42a1ee149 SHA512 cc3b55fe8442d573437203cc0f50184635a3f43afee5218794901c22e647e77e2cca985c3a824b71b734c895f744481a87bf500bde8723fb8910ef95a5310f48
 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
+DIST genpatches-5.4-153.base.tar.xz 3999576 BLAKE2B 0e6b62fd5d755890341ae3c491aad025bb830cbf0f925b1cf54e5bc6e721231452079b6341dd0dcfbe44e8e5d08dea8bd9d671bd901a95f13116625d4f230bd2 SHA512 ee8b2ea91c0531e38af6f982cbcb97e08fb69f7b51b13a69ee7d03289bdfc30c108bffbc21dd6d48510b91a8e66e974e207ae8f6e89b3ca9775b5348debf5650
+DIST genpatches-5.4-153.extras.tar.xz 1784 BLAKE2B 567f135cb5eebc37964e7c5aa9193b03469e03c9be26618761635299e6f1cc9928ae6acbe4534a026be917fdf40afe52994f7228ac1f7ebd737e9c4274ede3ff SHA512 1f906399a3564fea70997c73d5189644e623c4b6ac92d8b3b5dadeb2afee495cabd7e11d5d5b0e14b0dda4db0c1fd0991d88f37d504b56fac69e39d636b6c682
+DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfcfc4ce408f77363feabca8537d2d2e01c9e6cf4f0d2efee9908ce300d6eef0da118320369219eb863207d71d481f22f479e4f SHA512 be437b90132c76e6fb8cea6c669b9808e081dd13732831a1ffd1b7e09850c88c63739e99ebd084aae39c59fa2c3d8a3e1ec821e851f9090db648830d31a2abcb
+DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 DIST gentoo-kernel-5.10.68-1.amd64.xpak 65497706 BLAKE2B 526ea1fc91fc906828366b4f7c10cb04a0e1cffe19702443790d52ba82a99710aa9ce1eeb7832a0da9970f9ec073173c846d5872ade5ae6f44fb33c20b0c46b8 SHA512 6be46f7608dbe3ad05472264957b23e8a841ecab3a978ec94de8043f864a9e9864e8086f979bf185010e65bbec23af941eb3a82828c3341da9a365410c85a030
 DIST gentoo-kernel-5.10.68-1.arm64.xpak 61234698 BLAKE2B f30cf0cd18711f3b42d9bfcb528ca56c7bafb88477414a3ed6ecd9c26b66fe76c1c1370461c3b1b83a13266240a20f55cbc35fd68d66bb8ca20503cc26f91f15 SHA512 df478abac49f43635cbe7b79faa188570cee3419d920877f05346fae7a3a16333f95c778d170b509277a0ee08c08d73589a177b69f86fdcdf800bde8481b903c
 DIST gentoo-kernel-5.10.68-1.x86.xpak 57237230 BLAKE2B be3156a79fc45bac92220f715e0e7270c060545f222d01fc24ff5bb6a239d8187077f6c4beba1d18c704c6e858f36b22db6f1ce9ebc737e574e9130410d5c813 SHA512 7ac97263d05bd70b29388d749786788124c6e636a3b1e975df8c9225ad3106d66a93898ce1e6cffefc4ec948a36830cfd3ae16dade66d3281bfebdd3a2bf6f7e
+DIST gentoo-kernel-5.10.69-1.amd64.xpak 65520787 BLAKE2B a96f97152bb31b016e2d4a04b97de4e4bdc404780fb4e6d066721bc7f7c7c47b6fc6ffde1afba6aff09b76a413c0e9a94b5d4a1cc6f4378d755a69d831c54c3f SHA512 040b51860d7bca583b2335b1ca2bb99d645705284a18a7ef838911ff2ba197bbd13009e881c700eefc1d5192a94f49261830c9cf2123fa0f2956971bf4738036
+DIST gentoo-kernel-5.10.69-1.arm64.xpak 61267801 BLAKE2B 466e762a98ec117fb32016ac9c6b16b1a78d784031b82194341c9787c0e42599cbace2452647f1c9146e0b90b56d2b8c6d458d9dbb6609cedc03059362b5b17e SHA512 c42443160b31bb5b705cba5e75742ff097ffd1f3e7956294ed6b2104ace2521008fac91c5a7882c13600b9759e0e996a88ffef6b8965b42ea313085213f6038a
+DIST gentoo-kernel-5.10.69-1.x86.xpak 57234909 BLAKE2B 2bc547a9370383560c151ee1a8a16e74e2202c1a7bf6877119a1ad1fa6776cb5fdd4c3ab6a711ef9d74e2790564593e9dfce9662ac788454a961026cbce7d1cf SHA512 7380a5a2db05fedf934383dd2fb85ca6e3909ebe8576abaae47e734cd4989d6c6fbdabd47062edb64c79b552831159801d1e1897972263f6adf42ad2c9d99171
+DIST gentoo-kernel-5.10.70-1.amd64.xpak 65517948 BLAKE2B 27a3f7686c27021a535f47bf1ff7660e94f04151fcc3fa6a33be30f86ed0ddf82e1e8e33c813db6ba1c7f10514c49e9ed0e4908940af09a5934c4a03bdc6697a SHA512 7db9b9b994b8fc09668704dd7922905226ec3da4f25debdd6b871cd1461cf4ff98b54a71650b7261604f7cd7614c75e894f5eaa00d8fe4d40279a720a0747d27
+DIST gentoo-kernel-5.10.70-1.x86.xpak 57241603 BLAKE2B 79dde6ba5c9ffb878267f491c304eba34ed7e64e82e6eb6c9076e61b9cc62e29effc7fd7b8a620272421af94b27fd378039ce4d8b7f9bd170faef298b4a7eb5e SHA512 42774c73aebb5844d796e85377f571a87cef2299b3081199de93c4e9bc63a6f19269b4a71b90a45c8c99a2d65a7fe1f61fc0101f3d130c4c01e3d49c24d6c062
 DIST gentoo-kernel-5.13.19-1.amd64.xpak 67338326 BLAKE2B d9e718a94bf9a341f5b57063cbde2f3f1f0ea6d03f1805051c084b792388789494a49786d643f1570871ca2b6366a206497aed83f9ed00837c542ac970a71fc6 SHA512 aea74f6f39861752f7a5dae16d955d541f65d3e7b8a0e5fba593011d9ca8583f3dd0964e76aa21daa6583d5d26e3616885aeca8a04dbba222e0aae2a85062b40
 DIST gentoo-kernel-5.13.19-1.arm64.xpak 62747957 BLAKE2B 1981ddb4e35d2210e1c678856ac58e088cd100ecbd70d2b5c88ffe8eb25b56f3f0c90e45d12adb74c7a0fb881dfd36b1d46d6fdfb837dbdff1881ded066b906d SHA512 d8c1e524a3e58def5352b3faae07c42074a2d67015cc62b9601e20bb9b7f29d44d2843e7771e0399e9150be1de2be2b28776f96f7fe75ba7ec4e8f2c31e1f715
 DIST gentoo-kernel-5.13.19-1.x86.xpak 58517020 BLAKE2B 1dcd347af7693696f93f7a28326aff4c7936c4b71238500b6dd2a4b7cd2b88891436c7c8b7c6a56f638182b722ba5e75f52a1befc74eef4bfe9e6f6fd7d8ef8e SHA512 7bf1cf45d06cf4c6331d8d0c0378d253f6760dbd2f564cac6f7e53d30748ea01ea2d96a6c409a0d653ed74366d319e28ae1e2924b07f4ce7899c5bae121a3630
 DIST gentoo-kernel-5.14.7-1.amd64.xpak 68031586 BLAKE2B 7cc01200f01a93daf5f0c84b09e066474dc5dcef76ddadf5e43843a3bb8a69710134ee9546cbfc6da0149b96e480d59cc0ceb610608c7e6710dccbb9e9e185f2 SHA512 595ce0155ef9df5809d7c27ee310d3978bde477e6778468f467c9f07a60c43dd7ce6e39320d3e298639f01c18cfed5811de480d0afd884586d13f434c533fe6b
 DIST gentoo-kernel-5.14.7-1.arm64.xpak 63383693 BLAKE2B d8780cdd6306f36530d82b9a5b6a74e1d2caf9c4e9db31d6816020bc9415fe92891e418dd08f89628f3d36189c84f97c10b570091c2d1a94a494f37a21286706 SHA512 90ef111ef0ef68dd362c458c9e6ea15959713118787ebd8c68492bd204da83a212e5def456fd550c3f175565c262581855599adeb34692c65f54c2f2d7f1d06c
 DIST gentoo-kernel-5.14.7-1.x86.xpak 59157603 BLAKE2B 2c8d5d3786f9b2aa77d0ac7eb4b3dff0d534bebbd974ec43b8b1e7e9322d3a1b9db0554ebb3bf6943f00673e087bb1067f14d341836012bb46774e5b194f1cf5 SHA512 af337483437a9819d16235e9641cb3f9893e140091e31a06ccb1015a6e946189defb5b2d2d12afd19dffaef1828a2d101b01798f107457a53a93ada2d063f023
+DIST gentoo-kernel-5.14.8-1.amd64.xpak 68070862 BLAKE2B 6f98d2eb2affd7705b5886f2e9c24c0e006cc82ee89134c248a94bca41f4d3a6412f1e4b037fb8fe92950cf02660b7e75f67eaa64484e4808115cdd2f7eafa6a SHA512 d5accd546033d2ad832cf6e21e5dd780c1e1c8c60d7a568cf796cd7e95c52b244f559886c728d54351b9f3d8054867cd57b0f28ae43d840bb83391bb2358a698
+DIST gentoo-kernel-5.14.8-1.arm64.xpak 63311629 BLAKE2B 0bdc32d597f413bc2b30e704a599c0edf55ce5437772ed886da5a6787ddcce5c6eebc699860df41536a8449f5442f56ca8ff1d10a5bd3f142c9f1092fb6c02cf SHA512 2e27ea733f68d49afe2fe5bc654e9ce4125ad87bad4a98936473c1e4d9c8b59374c226c4cc397f52463371b41cacc59d274bda421842a080f0804739b8c72fbc
+DIST gentoo-kernel-5.14.8-1.x86.xpak 59162488 BLAKE2B 12f31c41617eacce67f9ee960c9959fc7e19f074dd31bfa080eacde89ba6215136dee0a00f7c0127ab0f8fcd4896c24a132333ec64845c0756ba89c6d47a7e44 SHA512 6e230c100fb83e144ab91e02697800286ad331ea1a3fedb370dc1c3615c2dee0ac47a9438b97dc38c9fc6cdc44d54fe18e721fe8cb47e9f5552dd9edd154d61a
+DIST gentoo-kernel-5.14.9-1.amd64.xpak 68066846 BLAKE2B da508a4e8e96dcc0ea331f9c798808e4b0047cce6342994b5a2248d5becf1fd010e0ee8d7dd3427e4ead92359b9c1b92e2085d91fe08b5ee6c73f9622ec58bb2 SHA512 e5a90c9ed4a3192e4ecf283bf76efa1a5e39af1f20eb18e9494dcfb8d2ef88ab23e4bec53ec81c664c0cbd47a22eb8d6907b21e970ec7b41e4ed97b4cf3b2c83
+DIST gentoo-kernel-5.14.9-1.x86.xpak 59163747 BLAKE2B 23feb5d1d74c8ae1e3f4a66b215e887e4bfe700d80bbe8c75cabac9632808193e8a29f7c43baa2376279eb3b4fc9be530528731f02ba94778fd2e087e216d9ee SHA512 90492421abd0ed5a026c8cacbf64050e2ad18b7305ef96131964a6203e32d278ef7f1392ad76dab12ff3057c17046d44b371c567d8ef4ea18e0c2678c9208414
 DIST gentoo-kernel-5.4.148-1.amd64.xpak 61364378 BLAKE2B 2d5a665f5ccee0de5abc78d593b8bc6f1da0fa6fa9573ee9c0a65efaae9629ac3ea0b26a4b83e6abb23eee5fcb842fd67a395af35fb5476529b30dc0739d7944 SHA512 277064e06bdf25fc67f0894ab1d8116f23c71488b92a1751833c6aff684c7f2d28e2116e31d40878caa3f741fe9fe61f1f0c3cfaca4677298d2851b22afdf1ff
 DIST gentoo-kernel-5.4.148-1.arm64-r1.xpak 57998682 BLAKE2B a27bee25e2e6b2c0fea38cb5bee1ce433c6dbf10468b374ffb237a15403a4acb7feb0729526d337c5c9b1a85c4afc63716fa3c4b5fbe32c03ddb6966765f8946 SHA512 c72a4d8bc4bca7cf9ad5b594d7cadff11f9a4ec7181c0dbdce14919a1af50c1a901dd69b1a5d3f35abe51f9ca82f729f352ac8873d0b0f225e4bdd45a213b350
 DIST gentoo-kernel-5.4.148-1.x86.xpak 53159913 BLAKE2B 7269d52529bf78b43819ffaf435d129ad6982f8046239a15da5c6df359feada8793fed93b206e3aa031817fbb235d221d7468601f7091f40cf5bdd16c30100c9 SHA512 07c4e3b73122ac915695858891fb408ed17ba11ed8e6adf1e17b8eda6ec4112ef293db5154067dfbfd8d32ec6b1380797f87263272c1b16b6d1044476e054a05
+DIST gentoo-kernel-5.4.149-1.amd64.xpak 61361096 BLAKE2B d6878e37659f587c3adcb64c3407e7cf805fa15dba5f411071f95c7627b75cbe20b43cda07a2728bd75b17b133f0aca224a397f28b8906299d756156966e1b9c SHA512 25d9dde0ab4559b9c53dd672fc5f6b64073e49b774760c1d93aaf86a0f4c3129adff7bdfcae2523132be54078cdb8a68455b0652d95b9ba7cfd1bb68f4d2f372
+DIST gentoo-kernel-5.4.149-1.arm64-r1.xpak 58015698 BLAKE2B 46f0c4da592df3cb7082e9669c5c27818a9fc139bf64e7df95804d7c814326dc1a85fc7ced061b1f3924412ba88e5a20551655639ea515832cf388f16a57c772 SHA512 2d3a78e2a7319163ced95e8d16ea1ee1aa25fc071539e1f0b7a0f3a7b86e587aa9bf20d369e2e0ad8c67937d21514c60d9d145e1b56084c2e555ec4fd9c81072
+DIST gentoo-kernel-5.4.149-1.x86.xpak 53165112 BLAKE2B a4776fd1b202800147146896a97a35a137b006bad285fa29dd5be02507024057acfe5b3e9909c89d00037add03177e4202c671e951a384f91f1d57673ccaf704 SHA512 344e2054cfcff49a32fa3baa76f92076377832987a6f109bc33f518bf06c6b714edf3fce62ade100dd4775c2ddbdde98db1eb22e672388a95f6c45b964f0495e
+DIST gentoo-kernel-5.4.150-1.amd64.xpak 61393974 BLAKE2B 67149f1daa5c41fc6e31fc14a88cc91200acf3f0a0d002ae8abed00eddb351db22814cb3c6fcf90ea563e0acb46de7ea7c02f9a1654ad4966355da51615b6805 SHA512 f9bcbd1c4eeacb7c247179b239992508a192582d6d463a1ffe4820faeb0931f91239cf6eb88ba3cbcf09e6f9c2fd414ef3ebaab7cc9ec2aba50b5d4ce365b7e5
+DIST gentoo-kernel-5.4.150-1.x86.xpak 53154582 BLAKE2B 3230b498ed602da9cab50d62b24b3b36eadaf32931b5d305473a2d73260c4870bcc60fa2859370c22365e2b18a209f616450c67cd81e6839990e5e00fb2da746 SHA512 cdb588a6ba0a76b77ff9f1bcaf7dbdf36d36dd24ab91817192f8f16e3a4d28c9ad8d1dac36146595383edc721f3268a4e2bb666e1ce4c0e29a24fa9a24f95ee2
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-bin-5.10.68-r1.ebuild 2541 BLAKE2B 13f86c45cf10fcbdaf7bf4bdc2c9937a69c73bebfcb3652dc8fc5ef95df1fdf839f88bd4aee88da50356b52f83512fe740fd31b84e4b5e71675f7879498f3bd2 SHA512 69be9f39c8f553b7f37fadba46adc9a4615dabf9e39a13754c2b37ceb190d7a9d160a168cbe3dcb13a90ef54769bdffd96c91016e1628935272a681ded4f6a42
 EBUILD gentoo-kernel-bin-5.10.68.ebuild 2675 BLAKE2B d7fbfbf74c409404ec2e04b9ae20ee1ec34e7fa575c3529cb2c3d28b51f0725f7f32ea3b8e0b13bc2afcabfe7489b77325e35f2225714520bd5697f743b5d2d3 SHA512 7a85a09ca5d86aa100bbca197493bbcaa070d6d274509a4df1e6e1fdf7b6749293bc866d9a3a8f3ac49c762d436a34aaf39548a2b06096f0ce2f9a359c3d0044
+EBUILD gentoo-kernel-bin-5.10.69-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.69.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.70.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.13.19-r1.ebuild 2541 BLAKE2B f4293af94bfc918c3c5707dd020ca21551fd6101e5290230345aedad820f6832f217f307eea4c53e950414ef8675255e84ad0da7202f7f55d2da3d7a98c4ae27 SHA512 f7628a110b0bedc7d604eaaf758ae42211b4a68f3ad244387d19cc3411d9fb4f7d5ed391309f7e365b6e104ef0859b05f0c8e4bd2b4b26c15152d7119d426a97
 EBUILD gentoo-kernel-bin-5.13.19.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.14.7-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
 EBUILD gentoo-kernel-bin-5.14.7.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.14.8-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
+EBUILD gentoo-kernel-bin-5.14.8.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.14.9.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.4.148-r1.ebuild 2544 BLAKE2B b72fef3779371e9ce34c9b0949dec9f4756be306c58bc8ca7fb38ed186be16cdf0c88fee3212b255d82a63780709770bc18ffe6d40eeb0026c17c8fa7e8647c5 SHA512 3bb66d146c3f03b7f538416cb291cfd9f5cb69f774f8236eb11440d9cfcb2e2a718466af983c009bfd4c08c557124c532a6c11384c5f0066fcc3716ff0fcee64
 EBUILD gentoo-kernel-bin-5.4.148.ebuild 2675 BLAKE2B 7dd3210328d31c0727a866ba4d939c2944d0782f9e4193bb91b1a548092ddf632eb2d7a80132d318cfd6444183a3277cbdb5f2308bf58de118c21ff36280fffc SHA512 c1c1ca765d27a7f5fe006a3df33b6059fcda6d5897ddced7144dc81ea1fef67fcdd0e5bcbeac7d4762b438098968af81761e9350d3a3accec3e425cab7303f91
+EBUILD gentoo-kernel-bin-5.4.149-r1.ebuild 2545 BLAKE2B b8a68d8afe2e7066eb7a47e9fe22cce2aad4c6b01c930ab5c01d6f1fb1ccef4e1f900cfb281f4ebc15264f59136c80bf2d4b383c87891b9979050bbd99e6429a SHA512 ca86c79ca3bf29d69f7e9c666b9d1496898f26bfbb0f9d989d7a99f67a2881ae218f4b703ab1b07eae60400580da6b6705a738d5f60f509660807972fc9a4e00
+EBUILD gentoo-kernel-bin-5.4.149.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.150.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.69-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.69-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.69-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.69.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.69.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.69.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.10.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.70.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.70.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.14.8-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.8-r1.ebuild
new file mode 100644
index 000000000000..c4534b7e4c4d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.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##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.8.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.8.ebuild
new file mode 100644
index 000000000000..c31025c57600
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.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##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.9.ebuild
new file mode 100644
index 000000000000..c31025c57600
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.9.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##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.149-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.149-r1.ebuild
new file mode 100644
index 000000000000..3b97f74d1041
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.149-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-r1.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.149.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.149.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.149.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-bin/gentoo-kernel-bin-5.4.150.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.150.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.150.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 1bf390a1bb4a..4f27d49ce2a4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,11 +1,23 @@
 DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
 DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
+DIST genpatches-5.10-75.base.tar.xz 2308144 BLAKE2B d2544579afcdce0849fc64b283d00b6bf4b1674a2084cb1b79fef20b9e5c6c8f4e2409e505861637221b30f29d6197edcd5f1f73a6929b709adc404b8bb64cad SHA512 4e1c48d5f5eb5ef20ab2a228df6cc499110de1e901c288fa23c2c4619a13038f8ca6b8d25a15813ab001de48270e8d09dfdcbc9746e594fc9070cf529528ea95
+DIST genpatches-5.10-75.extras.tar.xz 3848 BLAKE2B d8e5de1d9129e5afe1544ef2b28b6cb13f3e0706acc569716373c1dabce68004ea602aaf54b1263041cda810d66792e26f4770d0dbcf5884e0d32e27cf09b234 SHA512 8bdb699a90ff43dc5d9359e2d3792a497253c7b163d3e047557079e5620f22defcf4b1586b40c4f37b38ee5912ab54d89e3b583845d363f186291cdfdd5aa4f9
+DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0cfbbfb76e800b67e40d8c16b77203af22e245c7ae1eb89265e0248924d31a0b035617e559121fc798921cc5d715156fdbfbed SHA512 cb46fddfed81f89bc78f4d85f28af5400641a9c8884f9502a01cba591fa2b3f428e1d9bad2e16c11c2ed7eb3db4b0e6e840f9f6e03639d4aafe2f7ec3b4d3af1
+DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
+DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
+DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8 SHA512 7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
+DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
+DIST genpatches-5.14-9.extras.tar.xz 3848 BLAKE2B be3a00343649275e63e4c2b91c442f4b9ee2724b803858c1d2e9b15464b3ee10bedf9f2afd879bcd41ab10f0d1b140e2a8714661fd4509614b57dbd42a1ee149 SHA512 cc3b55fe8442d573437203cc0f50184635a3f43afee5218794901c22e647e77e2cca985c3a824b71b734c895f744481a87bf500bde8723fb8910ef95a5310f48
 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
+DIST genpatches-5.4-153.base.tar.xz 3999576 BLAKE2B 0e6b62fd5d755890341ae3c491aad025bb830cbf0f925b1cf54e5bc6e721231452079b6341dd0dcfbe44e8e5d08dea8bd9d671bd901a95f13116625d4f230bd2 SHA512 ee8b2ea91c0531e38af6f982cbcb97e08fb69f7b51b13a69ee7d03289bdfc30c108bffbc21dd6d48510b91a8e66e974e207ae8f6e89b3ca9775b5348debf5650
+DIST genpatches-5.4-153.extras.tar.xz 1784 BLAKE2B 567f135cb5eebc37964e7c5aa9193b03469e03c9be26618761635299e6f1cc9928ae6acbe4534a026be917fdf40afe52994f7228ac1f7ebd737e9c4274ede3ff SHA512 1f906399a3564fea70997c73d5189644e623c4b6ac92d8b3b5dadeb2afee495cabd7e11d5d5b0e14b0dda4db0c1fd0991d88f37d504b56fac69e39d636b6c682
+DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfcfc4ce408f77363feabca8537d2d2e01c9e6cf4f0d2efee9908ce300d6eef0da118320369219eb863207d71d481f22f479e4f SHA512 be437b90132c76e6fb8cea6c669b9808e081dd13732831a1ffd1b7e09850c88c63739e99ebd084aae39c59fa2c3d8a3e1ec821e851f9090db648830d31a2abcb
+DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 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
@@ -30,7 +42,13 @@ DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.68.ebuild 3127 BLAKE2B 979ebf8eaca7ac64f9268bf37c2326ee7ac61616a750be2583bd6034e15805a5a0a2c368ae7d7e1bc6ae351fb6942701fdbeb7e9d14fb6489a6e9e079729175e SHA512 890c8ffe8c407bfd4b793385fa43f40775f008bc1131b3bdb87364eebe4c937211047109d3c75ead42e059d1ea1917a95639dd334aa28a9da539c4f4da935b9f
+EBUILD gentoo-kernel-5.10.69.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
+EBUILD gentoo-kernel-5.10.70.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
 EBUILD gentoo-kernel-5.13.19.ebuild 3129 BLAKE2B bf974bf3ceee524bf31fae497e22d7bacceadd2c1221b476948da9ad927eb855365e896155cd84b69af169073541799999784990b5e2b8dd7615b3f5c1a14fcf SHA512 b00e7311942a763c4847ea9205e47e1133fdba254c35ec740d9097767261e3c0636c729607aa7ea4b346e88644d1da8e30e620254c731d0278066168fcc05cbb
 EBUILD gentoo-kernel-5.14.7.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
+EBUILD gentoo-kernel-5.14.8.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
+EBUILD gentoo-kernel-5.14.9.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
 EBUILD gentoo-kernel-5.4.148.ebuild 2818 BLAKE2B e989342b15abf7771213d72c62618b85237bcb207ee7948f29f804ae51c44dab105cce5ae65d79d3365dd575d8f2436ab0f4586ff87ef730f99d6859661bf9e4 SHA512 92a1296b128a1166c5c545d606536142f54be6753fc7a97cf75e4d8ed08ffc9b572f737ca7bd0a51055105ea0d7ac0675de4fd796966658ef3988dd3bce98422
+EBUILD gentoo-kernel-5.4.149.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.150.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.ebuild
new file mode 100644
index 000000000000..8a97f9b5278b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.ebuild
new file mode 100644
index 000000000000..8a97f9b5278b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.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 toolchain-funcs
+
+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.14.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8.ebuild
new file mode 100644
index 000000000000..b7a0d9f34177
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+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.14.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.9.ebuild
new file mode 100644
index 000000000000..b7a0d9f34177
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.9.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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+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.149.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.149.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.149.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-kernel/gentoo-kernel-5.4.150.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150.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 c53290c04edf..064af09aef9a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-4.14-256.extras.tar.xz 3656 BLAKE2B f2fe0354592824d30f47669b089c
 DIST genpatches-4.14-257.base.tar.xz 5281468 BLAKE2B 3c1ce59ac01d55b400e8100575c6c42963e7ecf0a015e45bbb97945e989413f77744ec0eeb0affc4869f059bf409bfbaec95b532750bec4dc8a051a877e10a06 SHA512 8c4c96067d4b0ceceef20f080552030d45553ce81dea9c6dded907d24b22f2485f28b419d4c45ef85c8cd01429fe0e49ffa3a9f17aa1b69ccb522e65a7683e5c
 DIST genpatches-4.14-257.experimental.tar.xz 5708 BLAKE2B 65624511c894af9625261c81b672f7976c096693d502e6adebd10c4b102a391a5978f3672381ac82f1f63f456aadf2e86ba90dde07b1639dec03dafdf24c322a SHA512 2e6f16a6a0c92fbbb0d3a530d2ed17e2c2553cbe45ff07b6d9d202e3fcda7f40bdee51ff6033ed226bdbcef0f1d78f4efe7e94d66a394f03a0fae9779e2b694d
 DIST genpatches-4.14-257.extras.tar.xz 3652 BLAKE2B 3e79d96c226b8d0322466341cfbbdbbdf9f3bb0c5c7665d0745de68214ffc21f0e2a2395c48e1dc271378860625151de73eb166649b69a2eab71825f26a7804a SHA512 d28a124b194ddb95a7cd7a2f73c21f55cb79948d035e77496a11cb759d90f3140265c797b9290f391c38d47a1358c5bb3e96dc5d0df0cb5c90a55f523f579892
+DIST genpatches-4.14-258.base.tar.xz 5284920 BLAKE2B a5cca7bf6ff0489a511248b900f61c249aa9116a5c7d2b9303660aa0bbcbd6786e7d243aeb4e17d43848e2efff17a1fb023ed0dcc51810502ed197476bf9244e SHA512 a0f6b1a6d31ce7c4035ad58ccc0f01cfc27fbf19f7fefc29a295c0db4b6942f477b82d8866ecda53476fcab6968dbcb3fad4f494dedc508b3bf2a0bf4ebda655
+DIST genpatches-4.14-258.experimental.tar.xz 5708 BLAKE2B 6e22257da121b7252d89d1c79219a357e4ff3bc22845cad969444f457564864da2ecb85fb9864695ef2719f0895af45f04ce2edd8bdc28612f773514c2b7c54c SHA512 e51e481c9c790cc25e485ae542603f3b9ae8f3cbbdaef32af29d13661137ff17c64d3dc73aeb6424a7c127ec6b8e6a256096d6697e2487438be1f1e198520d0c
+DIST genpatches-4.14-258.extras.tar.xz 3656 BLAKE2B 046d8bbc9971886be4d645f446cbcc4d22f3fee5d3ea0f9ff5944e52cdf918fc3e2594dcc6cbb58b0ba03a204ce2b58d9ddcc7744ef791aeebc1ec340e4a3f53 SHA512 8def481e89ccd66623186c8be6ba15b056944d2183d0f5df2e53f4f1b32faf8e05b0be8cef4eaaad665ca6abf38836a8cf42cae1667a611db55f29755c3b8f73
 DIST genpatches-4.19-204.base.tar.xz 4899768 BLAKE2B 9e2721950d6786628639ce06c774df260120f3348abee2104c181515727f1f0276d8abc05c15993ad425ae0c4f85c14c54f1f946137a9ac50c9434e61cec4b64 SHA512 9dd0c810cf68ffb802e1fdbb538acbe8bc56a03bef36099e29187cc0945e6c539f7f85b17b4acecaa8f7d14492cd1c59cd1c1043891429d7797f842763c32db1
 DIST genpatches-4.19-204.experimental.tar.xz 5464 BLAKE2B f913b92f4f6df5f4c0696d6991406da1dec2fd5d70a54a8437b29201104b4d7301844c834cb5184bd7aa29d3359186f8a6e6646260cec4bd49b6480cc202cbd8 SHA512 cc7ebf9c8e7813bdf4f9d0ea19fdbd62b66b5507fcfadd421fea1fbf417e0ae4c30da81f3ebadfbcceed60fdaf8f617bcf249893ed620bffd2887860ae0f21a2
 DIST genpatches-4.19-204.extras.tar.xz 3672 BLAKE2B e9f384f8fe5caf179d116a04064b9ca93829d8a8c00ea661edc84172e3c55da4f1a115a212472bd4ab89342294952e4a12dac2b902fb10419e12b5501afa1c05 SHA512 b59d52624ff422f8b2946d5c73e835a025f602858d42e86f5b124ad4aa1ac126e45483386f66f4f74ba3442be59987b6a94559cea01f4b2577a9aad21996a1c7
@@ -16,6 +19,9 @@ DIST genpatches-4.19-205.extras.tar.xz 3668 BLAKE2B 0914f8a9110d1226605c1955cde0
 DIST genpatches-4.19-206.base.tar.xz 4971260 BLAKE2B 1324808d48dfda387294b06ffdd5578c31442005b2b0a0eb8471481881f9283b3743f4f2d50b542267ba801eb18c78715365fdd6c77a44d865b7958328c77a1a SHA512 9eb3694a42b73ad1f7f2662a523d5eb76f198b61dd4b6b1818e96d4bbdca46cef45b0357a0b5690f8b323b63b826fdc6937efa4148f8d619323a48e86c2f9bbb
 DIST genpatches-4.19-206.experimental.tar.xz 5464 BLAKE2B 5ea415987337369f6ea51dc0e192ddbd9cbf653cf0e9feff2be11af39899db1c5ee23a47db97658c2cb2e7796f423a6bf8e1779dca38dca698d822f8b96cbb85 SHA512 36524a1fa18825cd829fdece9316c6298802948ae5da53cebc1f8bb4c4f1d02902ff7ceaf7fa307e6af2d8d172a4d4f68031cd26313d229e70c9f494159f09c5
 DIST genpatches-4.19-206.extras.tar.xz 3664 BLAKE2B 74d416ddc62253397102c198401fe822471ee1285c3a2cb3d808d7a20cb253d8d839f14730ee8aead9abf5abfdc19ce4292179369fd221fad284fd9eb36e309c SHA512 72599fd83b2c11eb42f0f8be61f744d2b65fc00dc1822023cb019dafccb94dd4e869b209bc6a1c4fb82d3a1c1c34c03e73415af8d7d9f42cf31de507d422db7e
+DIST genpatches-4.19-207.base.tar.xz 4976776 BLAKE2B bb15d076c0525bfffc596c285eac388498bdb8c7af9a6b42c60cae485a5ad0c097b4c7ebafcfbdc494d28ef6cdd232d54d8d15850dcf3b45a92df9f0d43691a7 SHA512 13eb208dcab11b7e043b79b619796160a14bf30526bee1ac5c2f32a313f34c5ad214d8b47a6b476ab29a97ca87c7a58b1d25cee6db101edd91d3c1f5ca7b16f3
+DIST genpatches-4.19-207.experimental.tar.xz 5464 BLAKE2B 88fbfae3f9e5d58dfd140d97678e6faf619c8545d9c6da925b2d87f50b4575e887a26df4cd317c62681532e346202d28fe96f5d8a65597f47118a88f36ebf8bb SHA512 5eb3958d000ad1eb8cc2b5edde4e8921e08a3db663880932cb527e721b6d500878b9c58e094cd37f64dd0184d7f81ba5a1260b0a2353432d1aef50b0508c8d60
+DIST genpatches-4.19-207.extras.tar.xz 3668 BLAKE2B 2ac41165e32d57c71a2f9042271cc37fe40df161c24753b34ad391b1ba3bc83b565c73741f314a2a79ea94e5b621b3ddc46b8a4cda14ffbe5ada174b46fc9eeb SHA512 45ff64f883c97ff9cb050b9710cbdd7d7d2c71ba4b42ba752003d6fb820627c490f9ff76d675c72e0bae0318370af83857de007fe4e56bf00248c64c05e58ec0
 DIST genpatches-4.4-284.base.tar.xz 4258176 BLAKE2B 059dd90c9fd124578a3a4458eacba00182f8a988b3ea6af485e166e41f07d9a27e40ca58cc6480a95eb089c455f899ef3439caa3786116db5b5bc31dcf1cf898 SHA512 0526b7099325edf5b839b50aa3aeadd96b8b8baeb6c1bfd24782f7ef97943822dcd97f0dde7a8267e68290977d910079dca41b6bd0389460f4fc238c53ce1dea
 DIST genpatches-4.4-284.experimental.tar.xz 83308 BLAKE2B 1cf0bba71dff6ccfd67a5f8c6c4cf129dae607b7b5d71b2037d6465e88caeed9971ea332053a4b898ae74648f38ef488452006f2ed315a6b0d93b307dae88ef0 SHA512 b9ddbe6f93f65a4eaca48b1731cdb0c74890c8f3f9be390c75c8dd6aeeafd2dedf440b06bdd781d0c93a8873c56537a514acd696bbf46e921e84ae42333dd22b
 DIST genpatches-4.4-284.extras.tar.xz 2132 BLAKE2B 7eb8440592baa6d6a6ad5319289597eb23dad0f95baa3aabe6d753b2ccc42efefb2cdf67a08a9affd5793a0667a775467ac0c99385ff137166d8b08c43591b9d SHA512 fe4072ef93657764dde7dc8adb67085df3c9ce3b645f68f331f2f929d38e83d90dbab68053423b1640a0a0ec5c4620d823403244b0ab7e600e5b573db520520d
@@ -25,6 +31,9 @@ DIST genpatches-4.4-285.extras.tar.xz 2132 BLAKE2B 7867385ed011c967304f174cd62a6
 DIST genpatches-4.4-286.base.tar.xz 4281080 BLAKE2B 825266073dcb1f24fcd2245324b3c7029803515f6e11083f664d6b8e98c7806dc9e6d7dd58dd085901b1dd66435c6a004fc7bace9bc4f6846e649a75945b4d96 SHA512 9e3c3fe4c2b39abe939c219774f3f3051b4699162a57649983e8c867a0052da79e548062d61cf9cee716afa987c63f0eb49bbeec99fd38409cb727cf56ab1692
 DIST genpatches-4.4-286.experimental.tar.xz 83304 BLAKE2B ebd14cb006d0f0fec9683c9b24f3eed2859131c59a3dbee8ff0dc60118f966ea2448f658af450ba1ebd5d5513e20734d53168ddad0dd3615f511c1259421dabe SHA512 156b8696cb66a94473fc5cb11f56ce9fe0e5935a4466bc6acebc54a0b58bd62305501f29064e71d2e7308e939b68870b23537d14605f75f3798a07c65e69be9f
 DIST genpatches-4.4-286.extras.tar.xz 2128 BLAKE2B 47681996daa493ddd117c4677cac84374b2d0281175c66e56522d8e0f26805a1f79060c1a8ffc0df26aeb3a631ed7ef0de32f67edbcd902f3f85d03cc06a7bf0 SHA512 8643204911367264ae517e24fb99da6cda4b9f7fb84f25dd7b9dbb5aac5389995896cd61f6b39a0d4a246fa0fa394cdb2b06656c6172a5808dd61f110493974d
+DIST genpatches-4.4-287.base.tar.xz 4285120 BLAKE2B 0fd0c3345b40966a2f5d5281056f1b8975cb3f0055acb51435d936223a9afb0cc0544b87cc7bce66206a708f61672b9bf4f3beec517a10ebfea09e53f1684868 SHA512 f71d8f1721fa031f83c545fde775c9e82cd1d26f9879bff9391ff41b3d71fda69d06dd9c503c36b5fbf553af5a4ad3985ed1ed7b6b97bd539a2bde266d9e20c6
+DIST genpatches-4.4-287.experimental.tar.xz 83296 BLAKE2B 4a5589f1a0d5b354f4a60b030d3f01a5cc10ae17fc5dd200ff706825cbf70567b1e879e1d36d2a068406ac99d4bde75cf26d3e9a3810c6c6d6f289d5cc94cdaf SHA512 bea639d2d720a29265729745ef2d46ae68c789812efa588a744357a367d0c5082f3948b0e44d153c1e312c7610a80c1842e59133033f3a2726a12044e3fcfccf
+DIST genpatches-4.4-287.extras.tar.xz 2128 BLAKE2B 02dce4e4f5e4af09bac2e449deb08adad5c9cf2c92ded654c37bfbab9472eedeca6449f610b2cbabfdb9ade729df3fcb8ae273f99930ced1e7fefbc34f24b6cd SHA512 39809c0793bfd718a8924f38a274e43c8046b05f3ba120ea4c32418f993060dd47bfc951f1e556a1910f3bd501aa56ab9d0cfabec2b87db90778eb5630f32b46
 DIST genpatches-4.9-285.base.tar.xz 4807100 BLAKE2B 594354ba8ccba1b3ef87a51d94ec7fbf650ac72bed9f76708303f56523af059e078f44b78f129dd68c945acb98ff4e1e920203a8aa187486322a41e16f3d1188 SHA512 ecb32e45b6e285f8adbf1b52f9924f5bcbf4653c308b92ad5788ae25dd4fdf1e5068258db90198edb0b11caaf774f1a84c8f30167b741435fc75f41c1fa8d910
 DIST genpatches-4.9-285.experimental.tar.xz 106376 BLAKE2B 74d6d05dd7e96c07355bfc9acd7bcd964aaff25cd4bd3928c57f7f1d3e401d650d59a80f2765b10662141266f083e905e14a2bf669a5f7d05c899758c7540664 SHA512 6e33163ced1383f86533a51b69e4b6487de328ed89af77d8d1a328efa39eee1a3d401f90291534df02a6c4c0dd07b3d1a180465bd20c4b5f22206e1ac0d4486b
 DIST genpatches-4.9-285.extras.tar.xz 3676 BLAKE2B 3304dc16147106458478f99607c6354272e9daba4c17d47cdf3c35681a63444bc26399aa5fc054bfb596e7be19d438c8202e3c7a17572b9de510b4f81b7216c7 SHA512 b583fb5dc399b47e1700cb5700a8fba6139cc0d588c2fac8d85fb75b34d3ee68498d21919ef5886c9ad20632502af41a9ef61e6060fe83a75656a3d165f5a95c
@@ -34,6 +43,9 @@ DIST genpatches-4.9-286.extras.tar.xz 3676 BLAKE2B 22a97eb37783d814387a24b112c74
 DIST genpatches-4.9-287.base.tar.xz 4840584 BLAKE2B 713838f30f66bc063d657e1cbe8d8211363dd52bd17d86f76695ee6ecef74f28c36476befc1879bc5a3c19406550449f0a7267d3b50cf961067b803d120ff4a7 SHA512 a4a4fe7ca269a78eaaac1725d7e4d10f8b55e0a458ebbd62382659444691ecbc70f38c410bd537bc2253caaa53c84d4db54a68149480f7f9a0517ffe580caead
 DIST genpatches-4.9-287.experimental.tar.xz 106392 BLAKE2B 6f736c7932f3cc378360e6b9a1bfca7aad9cc8b62b21609aff3c25dba0e800b6bd7be81cce7dfd5685c6f539edd9c48369065581421493b2c973024b15f74ec5 SHA512 a6d8adea8fcad5558f7b190296139c86590c918dd8bbd99fd733981f4d9a51f3d6fe4c24a856f0c66600503f91819a0261f2f18274fce57d484fa882476874f2
 DIST genpatches-4.9-287.extras.tar.xz 3676 BLAKE2B 7f33e4b4b9b0285569fb2a1f0c5f6d153219c3e43ded5cede699e0bde697b9f4064247383830b71ccb4f3a0abf0e9282e3026853bf1cd298fcb09ef2e72c527e SHA512 9b8da830b897de95f48817443b76d67297cd9a59df8a4f7053744296cf831e389e59355326a2236a4ffd5f4288f5427a497afe7c4c460e23bcc2a3d82a73ef03
+DIST genpatches-4.9-288.base.tar.xz 4844756 BLAKE2B c1a9238f37282badbb39641ff183c03a378f2ad133c538cf336e7a248f2db38abbe223740174080ae334cfca3a6ee13bfee7c404bf5eb5589329ae63b48a6f4d SHA512 a96ed922ccbd9293b318ba934b45894bda4085c53d7c6a5ea36e24b63bc859dccfedf3f8387e0fbed3385e62b3685f6eaaa9f1c0c792fcbc13fa2fbc4161558b
+DIST genpatches-4.9-288.experimental.tar.xz 106424 BLAKE2B c9ca07b9b7ae41de9b711386a1b5aeb2fca479eae5edea5f1987fa8f09997da03a108a1494182e768cb94c1cf510b94cfd4975f97caf45d34cc48bbef6641a97 SHA512 a5795d1b409e07a77c0fabbc2a282c10205887c4862c050c4248868dab65befb3cb2de4d1a836e3704cdcf367c21555fd17412f4dcadc3562cc81aba79a8384c
+DIST genpatches-4.9-288.extras.tar.xz 3676 BLAKE2B ecfc2f704e24a0ccac84aaef73f8ca42876a4c7e72d689379e6a8e12775f001011db5bcce45df6c38cb00b800b76e33a9fbbe27852d664dd449fab441157e4d2 SHA512 413a85d3e678d71101526754383f820d6711aed90f5624c02d762c559209de7ebfd5b065275e47114e2ebe39f208a5609f7bf810b7a163f6f39519058b996696
 DIST genpatches-5.10-67.base.tar.xz 2086184 BLAKE2B d01856f8ab1b24b9581576c80c63b7b30adf3376b70f890e527d5652c28228b17c42c28e4517689411e67b7b7a715b4ad3e1b2e045725f11d825a0ffc67f39f0 SHA512 ff55f88e4c334f463945d8f3d9aa7dfd987602057ba28496cb31a1d17ba3ec8d1eea94cd0544af6ef5f6dc140c09427a6ed0de476e0b71f9dbba5e558e8422d3
 DIST genpatches-5.10-67.experimental.tar.xz 16876 BLAKE2B 39f012e224da8dfbf21b6bd7e43f2669122a7b502f99f0b28e3b6251441d7f57629c96e07df2d3d76a05142a16db86528a0dba4770ad0c3e69fbe1a5ca354d1e SHA512 4f216cb7204fa731b023d121259244f7180cdc4c65e842323ab00b784c7d82466f2e4a3705ba8931b8a1e82a57b9a8e42c99b48f28fb78fc9281a1976729b772
 DIST genpatches-5.10-67.extras.tar.xz 3848 BLAKE2B 1469349ac07374c4f6e8875757e588af6d78d13fa8162573ee83a201ee5158916043d013bf1202d89911584fe861d0a7ab264b63affdfd062bb23cf3e0011869 SHA512 7887ce5a472f6a778f3eaa4032f5a9ba2dac8f06dff1937188c708396f2305a499ed129e275e85aafc6746e7bbf4526cc7aefe502bcf4953c30020cbb0e9d657
@@ -46,6 +58,12 @@ DIST genpatches-5.10-73.extras.tar.xz 3848 BLAKE2B 8bb75fffe5597221023015e1512ed
 DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
 DIST genpatches-5.10-74.experimental.tar.xz 16868 BLAKE2B 24f4c5edf71865ec21b7132c7d9a86a1f5e41b9a4a35a8569fdceda97e7e5f1294c3465ae253b689cd0d9ca29cb5160444c3015e0f3e84f49a473dbefd4d880d SHA512 2be81a41ccfe8527bd8655f46aa10485e11437821a133beef3762ef98a1ffd1aee600e485d51be2ef065792bd80ef41b777a6dacf1e97aef51e975fb50ab1756
 DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
+DIST genpatches-5.10-75.base.tar.xz 2308144 BLAKE2B d2544579afcdce0849fc64b283d00b6bf4b1674a2084cb1b79fef20b9e5c6c8f4e2409e505861637221b30f29d6197edcd5f1f73a6929b709adc404b8bb64cad SHA512 4e1c48d5f5eb5ef20ab2a228df6cc499110de1e901c288fa23c2c4619a13038f8ca6b8d25a15813ab001de48270e8d09dfdcbc9746e594fc9070cf529528ea95
+DIST genpatches-5.10-75.experimental.tar.xz 16868 BLAKE2B 40092574c4b5d4a9959328a807abeeec04280cc18efe6df4d4f8e45e5f47782638ab67ed22e881296dcdaf94e4954038303c572ee2521f2e39858e955b0e7780 SHA512 657eafbd2709e44266670274de8e511c0753cb5eb4e92474b8f6c5b16be74f4497d6cb630223b8fbad30a395ed0f0aa9211410c600498c8fbb391a0d2f6b4539
+DIST genpatches-5.10-75.extras.tar.xz 3848 BLAKE2B d8e5de1d9129e5afe1544ef2b28b6cb13f3e0706acc569716373c1dabce68004ea602aaf54b1263041cda810d66792e26f4770d0dbcf5884e0d32e27cf09b234 SHA512 8bdb699a90ff43dc5d9359e2d3792a497253c7b163d3e047557079e5620f22defcf4b1586b40c4f37b38ee5912ab54d89e3b583845d363f186291cdfdd5aa4f9
+DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0cfbbfb76e800b67e40d8c16b77203af22e245c7ae1eb89265e0248924d31a0b035617e559121fc798921cc5d715156fdbfbed SHA512 cb46fddfed81f89bc78f4d85f28af5400641a9c8884f9502a01cba591fa2b3f428e1d9bad2e16c11c2ed7eb3db4b0e6e840f9f6e03639d4aafe2f7ec3b4d3af1
+DIST genpatches-5.10-76.experimental.tar.xz 16868 BLAKE2B 192a2300f650fb613ceef8e0148f550adfe262477a22a809061063b67a097db43e0fa56e573f9e9c2da7987a4de2ca3f43b5b9ab1a5c7fb491b4c141d7fe7362 SHA512 423c9d66d55bf88c553797080f56e04c9b4b3b956d7b267ae539522f0e60c1a002ea3107d828e071d151d61c337740992ce67897606520da74ced528f391f36a
+DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
 DIST genpatches-5.13-18.base.tar.xz 753548 BLAKE2B 2aeb182e609c2043b87a146b912c7a36674b87451d7d469e8538e070ee0b388cae70bf040341798daa7723aae5f490e6826c94374af7a4d1817e1ece54f6279c SHA512 b795d49d7f386aba7c35aa5a3b8ecb1e9bbcdea424aef77251cea12d64b213410c883fcf58e9131437e78e5c63d435d84d8c2834ca5a679f65b7807b026d60d8
 DIST genpatches-5.13-18.experimental.tar.xz 67316 BLAKE2B e2bd9772cf178f3de74c8241af33e5fdf58249a1168262dd123a81ef95b41dd51e32cdc32f2b6b23bbe7812d87f71a62887e9dba33860c0a3e7ab5a122d152bb SHA512 f3a00f8b3c8614ffa6c71feb1c84638aa984f7d4ce36026d83a9dbd691b83497a9178157d1ee17044a4b84fc252fcfd6aa0294d13eaed17dd1ae08a73a30ac44
 DIST genpatches-5.13-18.extras.tar.xz 3848 BLAKE2B f4649e2c359dbd01daa454b1a63534f3347b21e8746a8ab72e6485090b7a3eeb6cdc68cfd2def0f7cd86410f075bd7ec859176c9286d247870a4532f035e45f2 SHA512 963288db0a789baa4c8e588ce77a53391146071738e56979119e83cf10eae176ec49c8a084cd6057ad2c839ad2b19bb1b09790abd05c40f8906a973bcdb87f76
@@ -55,6 +73,9 @@ DIST genpatches-5.13-20.extras.tar.xz 3848 BLAKE2B 8f320148d5abdeaa9be678232a4e6
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.experimental.tar.xz 67356 BLAKE2B 5ea0fff67a8f0e5ce187351a3a66a7bd2c4a81947fc21eb270174afe2a98febf3fa9cf8e26816562d007adec4905eaa262706b4d4d4a9d981dd9da47e0fb439f SHA512 4698f1abc304404033c36e07b985fb1dddc1053a990687a984df700c1e2f0626ba0b75f74d8ce3b292c901b93413cdc7296679c75759ba782240fbc46d416eda
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
+DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
+DIST genpatches-5.14-10.experimental.tar.xz 67668 BLAKE2B e0bba39b5d25fb97f0c35d8acf1cc411d90c52791fd0674236674f6c3365cdef954fdf838063b66d06631f90ebf6a99f47516bba61dc7b4b11745a8b13a1841e SHA512 54014a8b7e743bdf0e9ce99911b71e489a132bea32f956ddffbbb751c7d32c877af3c20f79b4e5e6bbb4fed2a2587b4d3a48794d1a97e1aa0860cfeef44426d9
+DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8 SHA512 7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
 DIST genpatches-5.14-4.base.tar.xz 20400 BLAKE2B 2b0781d16dcc40dd8db831fca56c87e4edf29f0bb54a75949eb251eb98a3da1f0f635cd37ec887498ab4527071edad95f2e22d742aa37e3a1957d5eada102f43 SHA512 48d883b13c1ece3c62a3892b4d06bf1e14990e4a6ec62ca0b96432069a11f05fdb51c3d62187fd8dc70adbf7c93d18aefcb496a4d9be8d42bc9c9dcb52aaad5c
 DIST genpatches-5.14-4.experimental.tar.xz 5408 BLAKE2B b2ce3ee820369e9060a6edc646636f6c4056ef3050b622d0047e80392aec7da59b7b56c2416a2d83ce95c1aa75c10378d9a5723ff7c0537ed81d882b235db91f SHA512 fc8954f3f7d3d05583a748ea43cd0a0e182f8963ecb9bb73e3e4b722de4d6bd79930ef27100b2f4d4ea93742cb4d98bb69f9dddffb931d2fb9278ace81ffd2a4
 DIST genpatches-5.14-4.extras.tar.xz 3848 BLAKE2B b7ff12e366e9db24cdfd67da87e3429b2d39cd7d13fa6cb1e780e59a54fa465641b0b6440c51306cf0f4ccd3952f6f4e8993200f29f9cee36b6be4e84b014291 SHA512 99b0d40e43236e77f188608973e30cd4f1562f6d90c1f71fd95fd9b0e8146744b3b8862e84b9b33e69193cff0a7223a0e9f25cbb030a3f80e4c2d86ac6b50873
@@ -67,6 +88,9 @@ DIST genpatches-5.14-7.extras.tar.xz 3852 BLAKE2B 6c01e3c6933c874f3c8cdf3ba1648c
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.experimental.tar.xz 67656 BLAKE2B 99e5e29d7ef1d7894a7d1dfb789ff1e8c3f560eddec31ea17b16c10cdec5be78c21c1b5fb774fa38266cab4407c52d28e6a3316924fd87db61ddab03dbe43aca SHA512 cf57ac6d63f73f1d2a19d3f5fad26de531cb183ed7d11dfe53750bd4a453ad5803f096c55d2ee07ae3f5f88ee70f8a72c3813ba7f8e204c617e71084ed78edaa
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
+DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
+DIST genpatches-5.14-9.experimental.tar.xz 67664 BLAKE2B a49f6a464a7db54751889d6e7adf3211c79bb12ac32ba05d711c19beee06c4653d42188bd7b2aafc8569fe3d0ef3dd5219dbc65e5c46930843148b64762b0839 SHA512 57abc7cda68eec6bd7df698c44b0dfaa9f23c7863040ede7c6c36693d21195f707e6cb0f1af30d8f109bfb0b3c158dbfb4636a7d8b015fc70124c9f95b302186
+DIST genpatches-5.14-9.extras.tar.xz 3848 BLAKE2B be3a00343649275e63e4c2b91c442f4b9ee2724b803858c1d2e9b15464b3ee10bedf9f2afd879bcd41ab10f0d1b140e2a8714661fd4509614b57dbd42a1ee149 SHA512 cc3b55fe8442d573437203cc0f50184635a3f43afee5218794901c22e647e77e2cca985c3a824b71b734c895f744481a87bf500bde8723fb8910ef95a5310f48
 DIST genpatches-5.4-147.base.tar.xz 3875304 BLAKE2B 98cc4815b004967ef7a00b2b8af96cf002c09b22d54222e0f932e1ef83731846011bb3c4b8f972c85aeb086b0bcd6a0ce0f2ed390dd5f0225b137b33bb2255bf SHA512 999f5e9a99cf8dea0c8da91b0e365703064620b04bcc48909d89af73f551a0da3785201b4a4fd0edfd184872f81109dbb78ca57d95d1c2759a1cac111fe1066d
 DIST genpatches-5.4-147.experimental.tar.xz 16904 BLAKE2B ec8fffb28b9e2e89ee042a7fa471a8fa69c6d536a33fd565b542336eced21f784d0c42dd372b13c93f6d728d25f196b45ac839da95ad081bc6b6301a4b7da376 SHA512 8ce39faddda3ceaef40af805d794a5a8b26de2a8639f5fab806f7eae4bda6feca21853126338ba6ba2a5e83984aad86df4b2a631e31a6310b9ca80a112493ce1
 DIST genpatches-5.4-147.extras.tar.xz 1788 BLAKE2B a0e7283baba01090e1c0125b4333787ad406dc311c0f6fc9fc3eb6c4b288efb7742fe5968a2f1a0f6fbef9286df7947c1d64f78c8f3c727d82ff95bdfc749977 SHA512 75afcb75617b32172f5766592d86cd08f0c17ba35de18ec83edbefec66d04e8acb6660a59dea5016479db19488339bdd47ddc5182bf2fb5c61587ccbb4063681
@@ -79,6 +103,12 @@ DIST genpatches-5.4-151.extras.tar.xz 1788 BLAKE2B b0e61b381e67be61a6a2f550a8a33
 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
 DIST genpatches-5.4-152.experimental.tar.xz 16900 BLAKE2B a569f1798af2813947ff5e58cbc7260a87a786bb52ed7ab73ecb941f771912199d6b9c5188b6bce7de6e89d42917ba15aaff609d5aa29e13e2007b42db447ab9 SHA512 ab757e59121e94ebe640e80b9ec1708848a8467972b884d1ba04769c86cdefef9ff2ed4e6374e0a39e5d0b02bb3521c416c0467463a86e4fd7ddff494f8f1192
 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
+DIST genpatches-5.4-153.base.tar.xz 3999576 BLAKE2B 0e6b62fd5d755890341ae3c491aad025bb830cbf0f925b1cf54e5bc6e721231452079b6341dd0dcfbe44e8e5d08dea8bd9d671bd901a95f13116625d4f230bd2 SHA512 ee8b2ea91c0531e38af6f982cbcb97e08fb69f7b51b13a69ee7d03289bdfc30c108bffbc21dd6d48510b91a8e66e974e207ae8f6e89b3ca9775b5348debf5650
+DIST genpatches-5.4-153.experimental.tar.xz 16900 BLAKE2B f99cc884e505b5897450a4c0c42904fa1112d5ee9c0f32a9501d248b5fdfe7724f89d23708c771c941f8df0a976f93a90e3c7a088454a4b6a13db9df18f0ae24 SHA512 4ecd6889add8d293a70c7d225eb02e0c6c66dd32c33b76e4eed6cc15a838c1d81f26c17df5f29fdd32a306c4262f07094f3ee517b78fd73d6eeec56bbb475c2a
+DIST genpatches-5.4-153.extras.tar.xz 1784 BLAKE2B 567f135cb5eebc37964e7c5aa9193b03469e03c9be26618761635299e6f1cc9928ae6acbe4534a026be917fdf40afe52994f7228ac1f7ebd737e9c4274ede3ff SHA512 1f906399a3564fea70997c73d5189644e623c4b6ac92d8b3b5dadeb2afee495cabd7e11d5d5b0e14b0dda4db0c1fd0991d88f37d504b56fac69e39d636b6c682
+DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfcfc4ce408f77363feabca8537d2d2e01c9e6cf4f0d2efee9908ce300d6eef0da118320369219eb863207d71d481f22f479e4f SHA512 be437b90132c76e6fb8cea6c669b9808e081dd13732831a1ffd1b7e09850c88c63739e99ebd084aae39c59fa2c3d8a3e1ec821e851f9090db648830d31a2abcb
+DIST genpatches-5.4-154.experimental.tar.xz 16908 BLAKE2B 57bcea0b2b41e73266af8c5da71e814c59ad931349a3dfeca0dd0084b6a572ebd5a7d42fd36a4a914cb9b51b15fcc1560b305884156c99cf5fc7f73d4cb620ff SHA512 4770a23f3c0db22311485d0d077b99b14dd7aab3ac907c3c176be72b4a634bde72bf4f5af6b1c793510c3e363798aac7b90477f0284777572e186a849cd55e0c
+DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 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
@@ -90,19 +120,25 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-sources-4.14.245.ebuild 730 BLAKE2B 8d399920e4ee91a05910379e0e3b980a7f7d3a9bc8911c9679ff9af60f5011b31e585d0abee2d361417d5e75fb1901ff1465a1d3a9de1f20ce288665b5fdd1dd SHA512 8f06c25ea5222df6bea766a0cd01209d7e6182732b77620422cab7290ffc45652f34b8b1d7f21fa7d54885ae34036acc0ee4d7bcc5fdfcb350bf008995b75317
 EBUILD gentoo-sources-4.14.246.ebuild 736 BLAKE2B 4b3773779d2bdf72aa3186393e602b920237d7a7c03bb7b31c0afa4e9c8d7eb1963bdc1d4873aa29607c4d08ba11f9005d38add0aca4eaa5904082b63f370481 SHA512 6cea3ec68d26298d727b67c33d9b271ad05a448d6099bf9757ffd32f308577836f65a86e6ab854744eb871e7105e62e6236831c02cc1fcfb90bcb19e785ea429
 EBUILD gentoo-sources-4.14.247.ebuild 736 BLAKE2B 6e5d4f86f0beedcd2f85c05397e6feba61958702fd00567ca287a4b72a664908c48f0aa95cb22e902f5fb67c03168ec44713200809206c3738a009de8ded0c79 SHA512 6753f8af364e0e5dc7a4dba18253ac491f687ea3436babe5f692a895032bc9084ac663b0608445ef77bb6c7b9e8f4fcaf36351e75639fc257a566748d422c6b0
+EBUILD gentoo-sources-4.14.248.ebuild 736 BLAKE2B c3bc140c2819bbaf424e712aed3acdfcc02d037a88a5dfb4b0d1b7b86c514b80ebeee437dcd9fd203b03da13136e6b0d515850daae4ce53a548184ec97f3606c SHA512 f39e68ad96c8377bfe168f695ce738514587c4379a5de91df6d1167435e2b242cd717941c60080411ca72cefc37c420e534ec5db51adef3812c64acf2fad8781
 EBUILD gentoo-sources-4.19.205.ebuild 730 BLAKE2B e26633745f7837cefdec382c62ef90403a570fc5805be06f81986208e58d5d3cce15a9222feadfee1b5c39e0e7178d445006949d24e1f01a2db5b41b3b70b288 SHA512 69fc976572fbf3e3abf07fccce9ce6ec57a412c34cf97142c904d45fe865e0ebca9a37369376cd7241d109e552a6eee27db2a8fd19fcf5625568ff85d11251a6
 EBUILD gentoo-sources-4.19.206.ebuild 736 BLAKE2B 0b3ceb4cf6b267d56918f19371dea92b2c32bb72e43bf60132bc0a684579fe8d41885bedbf2407bc19b7a54492956d07018a71eef9ef6aca867b6e5dd0a74b54 SHA512 a26178e35dcca0fd4a89090489cfa30e88338ee672297d6f59efbda880ef9f54852178457f2d91f7af7f320d1ff7cc72959edb00317df8909125bf80c86a42d1
 EBUILD gentoo-sources-4.19.207.ebuild 736 BLAKE2B 84f17c9101194fd936e3e9de75a114c2c81e2a72c5ab4f597210f892b5cb4ecf617e5837e7fdd12c51a18b63f34e26d88c1a41bf6b9d487bbc688c988282baca SHA512 b450d636f4f57f9f9e3aebdda40311e5fae4764b09492c7e09861e232ba08bf83617269ae53688c044d9274375ccc1af0c5df7561043421e802962c2a719c30a
+EBUILD gentoo-sources-4.19.208.ebuild 736 BLAKE2B b9902d413c1e43acba7ede13ce386483cc20a6c96ea429303a91c7ecf77598d021cdfb7af2dc12eaebe575918c5749bef216a2893337bc3ffe833fbf8aa12620 SHA512 069f0e9a32f7cfcd396a1b9f7a4e32de573476d4827f4e1f36a059ded1f7c6c007a9ec0fda7e6feda4bc32480991088b9a1f929fed6f9a88e18c30e9748a2484
 EBUILD gentoo-sources-4.4.282.ebuild 730 BLAKE2B 15e9ef3dc54d7f7ef70e14782f343525a9c984e59854ff1865eb838e0a4de9d57f1a458660d8e4b8436dddc11aa4f79bba285471988253c99933c5a57f74c57f SHA512 35da1377e9ec9325324553a5dc32b8436ab0a9c2492adb767ca1eba9189b6bb98d3c989d2144ebc8c681ddfb27a4a4283150ef74ea05472c013f8fccdb1c1915
 EBUILD gentoo-sources-4.4.283.ebuild 736 BLAKE2B 8e89820b8438812976435e4b27aa3ecac2ecd50e1598f6eb64c46bf9a1c62f87792b44a660b2c683154c2763982f6aff7227605a610a0a776678940adba40159 SHA512 bde18ee0ad102e2b0fe7e3891e74cafe74c3708c000671e0bad6e89a85b7b8032a2e223216534ef21cc0cc63aa0a78c8ea137871db5cee014b0b29f471d7f5ff
 EBUILD gentoo-sources-4.4.284.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
+EBUILD gentoo-sources-4.4.285.ebuild 736 BLAKE2B 749061d5af0ba7d1e258c73d85c57e41401147010000d38f8f55a97299e9af4bac445b2d9ed431e978e0f1901235484819300bf8103c96196ee5690c31744e88 SHA512 f4c646bcf23cec85bd024b732b7ab403ca968071ff84da1f8dba137979979c9c14757ccc5c3e99a729f3399c59ea982577cfec9186f845ed86904a0731d4f6b4
 EBUILD gentoo-sources-4.9.281.ebuild 730 BLAKE2B 3b9f86cd30f60a8ed6bfd1c1eecb703ce542d29e5ffce465c61d6f03608c9bcb6f492809fb52d22eab444518c9facef15888615a555bae44ea5e78ffe3a9a67f SHA512 32316ac1bc4db8150ba4ea09394689ab8c76ef4ee870ea76d9adaf6b8f0303cf11efe7b810e88a8a29c38e1a9d92850f4b8b5c222e9ca5fad901d57a9effb2bf
 EBUILD gentoo-sources-4.9.282.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
 EBUILD gentoo-sources-4.9.283.ebuild 736 BLAKE2B 749061d5af0ba7d1e258c73d85c57e41401147010000d38f8f55a97299e9af4bac445b2d9ed431e978e0f1901235484819300bf8103c96196ee5690c31744e88 SHA512 f4c646bcf23cec85bd024b732b7ab403ca968071ff84da1f8dba137979979c9c14757ccc5c3e99a729f3399c59ea982577cfec9186f845ed86904a0731d4f6b4
+EBUILD gentoo-sources-4.9.284.ebuild 736 BLAKE2B 89ec013fe6d5197865fba5256ada4b8e835774058fadd1c8540047f72a49e61c97f51b332b1ab661f18c403b893db2ad4af2ba5374fb364bafa23f78af0d247c SHA512 68c48774be6b53190a7ba10802363568935ba52acd4710036494fc5ffcd6d0288895b31bd88ddc4e04a143a64264418bb0996023f61d178e5bc4defd75015fb7
 EBUILD gentoo-sources-5.10.61.ebuild 734 BLAKE2B b45954941fbee04fe5ef22e52e8dcf6dec19c0ce8960ae42f37b8c236d418589340aa63abaadb4531feaafb93b6326385851f82dcc8abfe584e2b67091dd279f SHA512 5bb91fb27d1a81cbe2e83685d7e231a46fd23ad08d9c77783dbcf710c6de7dbe5e20c42c0381e0e3dde9e55193dddcc89c965fe6159b8c536cc693d8c5f515cc
 EBUILD gentoo-sources-5.10.66.ebuild 742 BLAKE2B 1cf4a22fa28d505a964741a381eb0a07d73d1cc199b016c7bbb4867921868030d2e93ade96491b1acb0b7469bb42d3d93de48898102796850d2088e82787fd2a SHA512 0263007e35ad14c8dfe980729aace35b45abcbc48d9cbf6a739525cd948c6880e3201740f0e10f62d39bf3469a32cacc3be992c560104ffcfc9d530e65c99aed
 EBUILD gentoo-sources-5.10.67.ebuild 742 BLAKE2B 989a25ee17809f6b5c1653343bafc6e64f7d8853800acd48c173266d152b49c8d8bba5ffc60c38910addbe845c2dbc28dc21f341e1b54825c2a2120994f08022 SHA512 4c8123fe375233294d96fdcf76c4525aac214bff3c0365c98a22a58226bdd8cccf014c9a78bdd8945bf0bcf0977234504b33732787dd0a91b4b6600e14be7ad2
 EBUILD gentoo-sources-5.10.68.ebuild 742 BLAKE2B f4204d10db4e60a139a7b9cafdbb4012d5a38efc75d12a601319faf154eec78bc34e643e8d7525855efbb18c3e0b602a58ce65124a0fe7dd536899261c8a381e SHA512 c7951057c74ca226fb52071387e0b78edd717d02ea53839fde52225e85eec7215c5cb4ac0ab692125feadc3a1eb42ea76cef64cfeba040efb189216c44140862
+EBUILD gentoo-sources-5.10.69.ebuild 742 BLAKE2B 14e47f1921c09c9c9c022818a03a429d9609ee119dd6362a88b110ce1dec8773064f21612749176fde3286366798ba7ef329f0b6f42221dd7d4b718c424a3b9e SHA512 f7b6d3b9f9f3ca6ae4eea8f1ff9a765ce418035f18b05719d47a0b3019376489e47f15f319b4f085f0f6c03b7b6c0d1431e10904c78796f945439d61dcb88653
+EBUILD gentoo-sources-5.10.70.ebuild 742 BLAKE2B 989c19bd63198ce79dc3631a18db6641ca58b1f702e196b4c782b01861e1c00d211469c88c412ffc18336d19d5f3bbd34322ff8a676415cdc70b96f9cf2cd3c3 SHA512 b2b929a459cab097234a2286d788d115b21bbd2bef87da25560cf7a5c4a4a6bef16fbd9d4485b0b18fc68e786ce4f9612588736b81a7e77e57565948544df71a
 EBUILD gentoo-sources-5.13.16.ebuild 742 BLAKE2B 74b6ec98e31d744b30da21175eb89e36165427733c343e869437aa296994837eadf47330ff7e323c2e4bc8c62d6ab3fdadc7483249440264096fe464d46f0712 SHA512 e66af0a5b1a115f1be4789d7b53b5f2ea3820e4b2436c7e63dd51a898093ff72571a46c0e3dd29b8f9bb73707e15257a0b67626ef5151e89ee14b710fe196822
 EBUILD gentoo-sources-5.13.18.ebuild 742 BLAKE2B 76265b2c2b286b698b37d822c8c63183de8b39eccbb7f0af70cbaa3df10e7958c824e28d531b393b83fc7bc8c93318ba8aa61e1a0af53616204fcbb6d3522e83 SHA512 a7dac6cf5bc99dcee0386434da8241523e64056bab0b219317ca44846d0180ed77682079d2705b6a06cc43e87003905f646a32b02ca48cefae79167f3a9a3974
 EBUILD gentoo-sources-5.13.19.ebuild 742 BLAKE2B ed01b58ae704f13aedebb03c722ea77ad3ae2844096f144ebd48f98409c7d3ac40a4fd29e6c7e7a2819e8486467b44c437951cb2ca149e8746c010069de109f9 SHA512 49a02f52ee27fdca79b9fbba38efeaf5686d4bb2bfefb5db221fbc1894d998b91aa6da8ccce8f62e01d4f722c4348abde0275c4f5b39ddc0d7f3da3ad8bd7620
@@ -110,8 +146,12 @@ EBUILD gentoo-sources-5.14.3.ebuild 741 BLAKE2B 9a443c5a2837189e31b86920487fa066
 EBUILD gentoo-sources-5.14.5.ebuild 741 BLAKE2B ebabf5a8f4c7148efe0826f8fb3e793dbba0c494c6b02000f13138ef466603d4c9bb36f2a20dc89ef8dce3b9b1e96eeb116a6148926bf630f8b8ee78117df109 SHA512 4cc6d947f712b886b2db33093ca355555e189711441f5002a7052e89cb3731fc1905fddca90c4d30302277011ca1dbc0b8b6d6d1adc03bbd8196b11532c2e7f6
 EBUILD gentoo-sources-5.14.6.ebuild 741 BLAKE2B bbe96fedb8e0b92042297f268a5696ddf692d8615911176bb5109d9bd363013fea30fa7f68995b2e0e3a25539cdefaaf8853638a5e22cebc9a849807e7fe09bb SHA512 0c01d57a1d008a8207626a11ccdfa8a93b7c8a02312ec94a40d37b8e8f7852de9f2cb4a0045a1aa407dcd55e0a71ad531c4f040b9974968dccb19fe215beec2b
 EBUILD gentoo-sources-5.14.7.ebuild 741 BLAKE2B 62862b47ee529bd550507836f5fef896fd76b89ab82de6e8f36036e8990df9e3e008de96e9f90477095ed0c0131e6d1b3cc6a483ba97b94b2ee5756483b62d8e SHA512 4326503ff06f38b82d126907bd960cedf72faaa203b0c40350e668555b614a595c30f2c74a018578a562aeb2caa0f5128fd9b86f6b311adfcb2ee654cb269d86
+EBUILD gentoo-sources-5.14.8.ebuild 741 BLAKE2B 78abb67fc8906fc433e5c50b7858a4799f8c61f8a0f37e6491f77feeff92bc04ce9e6b62320f49ddbba4d698d743fe44896a6d6fe3d538f74c6784b75a837420 SHA512 2eac1bb97c105fc89ddb1bb3feca2b65f3658315e30e97f204ca4fdc8f1505adb62a89ed1bf8e001d1141a924c60c9ae4a9bb9711bff182864e8fe992ff5bc24
+EBUILD gentoo-sources-5.14.9.ebuild 742 BLAKE2B 66538f28b863bb7383192a0922a38e36f046fdacaf8722328588eb1a57f5cbb5b4fc81e44e464175704c76b50c1f8a5957a1c2d4ff138ec32b2e31a3c4f7c9ed SHA512 d31877cc74dec7701fde8ffacb90262f2f281c510d5111788a6d76aacddb9592aa55e2959a4528d3b3d939830feb77f0e26489999cffeace8e87b621ab016e14
 EBUILD gentoo-sources-5.4.143.ebuild 729 BLAKE2B 630fe7f8702b8915e52349dabfefa75c7ca51f870bdc41431d29b8de821785edfac011f943017701b20bc1ecab1d08066d2aad8ba2dde6be370c08a481024250 SHA512 2d154a27735f99b72e7557a609e24c2f9c9419ff60412437c0de32e4c47e22420f538dc0242a2357b8274bfca0d28ebe62b71cf2300808240d03a14ec1f4a922
 EBUILD gentoo-sources-5.4.145.ebuild 736 BLAKE2B 448a34e5bc35e08800369b779a67013ccf61fbfed95654b2af6f7784e3fac2b4489e65d9d615268534e73951aa110a061d020c66baae463a2722f659c45183ad SHA512 927419ce232bbfd8bf347ce57d4203b4778d35b8c42c39500828f3be728ba28ed84cdcc09c8b0666abf76f9ff9fe99deaf959cae1d43d98f3c0de4d54535b7cb
 EBUILD gentoo-sources-5.4.147.ebuild 736 BLAKE2B 4565fb498d5c70a575135c46b556bc8315136a56227de06b6827f4f91289a0f7d0281e6971958fc23be146b7d30decf5d6b2b91e1cbad1cdf4964c186519d341 SHA512 ebfc3a3683f2162e61a0743ca69e1d72b3d1d646ce8e91a9c7c686268e25e13bdf8a63fe0f3c0691828711c5962bbb4b027438414b0a028b001612e216948180
 EBUILD gentoo-sources-5.4.148.ebuild 736 BLAKE2B 95629ec606ef39856b9f04cc4ce437eaee9d29bff9d46d28b8c16b18bcde5e9dbc8769c3fc859f9c39b7166e8be2b7769b5b60afe6264b619bd0dbb26e850816 SHA512 c54b19512741120ecb99db9b0331a8d8ae3b386461a791c601bfecabf5d881b1ddd5f996f23f274b5efb261be069e8ff7ef05a1934abcdd075ebe5f75bd96aca
+EBUILD gentoo-sources-5.4.149.ebuild 736 BLAKE2B 538895332006b301a724a026e9445069da0172ab9a58f7d8f0f8957845d6afe2ebacd03139c97c7463ae799f7c46599d43cb9a606b9db7703f7e8ca18c3b8acb SHA512 cb8b55cc14a019cfa53d349e73da9cd76764e2e68cb507bd7098429096cf44f22521a78c4528e34bed2e395a7644644ed587578e98edd95ce27125dc5de6c687
+EBUILD gentoo-sources-5.4.150.ebuild 736 BLAKE2B ff099555f45557d654d9cf25ae7b20820f958f74eb0cc3c63c32a3b1d26ba358bca7ce664c2c294f45cabb133763cf3eeb5683eeb0b853f6dc541366c848c38a SHA512 5078e453a5b652bc867228bb4b7c76e4a8469db4d84db45faf15c6d436b0b22e02b2e7f93df3ecc413a6805d970b4c84c05a8d571f4c059d74c4d634c28c7c2e
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.248.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.248.ebuild
new file mode 100644
index 000000000000..c78a8238dee7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.248.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="258"
+
+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.208.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.208.ebuild
new file mode 100644
index 000000000000..2ca7fee2d26d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.208.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="207"
+
+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.285.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.285.ebuild
new file mode 100644
index 000000000000..5358a931cc66
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.285.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="287"
+
+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.284.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.284.ebuild
new file mode 100644
index 000000000000..32d7aa88cdb3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.284.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="288"
+
+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.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.69.ebuild
new file mode 100644
index 000000000000..4c9e7a1cd974
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.69.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="75"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.70.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.70.ebuild
new file mode 100644
index 000000000000..b1b9bf220b5f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.70.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="76"
+
+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.14.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.8.ebuild
new file mode 100644
index 000000000000..1ce68b29e781
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.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="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.14.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.9.ebuild
new file mode 100644
index 000000000000..c4af02fcbf12
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.9.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.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.149.ebuild
new file mode 100644
index 000000000000..940f41777fe7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.149.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="153"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.150.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.150.ebuild
new file mode 100644
index 000000000000..ba44c38704f8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.150.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="154"
+
+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 2121c4543574..f34f8b737aef 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,6 +1,8 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST patch-5.15-rc1.patch 41357462 BLAKE2B 7df3298b6dcf7eb5a4867e84dc801e344063645f12af695fd81cc8310dd6fe79da06412e893eefa220d45c0118de6f5ae1768bc009cdb1b37d9fc0bb4fdb919a SHA512 d045bb66c810b2fe2c700cbd4518a1329fdf006402e382bfcf0f097785409d00187df1fc998944abb46e5eaa6884cd5b50d20575adb4e77342ce11c951cf6317
 DIST patch-5.15-rc2.patch 41617220 BLAKE2B b2216f798e64ccbcd3d6a9ecbf77388a6af97bce43c913dc0b8561db909b15f242ea63a5a266c422f887ef5f1232119f30b213fa9604a57596611f69b51964e9 SHA512 76d1054282c00adef7c31701e0991e9d279e641ee4f009713169aea2f0c9e4cce0eca356e32ed8e818fef57b601f9205f2ff32e4a139bb2ac48a2bd1d2b4a178
+DIST patch-5.15-rc3.patch 41945558 BLAKE2B 550064d9cd8b30c062cd4411d169547317a406e259cc46b124a8e6115d2ff4e370903fad3a5bf4e62e9db07fb7d510ecf6c2b36ba27534b813cb379f7fe9c966 SHA512 6e3ae62519dd991d26eee5063d511749d282ad1b8a57d020ee179a5819ed7842f3f22c2ac8ec972f57bb1d4650f46ee3d8a98f52d33c7e82412e4968af2ed3cc
 EBUILD git-sources-5.15_rc1.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 EBUILD git-sources-5.15_rc2.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
+EBUILD git-sources-5.15_rc3.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-5.15_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.15_rc3.ebuild
new file mode 100644
index 000000000000..d7e4ec9a1508
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.15_rc3.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.14"
+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-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 99adb94bea33..6914dc19108d 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -24,14 +24,14 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 EBUILD linux-headers-3.18.ebuild 1280 BLAKE2B cf237c19d9bb56d7e251c00a6b088a78080a78ba235bd942dcc0ffcb1149cbbb62d017a766dcc42ef718ec31737bdaa158abd1fa24c4ac472545a8cec702d5f2 SHA512 a2bf7fd2bb17eafab257ba2474646023dbfeff4ead108eff3aad4ee55e6a5fa0b2b54a179e77a51a39ec7ec441c770ef97aef589cf93376b6c8adcd2ebf2c41f
 EBUILD linux-headers-4.14-r1.ebuild 1207 BLAKE2B a2f83d4b4acf2d5bc7af8b85edf5315079a3ddd88d76f5a0c445f68a605399372ba9112214e4700bc0080dc418adbcf1581ac65ee0c6ec992448c105432e232d SHA512 c92d881c59fa1dbc56cbc7ea676aed2bd58e07c40e99050e3272058c2f3d111b211af4a6ef54672ba33a9f403baf914b616eb92642c8149aebda48482293db4c
-EBUILD linux-headers-4.19.ebuild 1373 BLAKE2B b744a3c4cb9142109ce686097842d16401e14a0d77f7d8f1f74bce8be6bba3343ae4e44b268442405255dcbbcee618fcfa01196c46e67bcf5312296fb9030f11 SHA512 5d5b30ec0498b91ec0f41471efd5a0094fe829b97d29ba3beecfc88437ce9c794f32357121f8aed4acc2762a028ede8021ab81e29205642c545e925b235ad824
+EBUILD linux-headers-4.19.ebuild 1367 BLAKE2B 2298beea65dcbf8210e42449c661e2c793c5d5a0644737871026f8451568690a8bd0ceeb46a6baba216248a112d0be24d277442ab7a3b59b2d2387c7fe1e0949 SHA512 9bd2144602ea57630e137b408c99f32ab1e1ba36356e5851c3edd557a631f0a432203a8a953e016555f56dff2078fffcc61b47d7051135e04d4339640feeb41a
 EBUILD linux-headers-4.4.ebuild 1207 BLAKE2B a2f83d4b4acf2d5bc7af8b85edf5315079a3ddd88d76f5a0c445f68a605399372ba9112214e4700bc0080dc418adbcf1581ac65ee0c6ec992448c105432e232d SHA512 c92d881c59fa1dbc56cbc7ea676aed2bd58e07c40e99050e3272058c2f3d111b211af4a6ef54672ba33a9f403baf914b616eb92642c8149aebda48482293db4c
 EBUILD linux-headers-4.9.ebuild 1215 BLAKE2B 641beba0aeedcf495af4af596554315ba91fd22571f041c48e5f7ffb24555e185578e1c7b0767ce4721318804b3588bc2a3c33c4f90de6d9033dc081193d384a SHA512 46eb18922d636f49a45ac8eb8b5952cfb19a26b175d71f831a96894a2527e5d761bc019a0e7fb60d8e17cf22ad0f4b1cbe1f34655974182fbecfb10231a358e7
-EBUILD linux-headers-5.10.ebuild 1175 BLAKE2B c8326c663962d3e4292d29e0913e0b6a6061f6dc09cc364dd3a28202ab84e91f0b31528c9a163d80d11627173f4d782eed84d07976164ede8c0320a1bff6d359 SHA512 a6c13dd8513cf1dd7f0e14348c3ad5a0b7b103bc08e99d651ffeb791070fca5928cc36390079dcbb93ec820facbe35b7d535bbf500172a220421c15a4144b60a
-EBUILD linux-headers-5.11.ebuild 1183 BLAKE2B 5f4774c29db6c5ddbb5ffeb2eef8956fc07a9cad6f4dd542dbfd581a19abd112cc92d93335dba80e6f7bb1204fb9895c8dce3d994e5c2388a461511c8d7461d6 SHA512 3fc095305956a4492f6982be8e18e5ddb9890b46d7da58673efbcb50c5e5f2669d32e1dbf0d9e4b39259ad53acf184212725b03f03d8330dacc2e4f1dfa0dddd
-EBUILD linux-headers-5.12.ebuild 1171 BLAKE2B c2db71bee18137884812152afbc43898b896c65e7f8a77e97bd1f8028df44f303730b21151f5c814cd324c8a7fb4ae3ed006cac832b3ac8277c73b76a1f02108 SHA512 bc13a8c56e10d651e66801ef9cbac4b38713f9fe57ff28af8b037be19db099446eb9e1d8a047bbcf5af1c56a388d625d79af7d73ecc5177eade2e5046d7b2f91
+EBUILD linux-headers-5.10.ebuild 1172 BLAKE2B 55e8fc5e06f629903d36f8786931f4b16248085624af46d9354f2276bf70f01e2b176f383acb955c5ef4a19d6b1805bf0810ba3d1cd0231c9ff9e4e313ae4fb8 SHA512 641e226b70909a9b620aa0739ccad0758dd3817c0bf15fc1133aaefaeeba3089f3396360d996b85a3ef25946f32a2e0abd417a567ad8be91c1ea0139368e322d
+EBUILD linux-headers-5.11.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
+EBUILD linux-headers-5.12.ebuild 1168 BLAKE2B c18aaeb5837a9121292dead2a83de77c8e23926f3f18a84e5c17be036aebb68829576f830cd30d5b55e5a09aa1dfa36353e0e61af95d245d5098ea1bac961c25 SHA512 012d1b1510f57e3d5013fbc9d0fe1cc2b306e174aedd13c052f83562ec43c3f8d1bd9382f86ad8300e59de5840cda1698d719e7eb8b186b7704845c98b153dc8
 EBUILD linux-headers-5.13.ebuild 1102 BLAKE2B 9ccca73acfd898d26b1f3b891e1a12b7a9db736981b3d3e905ec406e0f5f72bd9ff4dfa462071c24e8c52f7aa0928042a1faf1bf5e6c59142a25ae4e24e62b72 SHA512 6aa07bf2b5d86594443734d94cc9efeab5cc3055cc925e361c91dfa531642d02689da3fc8578d981bdfaf18adb9526de6b6955e8862ee72d1a6d8b2bc45c4b63
-EBUILD linux-headers-5.14.ebuild 1144 BLAKE2B de5f567325d5c17e65e3c95784b7e41efb4e42ca96b9c6405fbf6b747197d7efa0e5a09ebe7aeee671b79ff0356d1b22d8c5a8eb1de459f4d680054e274b111c SHA512 0e6042e75d4e89aeb24ddf0a42fab3be0b74cc65afc5660acfff094f057f03df29c86f0bb8cb4d9ae9502d70a5825e93f960b8d5e8cbd047b09251e4a5652448
-EBUILD linux-headers-5.4-r1.ebuild 1185 BLAKE2B 826ebeec00e627b46485fdf883d3916d15b99d84f77afbe581ba3bebddc778f1d08e5fe34cbf4f1182467880c6a884d5e9a1e1025b779d5b7f7ad02ce830f479 SHA512 0135139f3892349169ba19ad2f2324089eaf4e5ba05404fd91d13efb965c0512e6cf2eecbc1fe6aa4ca4160f01c0943dfb773c3d46659f96168fe01c319deb85
-EBUILD linux-headers-5.9.ebuild 1183 BLAKE2B 5f4774c29db6c5ddbb5ffeb2eef8956fc07a9cad6f4dd542dbfd581a19abd112cc92d93335dba80e6f7bb1204fb9895c8dce3d994e5c2388a461511c8d7461d6 SHA512 3fc095305956a4492f6982be8e18e5ddb9890b46d7da58673efbcb50c5e5f2669d32e1dbf0d9e4b39259ad53acf184212725b03f03d8330dacc2e4f1dfa0dddd
+EBUILD linux-headers-5.14.ebuild 1151 BLAKE2B 3a2704581851089887f06ce7ac0dc02b2b5e88e7a2b81cc06e6147b269e982ba07630945c4393c27c22d075e44a340ce3c6b8e32f47cc2bffed728c7b15beec1 SHA512 46fc741184be80129e06591ef7d8afd92a34e5cc7be61e9d549d0a232345f025be835446dff01255f127ae97efedd460fbaee745bd2db4260dfc57c2a324d630
+EBUILD linux-headers-5.4-r1.ebuild 1182 BLAKE2B 91171636ae50ea4ee53c11c0d9038426227187f7a377190c6d1b9bc08e27ddfa9fb356d19e1408d4750ce6a56e1bb586eabd77e99525c392cfe95a1dda74c01a SHA512 65bb3e3e2c222f81e46c9c9e674e6718f1f38657d52a209499e1271e6ecb173bf7f70dfc7a1e96089cda665f84284f5c53907e12b075ae4d32b676a4c57371c3
+EBUILD linux-headers-5.9.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
 MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index 054c22728dd2..5a206d617974 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
@@ -10,9 +10,9 @@ detect_version
 
 PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.10.ebuild b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
index 7bb1f871f11f..716f218f7da5 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
@@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="1"
 SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.11.ebuild b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
index 47598e3e96bf..0368a1aa7b2a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
@@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="1"
 SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.12.ebuild b/sys-kernel/linux-headers/linux-headers-5.12.ebuild
index d17f51addf49..82fa20bbed27 100644
--- a/sys-kernel/linux-headers/linux-headers-5.12.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.12.ebuild
@@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="1"
 SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.14.ebuild b/sys-kernel/linux-headers/linux-headers-5.14.ebuild
index 248b46771562..8ac754c008de 100644
--- a/sys-kernel/linux-headers/linux-headers-5.14.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.14.ebuild
@@ -13,7 +13,7 @@ PATCH_VER="1"
 PATCH_DEV="sam"
 SRC_URI="
 	${KERNEL_URI}
-	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/linux-${PV}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
index 1d6010765604..0796ff62d424 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
@@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="2"
 SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-headers/linux-headers-5.9.ebuild b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
index 47598e3e96bf..0368a1aa7b2a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
@@ -12,7 +12,7 @@ PATCH_PV=${PV} # to ease testing new versions against not existing patches
 PATCH_VER="1"
 SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/sys-kernel/linux-next/Manifest b/sys-kernel/linux-next/Manifest
new file mode 100644
index 000000000000..d768cccec024
--- /dev/null
+++ b/sys-kernel/linux-next/Manifest
@@ -0,0 +1,2 @@
+EBUILD linux-next-9999.ebuild 637 BLAKE2B 785ee349b714102d7e7140b459a199b0738ab619d3f283db17749af403a2bf57ffd1510610329fc194ec36fb43b8ceb400c273af04195f7c4a4fe437b407a5f3 SHA512 ebb353e7c3f87b71119e708c3c2b1ac5a786f38f495367ac5bdad484aac2c2138c62a44ba57fa19afa31c39490312614fe6042efec93d1e4ece4500fd19ab5ef
+MISC metadata.xml 353 BLAKE2B 83a114d806b0772a63c18d1f978217eb576785befe053d852a517dfea2a8d080da98f8c346ee60f574c60c8f29aacc5d967ba79ded9992c131c9a1598bbfb72c SHA512 d62684d974917d2824ca1f1f87215eb8df5e0f656b217c9888107b9104a977e9667dcad4f321ebd36b007439d26380818838cc0db79c0c96a4aed4c96f485fbf
diff --git a/sys-kernel/linux-next/linux-next-9999.ebuild b/sys-kernel/linux-next/linux-next-9999.ebuild
new file mode 100644
index 000000000000..302a8eb1494e
--- /dev/null
+++ b/sys-kernel/linux-next/linux-next-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -> linux-next-${P}.git"
+EGIT_CLONE_TYPE="shallow"
+
+DESCRIPTION="Linux kernel and patches aimed at the next kernel merge window"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	eapply_user
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dodir /usr/src/
+	cp -R "${S}/" "${D}/usr/src/" || die "Install failed!"
+}
diff --git a/sys-kernel/linux-next/metadata.xml b/sys-kernel/linux-next/metadata.xml
new file mode 100644
index 000000000000..3335b243cbff
--- /dev/null
+++ b/sys-kernel/linux-next/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>kernel@gentoo.org</email>
+    <name>Gentoo Kernel Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index d8fc4f05dc95..925a0f17abd6 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -26,13 +26,13 @@ DIST pf-sources-5.13_p5.patch 6877998 BLAKE2B 6f4cfe4c2c98d56309ce57b4cb0eaab1c5
 DIST pf-sources-5.13_p6.patch 7070425 BLAKE2B bccbb3ea9777675b28f4ee5ddc1539188c8afe4facc6c4aa06beb11112e30846507414b0994c6b2e048180cb2eaedb612f772aebe16d70dea1f35f25cb30d81c SHA512 02928875462e3ae19df7a6d094f388be30a6b215e5fc2f5967fb570352351525f71c8b4fe60f6cc3179dbc5e7b2771979db90d9cfc89fb9e6c5501bc2c95bd41
 DIST pf-sources-5.14_p1.patch 3968070 BLAKE2B 8abeb3e0db3644e2b34cb3bf3b19d8eaab1bb1852964f26c6e5baedd24ad82760d352acee557e4b0af4fdfbc7ec05a497d966f98e3255d9f521a42958a12cd6d SHA512 c15ff5a30727983bfd8d1fc43be5efc31590e48b183cf0fa5bd46ea9c0ed4701cd1456d3b409b94bd1ee014e24be41667d85882074ffe4f3ffa07a16621c1796
 DIST pf-sources-5.14_p2.patch 4040142 BLAKE2B 6b41a69d8c9475ab5aab18de5cfc0e032197b8616e9aae40f0a7519ad58d1502502539139746e21c83295f3106350a403b6d677541f42b43d12ce60d4af619b4 SHA512 d22eeb8de3e31627d82edb1b95b42cf29d26b1f46898fbcb394ea22f7293824e8e0394253ac07d406ae1b51786707cb6845e8f466a01f2f347a79564c6450914
-DIST pf-sources-5.14_p3.patch 5339316 BLAKE2B 45e6c96308fea58fb9c492bd340ca20273553ef69969f335e556dab02b328eb6a82878f3b0f31b2d1b97ff53981d6026197bc3e684ac23998d7314b67fbc7275 SHA512 9bce640131dca46c4784afdd5ad1ef21b47c6bd1de4697d41d3f1c40a57783bafccb6d29912df4540cf4bf78692a8c727818705d99d08027fd51198935d07a14
+DIST pf-sources-5.14_p4.patch 5657590 BLAKE2B e48ed2c8fe30e9a008bdcec98d8ff620e87977bcece927b6e8fc90fcbbe7692316ecb4759b1ac4b7928384a14680fd39aedb9607a533e436d239aca3922f0463 SHA512 490baec19f2de8951867ac355c23cc92ea7aa6f4f09dfc8baacc0dfcbcddfb5da8021549304b4030a97df1bd615fbccc2b5869593a47450eec339fd074a694b2
 DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
 DIST prjc_v5.13-r2.patch 257231 BLAKE2B 943d3035035cdd1744ce0e075441224ffce04a1324dc9adfb355003b1fa6bcced1f63989845d1677ada0eac78f39b01d95d3fc7676c79b68858e8748c91b70d7 SHA512 1d9c80813e8f842b8b5da8b52e4348f329ef415b8cbef0a46f17eee64bf22fa8b1e443ae84ec9e7cf7ccff339d4b4bb2df9dfc894eea438e80f07446c82992db
 DIST prjc_v5.13-r3.patch 257137 BLAKE2B 22e05106ee91f104c69f8d11fa4072b28910b8202388a1778ac498f5128f8b93e6465c3e1ef0d9393aa5d01bfc226b3d6463fbba9e463305381a45cb5f015fa0 SHA512 d7dc67a9913d0d7723a616a11db2ab0798e65a6c2dfb99990bc2a4287c0c2e2eab72d17cdc3f93b884f006844f576379a9d8617b7e491dad278f3880d372bb17
 DIST prjc_v5.14-r0.patch 257363 BLAKE2B be92cdf72d285ded3f569f2423fa87b90d3e787e592ee3f8432ec758e3d6b6a4799f88cecfeced527d56fd68788b71f7064d289335f3d606c282a5b76383b0fe SHA512 a232b90e38db683aca55bfa29e6d9ef529c1999bcf8f8e58d36b8877cfd2b83c3d8e7447860fa29ca50b67bef73262e4e46df8220d204e579e97ae79caa3867d
 DIST prjc_v5.14-r1.patch 258914 BLAKE2B 12e7a488fcb97d394cb4062b4b5c6915aefd9fe93ad870d796b1207ec44b2cfe5f991574fdffac644f39389a1aac718e47e936b9ad32ec4b412adbe3a2884455 SHA512 876ec983722253f63a2da1f6eecc94fb687f5ccccb1c8d1955f732e2c8eec5239f163207d5ca3e7cb6c56b64b72d34df0ded606e12df9c1dd9a8c5a31581230a
-DIST prjc_v5.14-r2.patch 258081 BLAKE2B 94112f7d2c4a5444323f882ff0a2b0c2408f9b5993669be2e7da5b8ea56476a51f35c618b288186447cc412fc81fa46a51e515d041d8aa0fbf3fccc88257f06d SHA512 cde5ffaff37aa4246542434d07b4114e5fec2d202ea4d14a934f306e89d674045c55b8b67bc36f43ca6a7284ca4ebcb98e79d6fa48e8c0084da5c6ed37efd53c
+DIST prjc_v5.14-r3.patch 258757 BLAKE2B 27cd56595a131b7c9a45429d775ff3a0eea79f95674711acf0c0688716a0952150f335540457dc7aab05ac92c58e32e576ce3d392c7e0df51c93be28b17522b6 SHA512 9719b022a1798a7909cd7160917816c40310eb42fa4144f7b122dd57950c1088f2ab6fb9202f30591d7b793c6634a7b97e77af2e192043b95ae44751451af7cc
 EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.12_p6.ebuild 2760 BLAKE2B 9b45a1bec8a722502d3f91fb82f9c44654abd1d7df72b27f34ddd105a2b78ece01f9542efabada927743268aef5dbef6fb3b84fff35fc8c9dfe0c4c5edbabd46 SHA512 479dea03a3062b376134f7a23bfa64e84ee1f6f0e6691117843b05eed9019813a4c8206be8e85cf18044375515e67e72bfe9ac17ff4552236d84ca26930f9fd1
 EBUILD pf-sources-5.13_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
@@ -42,5 +42,5 @@ EBUILD pf-sources-5.13_p5.ebuild 2258 BLAKE2B 268d5f704189c9778ee64c27885059608f
 EBUILD pf-sources-5.13_p6.ebuild 2258 BLAKE2B 70d01125643ae392f74dcd0ecd615c462c4272ae1a0ec5739e8257a47c83c85ade98611163378b8104df3b398f4f5a76c52e035c9b57a56d66e451685640d31c SHA512 7ff0df01358b1cf2f72e70d74dd27350b21513168ea020bdb089152d7054f7457538ca6d275f7719aadd1065c029c3ee3563a3ffeb69def02a2d01b5f183336a
 EBUILD pf-sources-5.14_p1.ebuild 2258 BLAKE2B 39f5758effb38e8802d3dc42093f9e45fece0e44d5b0efdea9778eda51645e4b7b4595f175506bf57fb7b6029c3adddf07156ad8e45906c5129f25eb9839ac88 SHA512 15a4a46dea772329a1293cb441f4c3ecad2f8219870c724f1cc1de5bc9d92855e628ccd0c9cee0dd3caad4ed57656183e4586aa0c1d3b0ce04ec8434b32c19f6
 EBUILD pf-sources-5.14_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
-EBUILD pf-sources-5.14_p3.ebuild 2443 BLAKE2B 3608fe969f5071b77a0fa1ae18c855875b83697c83189fd9e02f460bffeae9e38c8aabdeba5e332433dac3e2baf2b3a61f56d4d0fbdcdfab0b3f4bab433912db SHA512 b5d3d1c8c925fcfa1d164b8aec83853c5859fdb082a910d2bb9b566118d2f77e98ca773feee61b9869d9be8fe5118ec3eac81ad14631fdf986ab0ecb5aa6f8c2
+EBUILD pf-sources-5.14_p4.ebuild 2443 BLAKE2B a86072cf5e719c8762cf4c06910d670c4f12129d370fe2eea4aa573ff11fed1a38cadc643b88624fa07c22226c847ce7bdb44df9e6fbe81a5504b204b3b28e80 SHA512 503099839ffe38b3a7449eb5775bb0c64a9e443597451bf1c9db09dfe632f309cb966bd3b5e329abff42708b111c195f44881ad09c84931f489651b14049be50
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.14_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.14_p3.ebuild
deleted file mode 100644
index 6bd67954ec31..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.14_p3.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
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version, i.e.
-# 5.14-r2 = 2
-PRJC_R=2
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch"
-	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.14_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.14_p4.ebuild
new file mode 100644
index 000000000000..0ca0c4f4e3ee
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.14_p4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# https://gitlab.com/alfredchen/projectc/ revision for a major version, i.e.
+# 5.14-r2 = 2
+PRJC_R=3
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 8d5565a3a7e1..482693fcb391 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -19,14 +19,32 @@ DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc204
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.68.tar.sign 991 BLAKE2B f418314ac525edb55b161244b27b62808af563606b0f5f06542d72bca558e38dc94f5bf4be32546b3b0db3718fedccb63c9e99579bb4c829029de6a34128c5a9 SHA512 a522887a75776b7ed2b3cdcf0e8337fceaf7a60ec2f9758f805538038c9e6a0a0c8b73b43ae6d31535688c03def2d66e0d612a8f4388a583bb6cf58cbb89ef5e
 DIST linux-5.10.68.tar.xz 116420600 BLAKE2B 826e796cef5be82ab54fbaefa14c104561429ce051cf2455d21da7f0a112d3ef1cd99a9ee287565792d46d4b0fcb880f3c3849779a9b04182cb897e37372b032 SHA512 9430f0b0e66513101ee4905eb8fb3cd14b7f64eb2847bd53704bfd99b1a608ec9c2ccb7de5e8bb2ce8a20d59654f94e38b62ee2212ed53461edd2fad137d2eeb
+DIST linux-5.10.69.tar.sign 991 BLAKE2B eba1042c07f142456affc9a7a52427a812d041180f0e7f6882559a55b93002d042988713a9f8fec1ab5d81e85818c3ee5745b5e52527febad97f20ce095deee7 SHA512 62529072a6edd6bcd6c87940389db0c0b31910d9266a90a0357a17b2e9ee0d9b2b9e4352e87dc109c7c865f389b5d7b164e146f0084959dfab6b6b66ad3c0697
+DIST linux-5.10.69.tar.xz 116436852 BLAKE2B 09cad7df49f95459e08766d2a98d74007ee42a1e845f50259f88301a9e6368fc34decec3776d8d736cbd08ee73863c72b1b02bc345193d065c86d27e3922ebf7 SHA512 a86a6becdac8359b59647c01048d8cc21316e3bf113df85511e9890ca99b887b2def1e3bf0310bac54a986adeebfa9c76c6c4b9b805183d7e9ae10944fc051e4
+DIST linux-5.10.70.tar.sign 991 BLAKE2B 2a7b6af50b66a8447156cbd191aab6b99d4cf2632c1de769eafc6eb111caa0ba4e571b78fdb7877eab390625181274a2e61492d0310d51911f646a86d1770854 SHA512 80574a393ef40439c41341a3ba46eff0422460e51485dab29c2250ff9fb3a8ee9a17a7960c957128df08dcdddea578d616c94d5d74166d96f45cd490fe1b1ab7
+DIST linux-5.10.70.tar.xz 116426828 BLAKE2B 3bdb1890f1dca4bc20f1e3a5d9295bf3c9e598390ce71694049f7818526b8aaa173e2d24465d4e9da66a37254eccfe3bd34b3898a9f1c72ba372c196f956ca22 SHA512 db69bfd232d3d573d970fad673710232000fd52ae7abc60f73cea8beda88e9c3383c12a1e583aa798a4134b8646ab3cc8a251c16b0f6e7ba3301cdda9ca19d62
 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.7.tar.sign 989 BLAKE2B fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7 SHA512 4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871
 DIST linux-5.14.7.tar.xz 120688920 BLAKE2B 861405cd1333958cb829017b6c1d6692a7256d179a48fad751bb02cd02ba09227ff210d9252c592a99d3820c1fbdcc3a6e133cbed31fdecb68ba9cf27dfc8f78 SHA512 ab1dd61a9e0e5ed82b38684d01fbc5c00fbf28acdd5ee754095a9fabe5a5fca7c220b37f80c2adbdd0bd46be461ded6397e40f7a827ea18035124f06756ad743
+DIST linux-5.14.8.tar.sign 989 BLAKE2B 2987fdf70a35ffbc5a8b63dd821f83e4eee25cea66518a41a91a48d22c5670f497abce18b94ca4a351122c78fd02c240a6a5fe9514873aa396ce2a79ddb83301 SHA512 ff7c67c99237b7f52942c54a9ee1f4a1272760232bb7e65d314484ad773d1fcb37070e404b458721e3d3d92f5849a001479a370c9bc3e5b5c72651ac33d1d8f8
+DIST linux-5.14.8.tar.xz 120697148 BLAKE2B 62d3206583c5093f8396370c3d3df9bba507562825ea4010bed7cea4b0d8d0c06fb4d2276dca2f94e40faec3180405bbe9f20143a04a54df202d17500023e694 SHA512 7da2a72f30d394a66088015873c63ee47160048c5058c0662e334a967ca14ae3259832434775ded49c23d0f2f8123b1ea1bd925b2069c43fa0301d1af054c80f
+DIST linux-5.14.9.tar.sign 989 BLAKE2B fd6c91741b5377e2005d6f49016539486dd0d3baca7961e68ae1cdfac9562472470d7242c21c09de00d726ecb6859e972eed02cb71adb6d6f8716e3e3b746214 SHA512 79e65fc539186eafaea925c3985b646887c473e11923a11c2f38adbdc26cbb097223866e4b8745e27ebecf1240c821bf14eb80be2a97d551ef7d931c00668d0a
+DIST linux-5.14.9.tar.xz 120692080 BLAKE2B 3d3c4e64ddf53454c25a283287cfac2f8d9674e146c7fdf80d130cfa50252fc52c57ad187f47db09d134a2ea49e16bda5018c83cd7c38c6cec9bc2e27a18b751 SHA512 987ae9ceba83ba12e5e1962118831dbc47eaf26848cfd83b93db58f004dbc3c8d10d62a33cf449abddcfe996023dc705207c43a22aae665461eff9d7365bbc00
 DIST linux-5.4.148.tar.sign 991 BLAKE2B 7e1956bb8e2f801374bd4a7247bf36f1153ddc4edcb417fa311e33b748b3c1448f3a4dcac2825393002232976cf3ad86d3cc0888398bebe5697e5c93b63f59b5 SHA512 abb9491a3315e23ff2939f1d15a2df55eb34561b0340987b9b40e992ce43d7de2cff9b9a729f41b0c030aa0fa783f983823a9100f97c9cfb43402851b6caf13e
 DIST linux-5.4.148.tar.xz 109151568 BLAKE2B 67891fe744cef7a69ea992720256a88e1497a5b687e6f43aee8b3ffde7933e99c10ae5b42d954a6f56435677dcfe53f73f577601adfcf40381ae2209d662e942 SHA512 8793545e4ec419153f8a7c9f4b779cca2d5a2abaab8ccf5d482473282faf71284f6ec08fa195e40d01803d65c079a4f23fe1d95a01f966b7209015635f5e0d23
+DIST linux-5.4.149.tar.sign 991 BLAKE2B 879b5dc9582b207bcc3c7f596cd69b16b0aeae263e864b06afb45c5d72c5c80dcb70d5a4d6efde168d40ecb3f175defa3462c3b8704d473f500d636759452003 SHA512 7e6781e242a4726a5928130180206602bc6990bcd58d320a3ed7e0e83be356f3ce763c25b57283f274fc1a071a940747716dbed1db96eb9ee3cb600fff4bfbc0
+DIST linux-5.4.149.tar.xz 109157092 BLAKE2B ae84c14229bb8b60d6e471b9ec5d972c7b25ffc1ed50763d8c2a3b5862adfa1deab28a7cdbcb06741e61fa6b6217d2392855d3a7e84c9313a9d07bfba16e426c SHA512 74cab8eeb345da9842ad87ea92563c928cb91b94bd056a250adf5b07f68f2ab28bce2f09a80e9ba3b1b6833807350f01a7661066cb08015d814a6886cca46783
+DIST linux-5.4.150.tar.sign 991 BLAKE2B 6292a8c6bc16f62201d95a170e5df7b1edd9f33ee4274a3ebaf908cabcabee740e376f92eefbcf36efbbca6200682622a80f573cf7f872978d263d2dd44595eb SHA512 cf6925f0f9307ec7ebb4345c84a74fdf98102e0a3866dc997c765f7f836be5101ae34d0655a4c5c1c632182da962ea49389056358661763eeacb4ed5814a094c
+DIST linux-5.4.150.tar.xz 109155076 BLAKE2B e34c474778d2ba1a619551fdb6c81be01ed0d155ab447bfcbe497c2258637b939fc1dda7d7161d8782e38d8c84e9fc94043d62a43698258594fdd6cfea8ac79b SHA512 5f6cc5852cb1e881027b8724920dd03b96f3ce2a58353ada6f7cf5bb0bffb3a8d4ded708f50963074ff41236e8c0aeaa7f81df0ac8e4f1147a7c4a0160c2c543
 EBUILD vanilla-kernel-5.10.68.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.69.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.70.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.13.19.ebuild 2911 BLAKE2B 3bd4c0c39d864d5f47bb3c1982678cafce6582f058499d37759cf0a7c6b3d9801dba32919336c32e09ae304e2d518471cf8d250c0b5c25e2b02603f8ac9b7f9c SHA512 1771f396d100988ffa05ea691cc1013c185bf75742f9b41aa114a23258855147693bcf383ab382582d6a8976883e887f11be64bf9c273c369c12eac467c6cc24
 EBUILD vanilla-kernel-5.14.7.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
+EBUILD vanilla-kernel-5.14.8.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
+EBUILD vanilla-kernel-5.14.9.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.4.148.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.149.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.150.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.69.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.69.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.69.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.10.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.70.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.70.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.14.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.8.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.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.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+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.14.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.9.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.9.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.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+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.149.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.149.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.149.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-kernel/vanilla-kernel-5.4.150.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.150.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.150.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 d68f549d0196..1887b1bb6426 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.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.247.xz 4445692 BLAKE2B fe2fb9ad0557704f1ddd47690589bd3caea13c4f59e1df1b81ffe5c5265d5c789907b445c31fed7368cd751e0d5c08dbc57501dded32e58f0260be54b3ec14b1 SHA512 979aff14bc75f5fb510e2b7b21e665442277890c9ba2bb34c3e32fbdbf0a07e11a56f0553449316a83a8e70d705d28cfbb867c4206ce64ce59a7f630affdf199
-DIST patch-4.19.207.xz 4254260 BLAKE2B 2aafba5010814146cd465a1ec7dc7f91fdf4b3b171b758005c8b6ae09db7ee8d62bec13f63f55a8b0e6227b5a1299f8b9e87347cdf5430fe245b89a3fb2e5a8d SHA512 e387d6dae1e15781a33c11b01f2ed36cf10247304b7b1cb043768b4c39179440468d818607e618dfe1c197d4abb05c4f68cf7e77d1045f31ae88f90600f78c2b
-DIST patch-4.4.284.xz 3652352 BLAKE2B 24affcdb4aed3f997a64c23a4d1b01d9cabf0c2b4130be43c22e873e3b63ba03e7d36f9fae6de79fc0c7cda6c0ae939d5bd2683f87cb392a051f759512374289 SHA512 1eb53a26c2753eaf36dc633a8e85907c4ad16e239a207e6ee7372c7f73ce11c801ad5b397f1f8b355d6e7d570d6a56b111637058078ef6104ac15c60ea0bcbfa
-DIST patch-4.9.283.xz 4096816 BLAKE2B 6be784c89199b11cd54c5f8a8d29e0b25df220e43d6e18708681337e17b7a730e2ffb3bc5af3ac2c19789f64db2fbeba09e659ce20acc30aa5bf9780c7f05395 SHA512 40bd8724742defb848ef27eb16e97fdf6bac34debcc3778fc8a15b3317b8ad3bc8753e0e21534418aa829ee45990edf17cbced0782c908ec04614f8576a78144
-DIST patch-5.10.68.xz 2132136 BLAKE2B e024d65db658ad254cad9e23df51e875cf3846f0c5743636ffdb0d8015e9e5ada58f9af041c0f234565f08b7ae79151632019e996f385b3bc46e9dd91f6b57fb SHA512 7112d28cb463b141ac4aa43555cb3f263aeab8436c72a502b6b513b5232c639ea644ce5f76d7d33264cc4092d34ac265ca4cf82e1b5f4b921ff311ca95289de7
-DIST patch-5.13.18.xz 805920 BLAKE2B 70d45a05eb4fb8ecdeb32817d7e5f1b78adeea1482b5cc82cb8fd5b4dae48a1cf6d4450da53d750d8ea67aae1fc52e22710d85c4b5a354a74fb4c7b08198eb03 SHA512 e55f8653c52838e2bdfea27c12027b7cbdce4c774851e537bda073ad0f95d04dc5077496ee566573438690f8d1a0a922cdbb2b82f7ddfdddc4a316f7e594b9e5
-DIST patch-5.14.7.xz 308020 BLAKE2B 5c7c2c4552a70c249ae7b9bfccb2c9361bbc30189a402b9c9224b217bbaadf0f1cdc0fc24eb27701487cc2c5b0b77c9a5c789107a278df6135026d662da201ed SHA512 15ef2d99e132f44f825788dcddbab7fa9ea54185ccf605b85d892b66b4b5c4044e35618dad902d6c49b73ee3af2a7ca0a155f7550dfc1f8a420e3942a984ae2b
-DIST patch-5.4.148.xz 3364936 BLAKE2B 9bdb44b36b1a2f53f23fb72c4740c1593200179fab0b0d22671be8661cbff73310891cb6b9d9488e1ce3d0f91733354f576b853bfad95d8360eef6d1fb902a00 SHA512 927ef1c41346c65bdfee4ed2de55a72407f5a13ecbc1cd571213000dd7aa4df6d2be294cf2f56cb4a1df613e9f274675b053c4a73b59ac069160f4403a246726
-EBUILD vanilla-sources-4.14.247.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.19.207.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.4.284.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.9.283.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.10.68.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.13.18.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.14.7.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.4.148.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+DIST patch-4.14.248.xz 4448384 BLAKE2B f0525768fbc1f1ed50dff91fa042eb5ccb4cb0df08744b7a29db198ca8c75a5e6d8cd279b0e36c60b87ad42a9acd4173d508ca860d448ba1982f6d278e31b32d SHA512 147fda59f9546bb8a9972adccccc0846276b2a0a9435ef066605c7a35396590ea87ca89645f6eec6b8bddd4a357556a5a4d57434346b629ddcf04d7bd69b1358
+DIST patch-4.19.208.xz 4258552 BLAKE2B 4ed8a084f3899e99872fe4df19b734909f76c653550fb0b1500d45dbced792a0eed62a83e1888c542ee6b4dfa73a41efb238def2434db6a0f760e746cc374816 SHA512 61d3251b23a2b9180426283bfa45bc44a94be6c251e7919f8f8ffeeec602219263a8bbc1964663ca5e71acd09b26851b638bc7d6b04ce30ebdacefe1553b6a0e
+DIST patch-4.4.285.xz 3655508 BLAKE2B 4a057d23e30e9923f5d28fd4b33f501ad903e96f1d868a28dfc761eabc7a98352ed47400b7d96e34760a393b4be6df8c2b98e251b307dfe6b0a206927a7d5a7f SHA512 c98dea291e2687808b587dd459c6380bb5f25db557a9b62ee0ef17b3d9ac89f13ea6a2333f715b0b424640368d4aeaa0913b8f9392c666152dcee1eb240df0a2
+DIST patch-4.9.284.xz 4100056 BLAKE2B 6055fafd9943505ddd9b4eebe7f157769b5437b16b1f6aa5205673b8816a03299599a97db371e1f81d99f4fe68a6cbcfa275d800a3396e88a8d1a9574c824fbf SHA512 7c0826b321d043a0bd9cecc3ea6f4c3377be91c42a5ecbcfebe8e22eacfb8e1e877c29626607f9813c510844480ee804f954580975261b145369e9c6cc2ed1e6
+DIST patch-5.10.70.xz 2169468 BLAKE2B 33cd8b682efb81e5a2a2191139bc327e1fa534cf9ebd2f43760c1ac63eb4ab0d7f7a6cee4d8aec8b135429774d93c81e8e843c4dd0f9bb7f7f8d2d4201cbfc6b SHA512 2e305f9e1d4b815a8468dd66c4319b099edafce1f353de94c83438d3746bbeddc01149bb8ca21fbde78a87ece3031292447932e04eede169058a09c16942cfb6
+DIST patch-5.13.19.xz 917200 BLAKE2B 5f467e1bd880708e82971b6b1b586baab8b2fe77639a29df1a256317d6b894ea8cd78cb2b72da96e5fabf8bc96bf39dcdb366360af3586336ffcaf0aa57970c7 SHA512 1d3695ee5f623a0b27c4c9682541bf096a75310a4fb3a3d76b3c513f95b244679b4950040e9f1261dabfdd5cc908ba37a639556974f634fd4476f52ce5e5a573
+DIST patch-5.14.9.xz 385752 BLAKE2B 7d9775029780051aa2ada21242964a2cf231b0826466a0b554d59d8a03db75bf1d89c73064f689b07adefa529a3c06fa926190cbeb8ed54967e04e07c165571d SHA512 a8f4619d6ed6be2daae9a32da0d0bb67e170490a320acdefc8b344beebf32893026ef309f729405ed325078b5b1e34d8d7b94b23ccbadbdb8869536747f3c4dc
+DIST patch-5.4.150.xz 3388972 BLAKE2B ad5f9ca4dae5d1bb5a33bae4e38829bb7b97f1655dbcdd55dc659fc700bb926e1eae5380f8dcdaf0eb66f9ea72979e284e6f244be456160afaf2ed9e74885f89 SHA512 22a2b2f9ecb6226db8eb1a1beee10f0668cb5e40841571208df3cf7c578bce27bd088db8a6ddecbdca5a16176e84380e53f1efe1b2667373454639a58900b99a
+EBUILD vanilla-sources-4.14.248.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.19.208.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.4.285.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.9.284.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.10.70.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.13.19.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.14.9.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.4.150.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.247.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.248.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.247.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.248.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.207.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.208.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.207.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.208.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.284.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.285.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.284.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.285.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.283.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.284.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.283.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.284.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.68.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.70.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.68.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.70.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.13.19.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.18.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.13.19.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.14.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.14.9.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.14.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.14.9.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.148.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.150.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.148.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.150.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ceb0ec0896db..26d98feda720 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 97f564dcb390..4d6201f26a75 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,22 +1,16 @@
 DIST llvm-gentoo-patchset-10.0.1-4.tar.xz 10472 BLAKE2B be17f25c8e1ba102c7653ccd3890be2da18566d051dcc35eeccf738d0cdfd4c98fed1c9e3d8fada0a394acda4568d4579534255e9706912581070d3cbdb2140a SHA512 794cb77c3002b398a2fcd5f845a41f9d075ba5db53d13665c64958ec809a181ef95d054a0850e49066ef1e926e326077f4305e088ee29f30acf9c2e98161be15
 DIST llvm-gentoo-patchset-11.1.0-3.tar.xz 5984 BLAKE2B 89056fb8e82c7a29ae76c643ac631876d51391ffb579324aaf13c7f79e03f6fd8bbcb27d46e57e0f04a702602ebf51c116e82cb092452a1dbc97fb0eb7518f11 SHA512 08aabe8836b62ecfde4e264d567169ba495d5b5915b56aba35ae86992387e534bba6d512fde94056e641abe909b478e47edcbdaa3ee0b94182ecd68c98201441
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 5953 BLAKE2B 0ec7119964117296614c6b628be687413ec34520566e03d9f21347e703ea3cb4dfe7b8423e97623fe1c1e1b8a02adc903f88f3231973b37e37b65da914f28549 SHA512 507194770b1410304a20b50a138579c2f0fdb55064693b6404ee509a9623e9174f063ce0f07f5b79da052f6e4b6d99c01b42be55113effb6aaa5c112c3fa7363
 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea
-EBUILD compiler-rt-sanitizers-13.0.0_rc2.ebuild 5937 BLAKE2B 34e03d52dbf84889dee002c954abf963e47d3ac4392f162543635f10b14d031ab9cde767968a200e669a31f7aa4dced6a4e3f22d3a7fdaa2fc6109a7761a80eb SHA512 cf22df030b72296bcffad9b741d85ea031ff2b941ea540b4021928797f3f3667929cb586b4389f93aee3c063151e72f6ac14d2dcaea27c71e68272beac3d68a0
-EBUILD compiler-rt-sanitizers-13.0.0_rc3.ebuild 5937 BLAKE2B 992a296137d038e8bab1363e04d07278049c872de95ec57af695a3933b673d2b9ab2ce8fc998ca40506b4084dd5d1ad4b7ad51bb11f6abc4f003c32e27118745 SHA512 66df28c9d0a4ee02b419d876183c324831b6851aff8fd7d146f2ff97d68f24f9a219455f1c6ced4434daf0a1719ad062c1eb1ac297ee4a8d2cfa772dc40675d9
-EBUILD compiler-rt-sanitizers-13.0.0_rc4.ebuild 5936 BLAKE2B 09efc3324928d51be74a368f49c79b2e1609dd9f8c0784e9f430b4da0d4edb0d78e042272261556ca6386178c3075cb65848585c11c61609b4d30055497ac043 SHA512 5e4c1d2458d66870a7181c33e89f6ccce203056f7ac02c0b1e6a764becb7639d9e38ee648d98963a4bc9d30772fd284a6d200f215a16a89e4b974c0ba7db528d
+EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6008 BLAKE2B 97e09eae5b4a5aca5f4b9e8c9a3be4fb064fb9c1862ef1311d069a09eec7418e6ca3c5876bbdb3888bebfce21b7bb9db0764a6a66765e8e28af68ab229b5d07d SHA512 23d73f2f034d739593ecf65938f8aa1687490557a78318c0631d9b97c667a5af12133357a5ddab45b3d3f4e307677c0ccf6cf11c1acbe354339c9da225bc9e91
 EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea
 MISC metadata.xml 1387 BLAKE2B 0da208a4e86ac6bcbe8a4bd585954e808b66995f8506f199fad46ab6ed21e23ba3af856a9890961d2bcb3ef62b5d5184cf8cc5b69ade82c3733251a0f83bdf4b SHA512 8ae0880c2f6ea556e9954760ca43ceb77180e38999648029533f78768bcd1fed2e67e418d6ebf02621946bae6685ccc37be84a47f10e45a78c0b3ce285a20f0b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
new file mode 100644
index 000000000000..748cbd21f407
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.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="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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=${PV/_/-}
+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-13.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc2.ebuild
deleted file mode 100644
index c0a18eb4e4cd..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,201 +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 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=13.0.0-rc2
-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-13.0.0_rc3.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc3.ebuild
deleted file mode 100644
index 63fd37c7f2af..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,201 +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 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=13.0.0-rc3
-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-13.0.0_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc4.ebuild
deleted file mode 100644
index 2bc8c92f6b03..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,201 +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 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=${PV/_/-}
-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/Manifest b/sys-libs/compiler-rt/Manifest
index 91f5a0998d5c..781e0b031990 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,22 +1,16 @@
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 3539 BLAKE2B 7d6bd0a7be4fec1b8427aa9d81eacf69d3338490c70f097910ad0bb4a67f0313ea8fd6bae15a5e05b8805cad6a789124d94ee91577a58beb96f471a1bf49c3b3 SHA512 bd671f1896182a00ade3b53252ba6b7cb8a6f65eec3d806bbfc7bd4e2b9253a8bc2bd497c018705f34fb30ad1897693af268c6e4cc39e044c788807042d7b55e
 EBUILD compiler-rt-13.0.0.9999.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb
-EBUILD compiler-rt-13.0.0_rc2.ebuild 3506 BLAKE2B 87f936697597bb9614737e138af66a6757b05809006282f09c48835cccc67b10fa1a213acdce787a1b97bf151222d51656c67ae0a501f186576c53a8ec0e3064 SHA512 7a5597c06699cff29a9c5dafa01e63a9f5906def630f9c442b24e275ba9f47b31ee9efd598db32bb3a8484d4cb645ead385ae308f0c345c05ebfec7911a42525
-EBUILD compiler-rt-13.0.0_rc3.ebuild 3506 BLAKE2B be684d622dd2f81d8c9014c4facd8f082f116e3cc9e61751a71fd2ea20c2211be79d08f078e5a82586bf91a7d8cbfbc51935120c4950a14b1feda1a80209747b SHA512 77f23b7e9b2052c30fa672c76765d3aad7ed11d76d1e237ff68676d7b42ea16896a1e1b08a706a44df4836c86ed065ee4879581a7ec327c912331940a1ea0bdb
-EBUILD compiler-rt-13.0.0_rc4.ebuild 3505 BLAKE2B c8876895c601a80ca8fcbfef036f602d78bba67b9bd1851129cfbc1f3adccd5290537049d2b7bd8b1c63cf3efca03662d68777e74c53ebb58d2378b06b7a878f SHA512 16b75844af23fa51d2d2e3e4ca85b9f970f7a4eab7e667c324c2f85d4b55f64cc2cd109e82c657a1273587229b1c71062d0f6544516c366c64db5fb98a958cad
+EBUILD compiler-rt-13.0.0.ebuild 3577 BLAKE2B b6e446276e8bfc423fdd76f3f27d2eeda8ff6967022a414fb671b33e4f19b722a634c26f770d1634377e364f9dc786cf300610dc48d2954e222f54bd42f5b177 SHA512 ca42d856d4c9c7e4debf61302e3f1da3c3b42c519982669c459dcd2a0129c911ee480034b5817081dc4e2a93a59a88817506c9307f82568170c0054b991a6938
 EBUILD compiler-rt-14.0.0.9999.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb
 MISC metadata.xml 334 BLAKE2B e52ad011edc624e8b4c6449a9c77d0972222c4e3ecad01ea24eb9f3175053b191df6267886a186bc3e169581b86b624b6c77f37fac763a12129a1dd8cd6ee285 SHA512 1bf0f62c12690e6596650e8872405fc53bc3c4bbddcf80e02b3bcce9b762f0aa02d462949b9b54c0c930ca6cce5518333e79951ae57378def8eb9719463a9297
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild
new file mode 100644
index 000000000000..a3954df9f7dc
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.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="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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=${PV/_/-}
+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-13.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0_rc2.ebuild
deleted file mode 100644
index 147083d93830..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=13.0.0-rc2
-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-13.0.0_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0_rc3.ebuild
deleted file mode 100644
index f02e75e2f696..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=13.0.0-rc3
-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-13.0.0_rc4.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0_rc4.ebuild
deleted file mode 100644
index 3937f53b059d..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=${PV/_/-}
-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/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index cf35c165cbe8..778ec96c38c7 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -6,5 +6,5 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19
 EBUILD e2fsprogs-libs-1.45.7.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec
 EBUILD e2fsprogs-libs-1.46.2.ebuild 2165 BLAKE2B 44cc1ac086d3ac2eb4c4d4f50d9ae5ded1d228d649a6cff419b004704bf53deb7990fd35b1deb3e7530e39a8dfb9c5b132c9e5c7c4f7ede6f13a1d62413f904b SHA512 e64cb7028755b02fa98eb0e7b3e469c36fec97207c16d6298fb162ce87ab2b05fe8a3539eea00f72d4e4053fff980339ed3fecad7bae0f512ca1a12af1e33165
 EBUILD e2fsprogs-libs-1.46.3.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120
-EBUILD e2fsprogs-libs-1.46.4.ebuild 2164 BLAKE2B e5d6d24b60b826d03662825e2f524d7f1df2efeb202f59056c302feab61aa42fdf0dca2835d80a6a12780b0d7a95c6dbcb4ce911c093215fcd52066c4f9132a8 SHA512 f5bd33acd8fc48beefceb6cfce326ea3e0de879649463e5c4c703b3fc95fbb3cfd21ece887c93e3c76916a70eccf41003a01baa4526055ebd8b0f2441b8133bc
+EBUILD e2fsprogs-libs-1.46.4.ebuild 2162 BLAKE2B 4ae5b696a9caa3c02f61b32745b135760404d1df44f34c0b4e741336371966b8cfe633b7e4fc424a3c1c450e10b2a148837747640d404453c9499e0122fd340b SHA512 63132160168ff47adcf398675e270f6d668719828b96ab02fac67d657c13cb2d41f943b53f2b41026fa248e904d4f778cf750b347afffe8d2034e8239d2306e1
 MISC metadata.xml 463 BLAKE2B 076bfa2742b1e6abbd07bbf94f817aab64fcfa17e9c51314220e02bae2e9a209ebdafbd358e59655b471c25e47dfbe27745a50b0f929f2d640f06409f3e51804 SHA512 faab1a2ea1ddd7d9992fab3131b2a9b70a7f63b81f055856c8fbe9fe3c19a19044d1f2512252b29584914e06b0bc16d8d3ac02a59bc5706ea3509ebe1f65f5ed
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild
index cdcc3b615176..f81a4613672f 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6256476deac3..fbb078e9df2b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -25,20 +25,20 @@ DIST glibc-2.33-patches-4.tar.xz 60124 BLAKE2B a7a99f39c16df241745772c31b10946dc
 DIST glibc-2.33-patches-5.tar.xz 63032 BLAKE2B e7f5952b2d84dc264e960d8bd3d9af4ca43089ca269735168933e80a0a74d7be1cadc90935b429cfdf5f0052d3ce3482a8f073b15378e7f9c05034535d9eae4d SHA512 00c2f8f104e7899b76398a6a39f054cd109a71f5fcc4020304b7d7e15ae0c53df1c3acbafd56898427b3849452f9fb9e5064ff584d6c86c4d18c8a9201c89d29
 DIST glibc-2.33-patches-6.tar.xz 64632 BLAKE2B f04ca4320d65c8796c67471cb56d3bf002cc34fb6a81075b85948e41c94df46cb2a3a944cced42d6d2c17ffc11e32a9840810864e655cc0fe18e6e0fe9f3c985 SHA512 b95746cd3415ec9ca275e542a2b5fddd5ce5680aa3bda08e94e96cf431191f7488ef6b7999ff0dfaf7405a4212531a75283e9bd7f5ae65bf572912038877a6df
 DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
-DIST glibc-2.34-patches-2.tar.xz 13156 BLAKE2B 9f761868085cc752d396df097a256dfeb5824cf2fec4e5cd122d51b282367407e847e9e106a031fd44d3bc0a15a17014dd896949b147fea551b1b4be4c9aa8e7 SHA512 c5713c26209664d8e5ddccd8520db45368fb974a27293b720ded7bdbae6e6f63a75a3ce439961cc0e11a933d0c6510b90096781d9ea3181d513b0d142a881d1c
+DIST glibc-2.34-patches-3.tar.xz 32984 BLAKE2B 5632cbb94bb6134348eebf545d2e1e8895edb318d2bbd4b5ff6847ca498a00814b47d6201915b3774906a125a46bcbd704f0c4b94a97eeaca4f7b89d9e93f7e4 SHA512 2c0ce3bba19a0585a869e98e63d14943655eeb40a11f1c70109781580d0de37269f44b99f0e366cd5d6a974ace668e953b66db77561152d683a30e14d8a13677
 DIST glibc-2.34.tar.xz 17301232 BLAKE2B 874031192f2f5a3b35c3f5b044a467d4be4e67e8593e070e5b49b901ce8ea6bde2f8d2f6c92fa33b3f61eb723572a9e5f2b45e56064168df80a96d3fdb6fa30c SHA512 15252affd9ef4523a8001db16d497f4fdcb3ddf4cde7fe80e075df0bd3cc6524dc29fbe20229dbf5f97af580556e6b1fac0de321a5fe25322bc3e72f93beb624
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 EBUILD glibc-2.19-r2.ebuild 38454 BLAKE2B 6019c17c3cd333132abd3d88afd019367d451e6727a7528524ad8835a62d1a741068041dce840c0350a1acdfd8eddb840ac38a9cf6d25dcf46b07c98a31137b3 SHA512 e14489e34e3db70740b31e7b1250884a57a597021f913cd86cd4d946a4b8ceef2ed3fbc409b0c0b13526e128306276c96d48e5f437620835b5d1cf245d778262
-EBUILD glibc-2.30-r9.ebuild 43403 BLAKE2B 039f1e866d0ecbe7e6805265694800ed4873a5643b5ccbaedd18c24ab42bdb2797bd4a597d3cb5321a527eb4feda555b31a143ce80f984774f2ae5498b57c45f SHA512 b9843ca092e6814b23ac1b9741bec02bd9d54a6d48df3caf451e65eae8db2068137a425c9d03d86daccdf67c856f8bf1c8200b8c95461fcbc7aa790599fdccd6
+EBUILD glibc-2.30-r9.ebuild 43400 BLAKE2B 01cbb9398dbe5d93f110f7c7ffe24d40719d86a3c75cea84c9bdf935613cc6ca91739c296956bb7e79bdbf2c5777922781cffc6cfb49ab5b2c02bf37562da11f SHA512 52607c950351f65b55ba702e3509748807a9eb8ff0d1eefb58369fb24ce49e2e0f00a0a74418877190c68d85d514d479a6f91fb6b868fe949a8be77a9bbce1db
 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 45233 BLAKE2B 881f8eebb4c7e4e78760b92bd6cb64de2372abed3f15b916ab0d47f60d5cbceaaedf2624db92aec97a2742f205e7b243a02f7ddd3932a83ba8d0de3b40f72caf SHA512 54978040ee64ccc03bf8aea55af21775d8e360fcf5eeddad61b36c51dcc016849e9650270463e46edbd35e7eb6ffa1c72f1068031c80b6fca316980674c22dce
 EBUILD glibc-2.33-r6.ebuild 46610 BLAKE2B 94d2206661329a3ac7d57e41b6a868ede219b17611ba871a663fd26305eaf7b75e809649435ac2792076a8e40b7fc90b67150532a9b6ee2b7d97aa4af69f21d8 SHA512 b41acdca2bee62c009f4c4b4884f44819cce557ea6c6a6680b5391cc993625a47c04fb3f620a1084e71db36b5a2a252b2c683fbbd01e67fa3950b4ae30a67599
 EBUILD glibc-2.33-r7.ebuild 46610 BLAKE2B 4081d213d820c4d4e27e6d017b293712dd6054c93ad1cc4386c958ee971413836e387e0b292a68792e6526bd87d96baf3f7a3991edd5a44ba33dfae5186e3b85 SHA512 f5838889a23f9e58fb58fe8b274d85bef96dadffd790a467820391fdb68a1e8e5c054b63412db68113ef866974a33413c2bbe1342d1bf3e8b30f9d94c406737b
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-2.34.ebuild 47168 BLAKE2B 5f1d4950661951003170cfbdf1a9ee3dd239f8b75bae8916d0b2a98fb3307d9fae7de1820fb4c9c1fc7e02b4e37701d81c13f36d709d32f38ab7c7bd96c4e28b SHA512 ece3b79074d643cd916d45ebc2c1381e7803713c59f7062048d4fa73fef62c33fd0ff8bf5f24f8d0acc29f53ff124d78e729ea6ad9ece4596d4696b20de2d14b
+EBUILD glibc-2.34.ebuild 47168 BLAKE2B 66010e42941ce7cdef6e136bb047a03bc4060258218339c9cc7baf963ff6dc475946c93d06562415e071d46f34fdff842b578fffcb7d0807a24c8c60a277dde8 SHA512 769fffe7ce0b0ca580a7f828d1b21d66aaf33b0af5d79756caec8d1d8a3446ae97d6fff639e9a7bf435ec2bea764686717df1741c4a9f0bc4ea9d6f9d26c2482
 EBUILD glibc-9999.ebuild 47168 BLAKE2B 5f1d4950661951003170cfbdf1a9ee3dd239f8b75bae8916d0b2a98fb3307d9fae7de1820fb4c9c1fc7e02b4e37701d81c13f36d709d32f38ab7c7bd96c4e28b SHA512 ece3b79074d643cd916d45ebc2c1381e7803713c59f7062048d4fa73fef62c33fd0ff8bf5f24f8d0acc29f53ff124d78e729ea6ad9ece4596d4696b20de2d14b
 MISC metadata.xml 1556 BLAKE2B c8deb6ffdb2f6d045ea8c96dbefde33d108f8123d4c51351d77aa487db703b7312d26394e6c320b97e4955acbc0fc97c7ca918426f3bba3b1c2536c2461d334d SHA512 c47d15cf75001e40e6533bc157689d621e853966e70e504e540a16e1390dc0f122acaa705956d25b43683f9c633eb40bc2ffab64ce93f21a8a6346a9fc9dd51e
diff --git a/sys-libs/glibc/glibc-2.30-r9.ebuild b/sys-libs/glibc/glibc-2.30-r9.ebuild
index c914722d46b0..88282a7f5956 100644
--- a/sys-libs/glibc/glibc-2.30-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r9.ebuild
@@ -34,7 +34,7 @@ PATCH_DEV=dilfridge
 
 SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch"
 
 IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
 
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild
index 459c54eacc93..ec8811d086a2 100644
--- a/sys-libs/glibc/glibc-2.34.ebuild
+++ b/sys-libs/glibc/glibc-2.34.ebuild
@@ -20,7 +20,7 @@ SLOT="2.2"
 EMULTILIB_PKG="true"
 
 # Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=2
+PATCH_VER=3
 PATCH_DEV=dilfridge
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 060d6d90afba..c690b389736f 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,7 +6,9 @@ AUX libcap-2.57-parallel-make.patch 1103 BLAKE2B f5c1517577d7c34ed8a4b9fcc8527e9
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
 DIST libcap-2.57.tar.xz 167740 BLAKE2B e0c004f3d11caf824d907315e6102707bb34c0ef3e9d430f23c191d711f073267ef6dc44463e2ce8041b8d13658b0c20560f7f3c6387f770ff9e66b81ff9f5d3 SHA512 5c70b3c6a1248ca0de92538614f0d0d516d72f6f25b135c92738c377b67533662e6fd6b0b61cb051ec99f406387d3334fcc7ddb54789626e4c387bcf46ebffbf
 DIST libcap-2.58.tar.xz 168520 BLAKE2B 9f160c08e7e8bcb9eb49ab6a7a0805145461613a946ccfebeadc269b26331eadc9f467437b2f5b022e9a545b034ea4fd8fed4d5893e84d9a48dd85318810b974 SHA512 092e45f82113293e1c2db7e51dca7298496c2a3af08eb41107e8c2b4798c25d3c9059e152181dc048b232fe0e59c4c3beaa158da2e5798cd6e1013d85226a9cf
+DIST libcap-2.59.tar.xz 168404 BLAKE2B 5db562b389f2c4034b5fa840a14f7fd7ada49470fea8d13828b2c302a7d768831a6215593d21938b8e1d5bd65fa0581628809526fa5f6091ca4eac5e884cd38c SHA512 296c11259e1b4d577b3527ab5e2160be3f94a2bee7d63d1b7feadc603f7e160b72f8c8ede34dec269f5eb7595304ff290693803be778bdbbe088de0e99a33812
 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b
 EBUILD libcap-2.57.ebuild 2218 BLAKE2B 31b59f3288097cbad2db73d8a08f6c92dd20e8f3db24ca3a70e38d6d8d07294833eb6773db1822b508c11fc7af47f30b422f0c578dd7f4d029e5af278e77cfd9 SHA512 ebf697457e90c80c89f67b0d1087856edb50a5ec7dc2cc45d13ad3e83c060bd71b519f88c02e70d2207d24e85941942663f370fe5ce488364cffa1c7e8b5f7b3
 EBUILD libcap-2.58.ebuild 2136 BLAKE2B 01dfe09c3089be3dc63da9d5c2ab8a1804979bb2a901d229cdd1f4722050307dc020f6745609bebc2e3d331065fa0ab06bcff2ce0b53588276eb3087f8afacb2 SHA512 75de17b063652f6c0788c26d19589c1790d5e713c47558f1e6ff28e4e7adfc6a66683be2fbc8cf6250ebc3e8670e4bcbee8f8f1d692846550b3aeb35334dbac9
+EBUILD libcap-2.59.ebuild 2136 BLAKE2B 01dfe09c3089be3dc63da9d5c2ab8a1804979bb2a901d229cdd1f4722050307dc020f6745609bebc2e3d331065fa0ab06bcff2ce0b53588276eb3087f8afacb2 SHA512 75de17b063652f6c0788c26d19589c1790d5e713c47558f1e6ff28e4e7adfc6a66683be2fbc8cf6250ebc3e8670e4bcbee8f8f1d692846550b3aeb35334dbac9
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.59.ebuild b/sys-libs/libcap/libcap-2.59.ebuild
new file mode 100644
index 000000000000..ea1e6af49768
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.59.ebuild
@@ -0,0 +1,88 @@
+# 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 tools"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${PDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="tools? ( dev-lang/go )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.38-no_perl.patch
+	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
+)
+
+QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		RANLIB="$(tc-getRANLIB)"
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG="$(multilib_native_usex tools yes no)"
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_test() {
+	run_emake test
+}
+
+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
+
+	# install pam plugins ourselves
+	rm -rf "${ED}"/usr/$(get_libdir)/security || die
+
+	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 3cf11995f45d..43ffebdb8555 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,22 +1,16 @@
 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 6700 BLAKE2B 95f0550dda3dc1b71a25dd2b3bf433f8fa92a12465a19558123dcf4704713af9c394544503eb1eed12251a392bf9ff91e69b994355a7f0fad5c00b5fa6457c26 SHA512 14c72df06a748c4788ad9e2f0e9de703e6ef3b9498f0ed8797ae2c31890754396cb2cdcb13b082b8f9a726929811cd421558a7867c9b1f5658827875fd2cf651
 EBUILD libcxx-13.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba
-EBUILD libcxx-13.0.0_rc2.ebuild 6707 BLAKE2B eb89434560fbef10b03b3c88022c3237d2934103bc16f5fa431ef8f5ddb216f92fab1f9281b6a86854607875364b8c9f3638a1d7747e8f0395c44c7bdecbc35a SHA512 acc4019dc57bec18e888991c43e43409ed58bea85c6cc3c088db7c587fdd5f1b39c581b6bfbff08117ec7f9e176cd657479f3f0daf247baa55719ab3bb094f60
-EBUILD libcxx-13.0.0_rc3.ebuild 6707 BLAKE2B 08b39196e414b9e0921006f489cb929d33d31bdda26d42f6f313278166483807b0b78b8cd5575cb379bf62b0eeeaa1bd98f7ad2102628ad4b7838be4647cd2d9 SHA512 b082539fe5bf331d518379495aa78aa4bf824a95fe4b7b96746042130810f49fdf73346411a17ea297492634d00c39d9c527e1ff4586fe9e500c9221c3f971eb
-EBUILD libcxx-13.0.0_rc4.ebuild 6706 BLAKE2B fa9cc41a00e9177801b0e26532c097a48c86ef66a46f6f3e89d298392a90ab6ab835606374b7707c6df96a88e8ceccc1de20e58f497f03ac7a34856eb108c6ae SHA512 0d246f0c5ee9b030bfef3c443a60be2e6373731391fb40575b4dc504ef5227e9c30343162505973f5ed96e4972e2bfdd68614dfe86f9091092cf2552c50c6e00
+EBUILD libcxx-13.0.0.ebuild 6747 BLAKE2B 7cc87bc74fe8839ad5e38c23c086b1a97dafbdde77ad28367c7da86c7c0fe1fd6d667f9cb8fd05490fd53ed13167e78e400e1ffff21bcbb53f498374e6d839b1 SHA512 b5015a446398c40ffada68cd4464d4ef2ec945379bf9c7b3603069a95e907ec0a0bc8d66f8c5f25b440036ad1d6dfaae5f09363ad2fc474f145d0308510ce487
 EBUILD libcxx-14.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba
 MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2
diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild b/sys-libs/libcxx/libcxx-13.0.0.ebuild
new file mode 100644
index 000000000000..62760143aefd
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-13.0.0.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="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+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=${PV/_/-}
+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-13.0.0_rc2.ebuild b/sys-libs/libcxx/libcxx-13.0.0_rc2.ebuild
deleted file mode 100644
index bd52b5544034..000000000000
--- a/sys-libs/libcxx/libcxx-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=13.0.0-rc2
-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-13.0.0_rc3.ebuild b/sys-libs/libcxx/libcxx-13.0.0_rc3.ebuild
deleted file mode 100644
index 5f8acf054c67..000000000000
--- a/sys-libs/libcxx/libcxx-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=13.0.0-rc3
-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-13.0.0_rc4.ebuild b/sys-libs/libcxx/libcxx-13.0.0_rc4.ebuild
deleted file mode 100644
index f342357254b2..000000000000
--- a/sys-libs/libcxx/libcxx-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=${PV/_/-}
-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/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 240f14047349..376365de357b 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 3543 BLAKE2B 23ac0eb64a29631b4bc4e18f3ae3cd03d8491b7a14cd88a35513da666c400e05ef2624c7eb214e0e4a6b297a993ca93ceedc0900bc3cdf850ff71157caa36f34 SHA512 0c7b72e68db1056f927283a361aa6771d77d5e5d8ecfb5f11a5204d82abd2843a9c6beccd7e2f2cbd95d23c4f4a863fb1cca7dd4f18ea66eb2f936af6ff5cb63
 EBUILD libcxxabi-13.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
-EBUILD libcxxabi-13.0.0_rc2.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
-EBUILD libcxxabi-13.0.0_rc3.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
-EBUILD libcxxabi-13.0.0_rc4.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
+EBUILD libcxxabi-13.0.0.ebuild 3545 BLAKE2B f439e2a65eff6c2146c8f486a733f16a70a81213f8c456cd589c2c42df505405f0eb0834b970bfe4e81ba4f2f3c110400f763773d7f5a2c7706f38cc815d5971 SHA512 8857a124fff07e2d392f1424b25840523048473ab322e71d2304c41fca4e6882985d3ae20ce8b5349a13252315eaa17f3ba1d9e493b1a0fd531929c001c50edc
 EBUILD libcxxabi-14.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
 MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild
new file mode 100644
index 000000000000..4c3c7882da70
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.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="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+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-13.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild
deleted file mode 100644
index d11be625eea5..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-13.0.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild
deleted file mode 100644
index d11be625eea5..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-13.0.0_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc4.ebuild
deleted file mode 100644
index d11be625eea5..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/libomp/Manifest b/sys-libs/libomp/Manifest
index cd64a1ecaefe..303c85b399e6 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,19 +1,13 @@
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
-DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
-DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
+DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 2968 BLAKE2B 4e5511872021796bc51f8544a9f6ca5372650297c3c805a1bb16696def4901b34ad6ecbb7fcd4ce87a192e04aacda3d121b8dd62175e3ab3fab7d2a28095fe09 SHA512 d1f169993b83021c8c31b1911d827b62be19b916f2c53b7ef7b59d82b88c241d36eb054947d56bea13cf064f8737050d988ab6379be8a09e81bb04d7e333e3ff
 EBUILD libomp-13.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
-EBUILD libomp-13.0.0_rc2.ebuild 2911 BLAKE2B 712b391fe08a877bc01a2b2a3e6606464a836e68aaf4854c1e96e08b284a3133c821c2792c8371fbdf50d318a0ccf64aec288540c0c8c80626c742c3a4f9a3cf SHA512 e75efe9194a78a7789370fa2654aca1e87b38f771f3bdefdbdc6d4e4ba915e65cd4d5661e93c7b1877f4a5f605a4e2a2999b19f163849b394831e615ff66fd78
-EBUILD libomp-13.0.0_rc3.ebuild 2911 BLAKE2B f1fb49799dffd125c59eacb47bc0d85f6d11a3151c542c62626cd2684ef0d35f6545103e6106050735f7715251bd5707832837066376536b75ae4e823f2beb1f SHA512 ab5d48727a85a556a2f654a2412f06d39ba6c9562b59274ad166ad1e9f946025191894ad741de7c697402818ef140b9b51c7f541f3e4ef828f4bdd1fc8c93676
-EBUILD libomp-13.0.0_rc4.ebuild 2910 BLAKE2B e3dcf3288bc384dbe8fc2b3c74721dce3b2c0c48188b1dfb20cd280d87466eec09125a96aa4312aa7c840752bf188a54f019f6b8e5c04f251a24deb7d4970ef9 SHA512 5a9556201ef4212f6b3dc552798e3ed01fae7943dcf58423e1105b2ae6fb8ea0242a46219628d9e7566f405e18308792a7a38ee5bb11c54906e7757061027f57
+EBUILD libomp-13.0.0.ebuild 2976 BLAKE2B e96682dd095291c0e85c2a08371ae03fb5b3f38beb4a65a47d6afa5ba6c5d1e0d2954002f2938c975092e046e8bfe6f373d1398687f3f66d03742c20196d1909 SHA512 aa5d5fff73b728fdb85e07cf3226467146e136943424dae5dd928dad0788946d84debb12c2ebb86d22c5e175b0a25efef5b81a21f34b1d659565730365093bb0
 EBUILD libomp-14.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
 MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f
diff --git a/sys-libs/libomp/libomp-13.0.0.ebuild b/sys-libs/libomp/libomp-13.0.0.ebuild
new file mode 100644
index 000000000000..136466d1b9a9
--- /dev/null
+++ b/sys-libs/libomp/libomp-13.0.0.ebuild
@@ -0,0 +1,107 @@
+# 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="~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 ) )"
+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_PATCHSET=${PV/_/-}
+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/libomp/libomp-13.0.0_rc2.ebuild b/sys-libs/libomp/libomp-13.0.0_rc2.ebuild
deleted file mode 100644
index 1ef78ad4ddcc..000000000000
--- a/sys-libs/libomp/libomp-13.0.0_rc2.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
-
-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_PATCHSET=13.0.0-rc2
-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/libomp/libomp-13.0.0_rc3.ebuild b/sys-libs/libomp/libomp-13.0.0_rc3.ebuild
deleted file mode 100644
index f7e3b8e6a103..000000000000
--- a/sys-libs/libomp/libomp-13.0.0_rc3.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
-
-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_PATCHSET=13.0.0-rc3
-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/libomp/libomp-13.0.0_rc4.ebuild b/sys-libs/libomp/libomp-13.0.0_rc4.ebuild
deleted file mode 100644
index 6ced29613f8f..000000000000
--- a/sys-libs/libomp/libomp-13.0.0_rc4.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
-
-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_PATCHSET=${PV/_/-}
-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/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 3302e79c0c61..eb5e7631add0 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -2,5 +2,5 @@ DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df35092
 DIST gcc-3.3.6-patches-4.tar.bz2 53437 BLAKE2B 372ff1fcfcfacca43b420d2cda7fccb2ede4917408e1fcceb6c094694de8ae21148fa9c5ab8663cf6fb9ad858e3d0cbb3f20c91020db7b627828403444c2fd66 SHA512 1ff4563956d2f3af1240a14cd1ec126ff75dcf24e1cec39d32a17d6be92b94aeb081605ceb04b138ba905cea8ccbe204dce4b42a02ef55383fcfa91643f73faf
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
 EBUILD libstdc++-v3-3.3.6-r3.ebuild 5062 BLAKE2B 149fc4eb76a0e3e3c163e21fd09bd375cc53232f05f039e4dd005d833f2f7b47b03652dea58574cf77db38d7013aa329858d0ef694362ffa891fe71095527714 SHA512 4dbf4e4ffda9ee85ec09ccce5888600aa6c07f78b189c55d97b5f1f2b8d2032a69a2b315bb242d4bfeb32895111e7fc9d74337a706726a1a57016ca16b95c4d5
-EBUILD libstdc++-v3-3.3.6-r4.ebuild 5077 BLAKE2B 7011a02f2fbf8f8a438f80872521cea705b842f8ad9c827b267b579c6e7e23989a7ddb5b9f3329461306847af7e92b2c14608d10c72f503d56a7dab214737bf4 SHA512 24966898f97442d115c282680f20a496b4fbb03e9350bc1f6d22290b8ea91d28e12ac0f20fa5e547678e92e3fd555eebcf2767d3fd8065a3ec2c0bcca5bfbe22
+EBUILD libstdc++-v3-3.3.6-r4.ebuild 5074 BLAKE2B dba892d8d6b5b417fbee033157f33f491c4843685b3a97d815858aa45770cad2eb9348b2c9c5a347cb055a6bc8ef3034a38f9d49706d162a93ca07fa2d8b683c SHA512 0ebb18227f908002f4baf9e8bceab5a3bb4812839b0186b0d5f0b7acf9cfe3d5dfd087fac124698cbada78fc32931720ad2e5ffb693e1c39a8b965000e3dbb07
 MISC metadata.xml 258 BLAKE2B f45bf60ab247635720461e6f8028b41d748c2c0fecea4d5b6eb29a9f532de573e8054773a084b99b2a6a040e980cfc41c8839b13bdeb8ebe6e1de12a1492873b SHA512 2cd16eedd80ae476d1611112f620d3d5eee88fd181fe635d9f9235ac312e24bf8eac5b44f54ff55806ee7a03aaf1d1382a734f7b3496814853d238b9a7b6ee1e
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r4.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r4.ebuild
index f120d1011724..9650ef069fa5 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r4.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r4.ebuild
@@ -10,7 +10,7 @@ PATCH_VER="4"
 DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++"
 HOMEPAGE="https://gcc.gnu.org/libstdc++/"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2
-	https://dev.gentoo.org/~slyfox/distfiles/gcc-${PV}-patches-${PATCH_VER}.tar.bz2"
+	https://dev.gentoo.org/~sam/distfiles/gcc-${PV}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index baedc50be895..76eef4da5305 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 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.1.ebuild 3657 BLAKE2B f2426a0aa744c81452ecd8d37bdffc8f294a559753ea57ef11c2fb8646e6eedd93c70afb3fd354c97f5b70f9fc7d4f13b2e180f49c7d06cf21e1e9586f05ef50 SHA512 cecba115918eae18534b8ffdfbaede6b77851e67eaadd17466133a0976765526f11554fbf849e894b7136abc844c8822c633e95609c1019f2d89fa83d9c8a1e5
 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
-EBUILD llvm-libunwind-13.0.0_rc2.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
-EBUILD llvm-libunwind-13.0.0_rc3.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
-EBUILD llvm-libunwind-13.0.0_rc4.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
+EBUILD llvm-libunwind-13.0.0.ebuild 3748 BLAKE2B c3f4f515f8baac5530078810ffc4ad1ffeb6880ee385f863036ba14e5821a8d9a467694ed06725a9e5608015284a31f8b2ba0c884fd831f60376d8dbaff5c4a5 SHA512 01d1a4f739b9975c661e5fed9807280aee1306e79fc1671dfa9fa237382e32e270eac2e2a9620566851685f7ba6a9982038185262436941e47a2ae40574924ec
 EBUILD llvm-libunwind-14.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
 MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
new file mode 100644
index 000000000000..ad3bb8063d65
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.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="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+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-13.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc2.ebuild
deleted file mode 100644
index a4b1aceef510..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-13.0.0_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc3.ebuild
deleted file mode 100644
index a4b1aceef510..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-13.0.0_rc4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc4.ebuild
deleted file mode 100644
index a4b1aceef510..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/newlib/Manifest b/sys-libs/newlib/Manifest
index 504b70c3416e..dc46e6faef86 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,5 +1,5 @@
 AUX newlib-3.3.0-no-nano-cxx.patch 1338 BLAKE2B ff16751b01784a38dc07aa79120c38f0274bb14caeeb653cecca4b3ca69c60a72e0e1918fea8f2c0f4734293817539122fa41b349f61ceabb3cb9ae878a11d13 SHA512 08dfc7d854dc75c8b875fa7c1829078c8df8988b4ba2b20739d387c656ca63b8b344487861d23658e31b72f911d05c2f57abe51bdf3b2dedcc88ce072c6595c8
 DIST newlib-4.1.0.tar.gz 18648429 BLAKE2B c4d4d734bceeacf05b75d450d4316392d0000266812f98f99cd3f9f0926ac9848e1dc145361827d1d6951edfe5f109923c982d9f284f927ffc5fd5e5edaf8be6 SHA512 6a24b64bb8136e4cd9d21b8720a36f87a34397fd952520af66903e183455c5cf19bb0ee4607c12a05d139c6c59382263383cb62c461a839f969d23d3bc4b1d34
-EBUILD newlib-4.1.0.ebuild 4458 BLAKE2B 1dd071212b733aec7c9b274c966439517eefec491cc99e2e2b2068b08dfca5b80de3de4482a67e5c1a6c51a4f53154b545115d883b98cf1e6d9c17636f02920f SHA512 7934761958f4171a30c109d46b5fe4f353f1a8f812a69663e4315a472cceb378102d862d335b0c991e3a479c2557daa960a8502aa1686b49456ee0629c2e133b
-EBUILD newlib-9999.ebuild 4458 BLAKE2B 1dd071212b733aec7c9b274c966439517eefec491cc99e2e2b2068b08dfca5b80de3de4482a67e5c1a6c51a4f53154b545115d883b98cf1e6d9c17636f02920f SHA512 7934761958f4171a30c109d46b5fe4f353f1a8f812a69663e4315a472cceb378102d862d335b0c991e3a479c2557daa960a8502aa1686b49456ee0629c2e133b
+EBUILD newlib-4.1.0-r1.ebuild 4461 BLAKE2B 773ba5ca88402bde9d676c7e989151ec62b860b29d0d37922b81df9fe1ae8a7cabb7ecdc200cdada5aaab543cac51344b74ce2015152a8214bb943d171b3ae9d SHA512 323a94f3ca36f9b23749a1373aa52cc4cb5d496fc21d34d58544026881a8cf0c136a15c63e0ddd596ff73593bf4fe057b9b3bb862118acc3a50c82ee4d2a62a8
+EBUILD newlib-9999.ebuild 4461 BLAKE2B 773ba5ca88402bde9d676c7e989151ec62b860b29d0d37922b81df9fe1ae8a7cabb7ecdc200cdada5aaab543cac51344b74ce2015152a8214bb943d171b3ae9d SHA512 323a94f3ca36f9b23749a1373aa52cc4cb5d496fc21d34d58544026881a8cf0c136a15c63e0ddd596ff73593bf4fe057b9b3bb862118acc3a50c82ee4d2a62a8
 MISC metadata.xml 414 BLAKE2B 0e367a5f7b225bd2d381433ff239e076c3de8feb795ddb586d867bbc9a1b990379a3f27a39ede9549c7e328262004101e4392560717f596c941e9a152848eacb SHA512 44000ecc340eb2da9391ac9b226486e0f95aeb8de5bc7633882fef97943e0348bbb04ada64a15c82d2995d8aaedac5da1fa8c9d453c4ab3d2efc51ce06ab6477
diff --git a/sys-libs/newlib/newlib-4.1.0-r1.ebuild b/sys-libs/newlib/newlib-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..a5ec41db3c45
--- /dev/null
+++ b/sys-libs/newlib/newlib-4.1.0-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
+	KEYWORDS="~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="https://sourceware.org/newlib/"
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode headers-only nano"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch
+)
+
+NEWLIBBUILD="${WORKDIR}/build"
+NEWLIBNANOBUILD="${WORKDIR}/build.nano"
+NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
+
+# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
+# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
+# Currently newlib can't be built itself when _FORTIFY_SOURCE
+# is set.
+CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+
+pkg_setup() {
+	# Reject newlib-on-glibc type installs
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+			*-newlib|*-elf) ;;
+			*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
+		esac
+	fi
+
+	case ${CTARGET} in
+		msp430*)
+			if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then
+				# bug #717610
+				die "gcc for ${CTARGET} has to be 10.1 or above"
+			fi
+			;;
+	esac
+}
+
+src_configure() {
+	# TODO: we should fix this
+	unset LDFLAGS
+	CHOST=${CTARGET} strip-unsupported-flags
+	CCASFLAGS_ORIG="${CCASFLAGS}"
+	CFLAGS_ORIG="${CFLAGS}"
+
+	local myconf=(
+		# Disable legacy syscall stub code in newlib.  These have been
+		# moved to libgloss for a long time now, so the code in newlib
+		# itself just gets in the way.
+		--disable-newlib-supplied-syscalls
+	)
+	[[ ${CTARGET} == "spu" ]] \
+		&& myconf+=( --disable-newlib-multithread ) \
+		|| myconf+=( $(use_enable threads newlib-multithread) )
+
+	mkdir -p "${NEWLIBBUILD}"
+	cd "${NEWLIBBUILD}"
+
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable unicode newlib-mb) \
+		$(use_enable nls) \
+		"${myconf[@]}"
+
+	# Build newlib-nano beside newlib (original)
+	# Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2
+	if use nano ; then
+		mkdir -p "${NEWLIBNANOBUILD}" || die
+		cd "${NEWLIBNANOBUILD}" || die
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		ECONF_SOURCE=${S} \
+		econf \
+			$(use_enable unicode newlib-mb) \
+			$(use_enable nls) \
+			--enable-newlib-reent-small \
+			--disable-newlib-fvwrite-in-streamio \
+			--disable-newlib-fseek-optimization \
+			--disable-newlib-wide-orient \
+			--enable-newlib-nano-malloc \
+			--disable-newlib-unbuf-stream-opt \
+			--enable-lite-exit \
+			--enable-newlib-global-atexit \
+			--enable-newlib-nano-formatted-io \
+			${myconf}
+	fi
+}
+
+src_compile() {
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	emake -C "${NEWLIBBUILD}"
+
+	if use nano ; then
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		emake -C "${NEWLIBNANOBUILD}"
+	fi
+}
+
+src_install() {
+	cd "${NEWLIBBUILD}" || die
+	emake -j1 DESTDIR="${D}" install
+
+	if use nano ; then
+		cd "${NEWLIBNANOBUILD}" || die
+		emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+		# Rename nano lib* files to lib*_nano and move to the real ${D}
+		local nanolibfiles=""
+		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print)
+		for f in ${nanolibfiles}; do
+			local l="${f##${NEWLIBNANOTMPINSTALL}}"
+			mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
+		done
+
+		# Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
+		mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
+		mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
+			"${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
+	fi
+
+	# minor hack to keep things clean
+	rm -rf "${D}"/usr/share/info || die
+	rm -rf "${D}"/usr/info || die
+}
diff --git a/sys-libs/newlib/newlib-4.1.0.ebuild b/sys-libs/newlib/newlib-4.1.0.ebuild
deleted file mode 100644
index e16fd4c10b75..000000000000
--- a/sys-libs/newlib/newlib-4.1.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
-	KEYWORDS="~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Newlib is a C library intended for use on embedded systems"
-HOMEPAGE="https://sourceware.org/newlib/"
-
-LICENSE="NEWLIB LIBGLOSS GPL-2"
-SLOT="0"
-IUSE="nls threads unicode headers-only nano"
-RESTRICT="strip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch
-)
-
-NEWLIBBUILD="${WORKDIR}/build"
-NEWLIBNANOBUILD="${WORKDIR}/build.nano"
-NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
-
-# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
-# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
-# Currently newlib can't be built itself when _FORTIFY_SOURCE
-# is set.
-CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
-CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
-
-pkg_setup() {
-	# Reject newlib-on-glibc type installs
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		case ${CHOST} in
-			*-newlib|*-elf) ;;
-			*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
-		esac
-	fi
-
-	case ${CTARGET} in
-		msp430*)
-			if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then
-				# bug #717610
-				die "gcc for ${CTARGET} has to be 10.1 or above"
-			fi
-			;;
-	esac
-}
-
-src_configure() {
-	# TODO: we should fix this
-	unset LDFLAGS
-	CHOST=${CTARGET} strip-unsupported-flags
-	CCASFLAGS_ORIG="${CCASFLAGS}"
-	CFLAGS_ORIG="${CFLAGS}"
-
-	local myconf=(
-		# Disable legacy syscall stub code in newlib.  These have been
-		# moved to libgloss for a long time now, so the code in newlib
-		# itself just gets in the way.
-		--disable-newlib-supplied-syscalls
-	)
-	[[ ${CTARGET} == "spu" ]] \
-		&& myconf+=( --disable-newlib-multithread ) \
-		|| myconf+=( $(use_enable threads newlib-multithread) )
-
-	mkdir -p "${NEWLIBBUILD}"
-	cd "${NEWLIBBUILD}"
-
-	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
-	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable unicode newlib-mb) \
-		$(use_enable nls) \
-		"${myconf[@]}"
-
-	# Build newlib-nano beside newlib (original)
-	# Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2
-	if use nano ; then
-		mkdir -p "${NEWLIBNANOBUILD}" || die
-		cd "${NEWLIBNANOBUILD}" || die
-		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
-		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
-		ECONF_SOURCE=${S} \
-		econf \
-			$(use_enable unicode newlib-mb) \
-			$(use_enable nls) \
-			--enable-newlib-reent-small \
-			--disable-newlib-fvwrite-in-streamio \
-			--disable-newlib-fseek-optimization \
-			--disable-newlib-wide-orient \
-			--enable-newlib-nano-malloc \
-			--disable-newlib-unbuf-stream-opt \
-			--enable-lite-exit \
-			--enable-newlib-global-atexit \
-			--enable-newlib-nano-formatted-io \
-			${myconf}
-	fi
-}
-
-src_compile() {
-	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
-	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
-	emake -C "${NEWLIBBUILD}"
-
-	if use nano ; then
-		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
-		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
-		emake -C "${NEWLIBNANOBUILD}"
-	fi
-}
-
-src_install() {
-	cd "${NEWLIBBUILD}" || die
-	emake -j1 DESTDIR="${D}" install
-
-	if use nano ; then
-		cd "${NEWLIBNANOBUILD}" || die
-		emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
-		# Rename nano lib* files to lib*_nano and move to the real ${D}
-		local nanolibfiles=""
-		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print)
-		for f in ${nanolibfiles}; do
-			local l="${f##${NEWLIBNANOTMPINSTALL}}"
-			mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
-		done
-
-		# Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
-		mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
-		mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
-			"${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
-	fi
-
-	# minor hack to keep things clean
-	rm -rf "${D}"/usr/share/info || die
-	rm -rf "${D}"/usr/info || die
-}
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
index e16fd4c10b75..a5ec41db3c45 100644
--- a/sys-libs/newlib/newlib-9999.ebuild
+++ b/sys-libs/newlib/newlib-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"
@@ -136,7 +136,7 @@ src_install() {
 		emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
 		# Rename nano lib* files to lib*_nano and move to the real ${D}
 		local nanolibfiles=""
-		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print)
+		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print)
 		for f in ${nanolibfiles}; do
 			local l="${f##${NEWLIBNANOTMPINSTALL}}"
 			mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 7725d1855c92..afd673d3c1fd 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 2de86fb0e092..251bf618776b 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,5 +1,7 @@
 AUX acpi_call-1.2.1-kernel-5.13.patch 977 BLAKE2B 424730bdb4dfac67f1a8f882539685367813b781d4e5fb75c8b36eab9a558553213b5a457a82e55be2ab4e08596601f43de1845050ac60371511d2504b2f6ace SHA512 587ba8155311bacbf8a150c36857858b6399feac87aeee5f5f5075c4954b730d909fc7c8d8c2c094cc801bff669ccac9d24f362eeb103d96c53deba543e5e388
 DIST acpi_call-1.2.1.tar.gz 12340 BLAKE2B e113f8c150c8e2f4f75ca1dd81cc4399f24bedcd716c9158561e8cb9f5e63e77cade18e6543ade4ec383690bf7041a583e297948789773db8ad9b63a957e61e8 SHA512 91553cf70a6b0173a6bfec38fcfb62ecd17614c91a888933704bb57d788592ce6981b01fb7c5e4bb8efdbe7fe229860c9f2be4b549dd71b232704c8bf0b3cfee
+DIST acpi_call-1.2.2.tar.gz 12403 BLAKE2B 3195ec7e4d6189abdbb1409914d97d481f63ec79ec89a2ab630120ea99aabf8ca5890c500149a386a4a661d17e58387a6b252b625b6abadef1d977691156745e SHA512 3916a211bcc4a2435c6ba9664b1c86d8ab587c052a03e6edccd00fd7d01c6a756003dcc146e22e2cf688795600589c8cac1d83774c989794dcadc91f5caa2b5e
 EBUILD acpi_call-1.2.1.ebuild 745 BLAKE2B b6bec39ac75d74897a80bc957c557846b872b580e0885340ce602cdc9469aaaf5c666076ae71686b6cb16e6080dd768527c126000400b12e0c8f30382df28ef7 SHA512 d1be7f89409827ee157907b68f419287cafa707442373bb90f1686699dd39d2a52ef673abfd59028d5f03c90a4e210266039c9ca8f8b380d75f9e6eaaac55bd9
+EBUILD acpi_call-1.2.2.ebuild 696 BLAKE2B 1be076aa6f346966a56ed82e46029949510b3359e9cea3d23cd7ab4badc088f2ab7e7531702d27cb644e06dbe1556dd09f876fca28f2ab538cb7623ba22f5e88 SHA512 93b59851ff940a0f3231590b5afc608acc2f8f91cea627963ef551fbc82f5e554f4bdc46257fcb51b41a1eb005c28cc89e060fcc70373dd7985720e11cf8a81a
 EBUILD acpi_call-9999.ebuild 670 BLAKE2B 02dd23b77eb28cf9425e3039c61f594a044c0dd7bd4ded1c91d70bb2a970e0b7b5adebe4c6ead52ec3fdabeae1ff5bb69c5cb980d452804e1966ed6c2d510a63 SHA512 7ee0c7e030b5494c94b4e74c85c29bb31a579db2f9a3bb67e0c5ca4edd3da5511a6aba1a8ee78ab430440a58a23ea1e3afc8e8b0f5bdaae1738c77c29aaf626f
 MISC metadata.xml 410 BLAKE2B 5ebcbe3474317a93bdc9b8bd8c033300de713d3906638585d8296262c084f7101ca189edd5cc8bcfeaeba6dea68ca75f7349a5e189f94da4dfa85145c939767b SHA512 fbd1f13cfdfa756b2feb04e8b426e8e26eb835d037833aa0dac48aa1ed1f88f0ce985ff3812282298c9fb533279dfaab8bf8cd79852dbb0b1953d7d0209f7985
diff --git a/sys-power/acpi_call/acpi_call-1.2.2.ebuild b/sys-power/acpi_call/acpi_call-1.2.2.ebuild
new file mode 100644
index 000000000000..781cbf2fc3af
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-1.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="A linux kernel module that enables calls to ACPI"
+HOMEPAGE="https://github.com/nix-community/acpi_call"
+SRC_URI="https://github.com/nix-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+BUILD_TARGETS="default"
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+
+src_compile() {
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	if use examples; then
+		insinto /usr/share/acpi_call
+		doins examples/*.sh
+	fi
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index fb5e1f9e9dbf..04d3cdbda2f7 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/incron/Manifest b/sys-process/incron/Manifest
index 1ff42f2428f7..56ff6fe45f7f 100644
--- a/sys-process/incron/Manifest
+++ b/sys-process/incron/Manifest
@@ -5,5 +5,5 @@ AUX incrond-r1.init 853 BLAKE2B dd7ae75e522535f27b9f342c429dd7d6590ac06767848286
 AUX incrond.conf 960 BLAKE2B b92d9f3523a8aaf38f0dfdfeda3a32b2ad6b588f007fc15e99d491a783a54f7581be677d810f00c10c3600335a89ded83664acdc0042710cf7784e9dfffba5b2 SHA512 e5d9d05c1b0f2393dea64ef27d01293f84302c79d6aec44ee11bc0f5b493e4392ee51cbf7e9a57a0771ee3e4625e6033f2e7ca3403a08df5aa1f3bad1d556545
 AUX incrond.service 155 BLAKE2B d0e1c9af86d7a548890b9c43799d5e13e17567659d25da44afbadae72e8401b6cf95e50b6471b86737dd00785c78d9f448bcab5cf0feea5c9a168aa6b3d6e26b SHA512 059043d3607aafb1d469977574eb96478845d17d88f7f61ba23269341c407e443bca36411eedf0753edf0216bd04800128c9557dc8827ffb980d5512f257bb80
 DIST incron-0.5.12_p20191114.tar.gz 339568 BLAKE2B ca6ccd4f2b4f24b48ee3bdf0a18713f6f70469cbc11f09fd215001e8512bd04dcbdc9cd5e7cc784907cd0d009a4572354f578cad78bc263070146b0ff2379029 SHA512 19cf386163de3f4cafcf36872659dd8f819129056ed2508403a8692130db04cbe5eb917370aa609d25a6b75c24a7a1b87e7bd2e957a5d66610f541fe83aec39e
-EBUILD incron-0.5.12_p20191114-r1.ebuild 1375 BLAKE2B d1da91495d3a38010da40b19ac49d1d69670844fc19a11bea0c3cb84f0ee3d4ab36caccbf34f740f8017c4d9f0389e315bba9182d740f1937cd5e305ada47abd SHA512 6866da89fa4f26eea60330cc7a39705a19833454ef4752d455e0376f30aa724bb6dbf5fe8e813ea6fa01ea7cfe362eeb9d708c293c567a3f2a13af4c9b81df89
+EBUILD incron-0.5.12_p20191114-r1.ebuild 1382 BLAKE2B 9b02200f82f821d109b8514b1860a57670eb130f4ac22931def0e02c445e6cded594f93bb3b8c6327ed1afcf075ac3f06cfe789bd4d091c7ea389a3ec132deb3 SHA512 f41da683af2c42bc337302778a09eb06125b773a89cfedfb636b02ba30d389c156f6a156af21ff3198c48433419cc798a546c8c0d7b078486f4a0934998e1143
 MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
diff --git a/sys-process/incron/incron-0.5.12_p20191114-r1.ebuild b/sys-process/incron/incron-0.5.12_p20191114-r1.ebuild
index e79ad35d10da..6e12c5bd103c 100644
--- a/sys-process/incron/incron-0.5.12_p20191114-r1.ebuild
+++ b/sys-process/incron/incron-0.5.12_p20191114-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ar-/incron/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc ~riscv x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index a6cef7b8115c..4e061718d842 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -8,6 +8,6 @@ DIST parallel-20210922.tar.bz2 2268320 BLAKE2B 1c90a1955908cf77f7f3eeda053aa2c59
 DIST parallel-20210922.tar.bz2.sig 2080 BLAKE2B 1d03a6dbe399bbf8b306602aa52815298c6c8f70d6f6111ba5a99df087f4dd96697a11c9112ec3ebcfced21c623122e08ebdff3cdf68a82adfa77bb2e2cd0bcb SHA512 02db93688d0b8941c3c37d7e99cefbf8325cf95ee4d34e8bf1a1d21a6b2e62d3e3f221a6e79ef141eef81dc452ccab5924ee41732b43dffcdb6b93863573e55e
 EBUILD parallel-20210622.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
 EBUILD parallel-20210722.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210822.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
+EBUILD parallel-20210822.ebuild 898 BLAKE2B 510cb6c7c7181de4991347639d4236630ab99e4315f35923d223f0eb51e837c370a9dbb83568bcfd312dc3660eaf64d4e449f26f371a5f7c8026199644a75d50 SHA512 f946e3d28a256ccf9901c0c18055d4010629d4573ed977d544b6b2f7bebf4a74b9a00a24cf00272eff01052aa58261708d9674ae3a91807a83796119160c1cec
 EBUILD parallel-20210922.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20210822.ebuild b/sys-process/parallel/parallel-20210822.ebuild
index 184819eb8c40..20bc911322d3 100644
--- a/sys-process/parallel/parallel-20210822.ebuild
+++ b/sys-process/parallel/parallel-20210822.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 bee915cdafec..2dfe11099941 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 1007ce7f5b80..ea137539738e 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,5 +1,11 @@
 EBUILD dist-kernel-5.10.68.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
+EBUILD dist-kernel-5.10.69.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.70.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.19.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.14.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.14.8.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.14.9.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.4.148.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
+EBUILD dist-kernel-5.4.149.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.150.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.69.ebuild b/virtual/dist-kernel/dist-kernel-5.10.69.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.69.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.10.70.ebuild b/virtual/dist-kernel/dist-kernel-5.10.70.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.70.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.14.8.ebuild b/virtual/dist-kernel/dist-kernel-5.14.8.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.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.14.9.ebuild b/virtual/dist-kernel/dist-kernel-5.14.9.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.9.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.149.ebuild b/virtual/dist-kernel/dist-kernel-5.4.149.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.149.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/dist-kernel/dist-kernel-5.4.150.ebuild b/virtual/dist-kernel/dist-kernel-5.4.150.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.150.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/httpd-php/Manifest b/virtual/httpd-php/Manifest
index 4ec394a1c137..3d9b23240243 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,4 +1,5 @@
 EBUILD httpd-php-7.3.ebuild 418 BLAKE2B 02fabb5753e21d7d215908603b28f39f81dd1e1a75705659be6896ef2626ba96109ed439bc9965ac61c31e9395c7279156b771595e445c5990a9df6cb6eba1ff SHA512 4e056c238bc4f999fb56b919f3c58f8ebee7acf02e2096775144edb6e4a04132eac33f1cd8c8537083f2d044d499aa8186ef170123d8cdeb64aaffe2aae81a6b
 EBUILD httpd-php-7.4.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
-EBUILD httpd-php-8.0.ebuild 432 BLAKE2B 92fc45a79ef9e31d17236581699539dd1f899403227b6c43433bbf186b515daccbc4f7aff30d0370e1321cc8e9c3ae8c9d4940ddd329293c481f6e2cf3f8410d SHA512 93a0c6d99434249973b4dc83a92a29b33f7e93b7bfd516517478ff46bf4c68dc179665a1f659d5ab162fdc2d9da6c5f8f52f2081be12fe88b2ce6ab624addf20
+EBUILD httpd-php-8.0.ebuild 428 BLAKE2B 05a4bce6d87332e5a0b1bc5ec6a986149ab2970b0234f6183297942c3e62b59dbbe2d5e82e8aa2b928832a58acc2a82c817de657f7a51a56021e70b736a16c22 SHA512 d4a4382789daeda4ca12307a6180313951e0655d3bbac0d1ce76a61a755f889d50dafe92fc7139dd003f37367b183320eacea8072818f728929b9218c65e5ff8
+EBUILD httpd-php-8.1.ebuild 432 BLAKE2B be42d89a35196078df0d3c8a05b79765e054930aec287c4587a952d972084c3f234e9d85bdf1d2ba16c6181e86b932f64c36baa84618e5a4b7116e03040b7c4a SHA512 a12d5297ba7ebecc3db42e5451cdcfa340b2eaa29f679b62bb2275625a6076f3173d2414aeb7ece85602b55495417e96a4f6e23fac566b2403188dbfb2bd1192
 MISC metadata.xml 264 BLAKE2B 48808ef17a373b4dfb3c169ae63e61416ccbecfea1eba9c3bee7e5be7393f8bec7986123526a3af092841134ecbdeff1a0a52422f24f28bd9ce9e84ef7b7983b SHA512 7ac8d7b84e7690138da0717d15bb650fd97fe251ec3733304bc33672db24668d9247447257ab96110867ce4a048b0523d0ef6c849bdee54c98061c8faa00d3e9
diff --git a/virtual/httpd-php/httpd-php-8.0.ebuild b/virtual/httpd-php/httpd-php-8.0.ebuild
index 78f90b396640..dfa6b5c424ad 100644
--- a/virtual/httpd-php/httpd-php-8.0.ebuild
+++ b/virtual/httpd-php/httpd-php-8.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-8.1.ebuild b/virtual/httpd-php/httpd-php-8.1.ebuild
new file mode 100644
index 000000000000..805f35eb8741
--- /dev/null
+++ b/virtual/httpd-php/httpd-php-8.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Virtual to provide PHP-enabled webservers"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
+			  dev-lang/php:${SLOT}[apache2]
+			  dev-lang/php:${SLOT}[cgi] )"
diff --git a/virtual/ttf-fonts/Manifest b/virtual/ttf-fonts/Manifest
index 7c6b1d15885f..bd91f9f432af 100644
--- a/virtual/ttf-fonts/Manifest
+++ b/virtual/ttf-fonts/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttf-fonts-1-r1.ebuild 586 BLAKE2B d04a48e575a11cc07e145f651640e6334658e4369b319fb596828552924ad7f099ff2b6c6ca60f4b034c1895eb90cb365f0c718bbe57f79ba3d56bfe0d89735f SHA512 b61fdc1b1ac6a17240867e9e70535a4010db1113982e8bd91dfc5d513126fae150a242595360d369874f253772724b101114ddafe5c1c306cd7c5c20318e899b
+EBUILD ttf-fonts-1-r1.ebuild 592 BLAKE2B c2051a2f4b0a25604ecb9ba394391ba4f0de971c43f682781dcf43a0bc9cb2f7ab52114f4d8d86759a675c1ec87186878fd7de8028133a2a12aa5330e67c1c4c SHA512 6b0b23fd7c19d3c408c1e3bee40c04686694461513272f78c6d03d35f501f06011baf9b87c8a1b3e0ed5be254d36fccc59cd1498149837381f1be54d710d5e1b
 MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
index 4ad88c30ec81..19ada4b46d81 100644
--- a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for Serif/Sans/Monospace font packages"
 
 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 ~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"
 
 RDEPEND="|| (
 		media-fonts/liberation-fonts
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index b3d2e3e85d64..b51bd3304ec7 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 472db2a67ec6..1f450c2aa6cb 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,11 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-1.15.24.tar.gz 664134 BLAKE2B 37795ee308d62f74583d7e37c262fca2ba235f025aa96314b1edb66e9900fef61f225d4143460e0bb29d46251c6aae8540ac667deb7eef8febc5fcc92c954b82 SHA512 3988e75b4b0ddb9361b559971a0e2c4c3af225d16bde6bf17ece33993487e6b4b6d66c874fede3cca97f40e9a83b500cf356546f7e83391fb81d5ec649a53fd0
+DIST mod_h2-2.0.0-rc2.tar.gz 655944 BLAKE2B d96d9196359bd7f6fb593a148a08a974e82a5e296c893526501c3e6c60f36581bc89548098e5ff6e42428d400cd8b7b44787ea97f7d0dbcd7d4da1db19c25ac8 SHA512 2c41fbe3d780452507d15b88fafe62c3386de023cc22181b7f077dd72e9c7738b6671494ba6e9c59f09df740ec4ec76dc42a9188e294b7900c97f1975038c0e2
+DIST mod_h2-2.0.0-rc3.tar.gz 656572 BLAKE2B 56001bb007ebb5114cd41c67e83221cc15d50e8ddc1d6ec5a512c26221577eea44bb5a74537bc39c6e50cc14ed6070177cf3ab0fff39d1c8f3147090a07aae0b SHA512 f236bb8aa137d8a3675938beae31e6cd27863b4fb91f9cb65d7704ecd977ecda08dc4c069a4c3be19cb64587a960dae69a0eed98d25f9e07ad223212bc208a51
+DIST mod_h2-2.0.0-rc4.tar.gz 656579 BLAKE2B 112fe4d41e0ddf769c0e7141584be823fd2e9849d95ea077347750019451937886cc6b88d123e004ba2fb799a4f0eea069337eaaa9627e8c70f4b74fb1c8ff08 SHA512 c061f97ebb13793067194a9bb531231b6aa424d2962c380de3769f04e09da3cf3434dd496e81c5f83137ea48cf197a4ee66ce7985c426c2b0b23eb1670e0e888
 EBUILD mod_h2-1.15.24.ebuild 904 BLAKE2B 5a0364fcff265b60e9f2eed81e821511bf66504000ce86358f2b0b5bc3638865b77059c5587d26842ba61d2f61856611b5cbf338d7f429d074448faa9cc2c774 SHA512 1e4483a00430182434a1871f177222d1c00007fbb27c400f7e2993a4fc1a0e71aa4de8641527c3da94b73e44b3ed637a6da374810e64bad4818b8d76190d8eed
-EBUILD mod_h2-9999.ebuild 904 BLAKE2B 5a0364fcff265b60e9f2eed81e821511bf66504000ce86358f2b0b5bc3638865b77059c5587d26842ba61d2f61856611b5cbf338d7f429d074448faa9cc2c774 SHA512 1e4483a00430182434a1871f177222d1c00007fbb27c400f7e2993a4fc1a0e71aa4de8641527c3da94b73e44b3ed637a6da374810e64bad4818b8d76190d8eed
+EBUILD mod_h2-2.0.0_rc2.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.0_rc3.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.0_rc4.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index 5b9dbe992073..352e2e78dea4 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -11,8 +11,10 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
 	inherit git-r3
 else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,8 +29,6 @@ RDEPEND=">=net-libs/nghttp2-1.0
 	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}"
-
 need_apache2_4
 
 src_prepare() {
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0aedd61a96d3..c474866391c3 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 3a08980e36fe..88447e53f8bd 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,7 @@
 DIST airdcpp-webui-2.11.0.tgz 8148062 BLAKE2B 2a47bae691667aae14afadbfd5a5b1f938c72de7ba3ff75f0feca6a5d13f890fdb663057237ff29ed85eea6fe55f72e421201fe2c44efd9181dc751e59748bb8 SHA512 00147c4f1d19a0866735a6bb0b4789e915ae028bf92e4a46aea586c1c4eea57fd85558cdffd9504abb36ffb78764bf6c310a5937f06d99de03883bdfaf6a2b33
 DIST airdcpp-webui-2.11.1.tgz 8147412 BLAKE2B 4d4eb713b1c0c570d5c1cf02053c87bf983c97c6ae33ac58b04f4cee0aab41828981fc299c74383da4bdd015695daba4dfed62b0a6bf5d925e1dd1065fe2e60e SHA512 c54673ba2755e3b7e5889c34d2ca3a19c9682b81b2c527d579007931a7983e8faa905ef8f26b5a7c8479d98c7c9fd98de5c9aac2de0161aeb849460e28d22465
+DIST airdcpp-webui-2.11.2.tgz 7200053 BLAKE2B e5a8f1d39d8cdc96cdfd1ea97d4ba8e4a943eaa0c53902b66fa0731432527e5f1a27a40ea08c968ca58281f6a1064166072302b37999396db395a3a66c052a17 SHA512 3d505dd231dd3e7cc1aae32668b7567eae5346f8a67bded3a54b1be830145ba6c13cfbcfc2eb4eedcfb306096b760690cc19602db314535d48d0a30c1334ff73
 EBUILD airdcpp-webui-2.11.0.ebuild 464 BLAKE2B d3f1eb40a2e590691b0f5bcf7f0be057c79f16ec9aa8129000b1bc58842d64055bcfbf52a4c2d3c3d92eb4eb5bb27793bfc88dd218e875b00cacfe6a6aa09c3b SHA512 2d83ea9710167a129e5cb1d51cc2abb56c24defeabd812058145e684ef4c481e9e8acb8df23405ece32898cb611ffbd38bb469d205df41e22e2932cd62d7b78d
 EBUILD airdcpp-webui-2.11.1.ebuild 466 BLAKE2B f7fac3d59fdd1a83f4c6481d0284b3992f3b4dee4f12a47122512d867fb0cfaf478cd9c3be977d70bcd982045dab927c93228d940226296759a6f7d08462b10d SHA512 a7a2ff15c5af50e3c7bd0309b30046f05a8e66b4044918076b162d654ceca08b99f1ea0378fe9f451ca16dbad898085179a80f61700f90164e329045390acf08
+EBUILD airdcpp-webui-2.11.2.ebuild 466 BLAKE2B f7fac3d59fdd1a83f4c6481d0284b3992f3b4dee4f12a47122512d867fb0cfaf478cd9c3be977d70bcd982045dab927c93228d940226296759a6f7d08462b10d SHA512 a7a2ff15c5af50e3c7bd0309b30046f05a8e66b4044918076b162d654ceca08b99f1ea0378fe9f451ca16dbad898085179a80f61700f90164e329045390acf08
 MISC metadata.xml 437 BLAKE2B 02be4b42bb953f24eda2cdafa2d4b74f52fe9cf231c9408ac16f3039f4608cb405268f2923f4340e6ee243300e6207ec76ad56b103077cd0a4ad2f21d2dcd81f SHA512 6a242d28851aea65d1a16f9455eff6947980ca175e5dc53439021d673d0faaf79f44263edcad1eed1d062e93d4e383ade8e95906cd1370da25e5534e07a8e98c
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.11.2.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.11.2.ebuild
new file mode 100644
index 000000000000..e7bbc80f2a8b
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.11.2.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/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 6d913f6a719d..b0255290dbc7 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-94.0.4606.41.linux64.zip 9875677 BLAKE2B 71ddd9eeda40cb209d6c2ec33d77572bd646d2afbd30cf6e8f3be70a595d2853b30ce7d4775ab5db4d3741337eff4a3068bf2432f1c526e793a75ff60d16d303 SHA512 d31ccd42b5c8dd342ab561d3400ba4cd13e2fdecc933fd6df3546b2f0d323fe52be44b084701055ced01afd71cfb0261bcf5041cb7917a5b7083ea1db60a7787
-EBUILD chromedriver-bin-94.0.4606.41.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
+DIST chromedriver-bin-94.0.4606.61.linux64.zip 9880569 BLAKE2B 878f2361cd952853f14836e7f09f741860476796be29e3654d06ec44cdef9d99c8cb08bc589adece85e8f4a63b784c92454d9f43e5a58f7a6eb52c04fa28d393 SHA512 be0c96b91c521b097ff0b3c44b72499f30f874305c367830f996b09903910fecdf5ad945ca6ca8f1cc5af85fde1e3dd3a89b4086f2e6c0dd6a7955d867a9d279
+EBUILD chromedriver-bin-94.0.4606.61.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.41.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
index 7c2aac12ffeb..7c2aac12ffeb 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.41.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index fe9ac534875d..5b0e561cb9d0 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,3 +1,5 @@
 DIST element-v1.8.5.tar.gz 15979411 BLAKE2B 865f36b5b01d43c9f5b912834ed9c357b8ffb8001bb86c00a941c7093902d6ca54ab21c44bb1ed535e039e787735e3e3e3cbb5e7c210d978f666a60dbc1f2bff SHA512 90adfa42829cedd30180e235b4293a040eb008e990845211b07807b64c1e7bdc8ef0c609a3ec5150d821de528be8a4cb01565950356c134ac6fc7390255e8d66
+DIST element-v1.9.0.tar.gz 15631650 BLAKE2B aeecf81dc0f5f99df23c8a2d931dc9172b3dd6b627bc8c149d22ac0862066bc0dda02774919ff7509c9ae99e420730f9b0eabbaaf0399f9ba5927362bde7dfd6 SHA512 e0a3a8696e493ccca6abcb5dee178e934cdae62a92e92d4c1b8718eeded45cab26ba3d08353c8a4701a94d537a0da072aac3e34e268c9d8541b26111c90eef27
 EBUILD element-1.8.5.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
+EBUILD element-1.9.0.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.9.0.ebuild b/www-apps/element/element-1.9.0.ebuild
new file mode 100644
index 000000000000..0d6f2e6d2cb4
--- /dev/null
+++ b/www-apps/element/element-1.9.0.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/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 0d494edc7e8b..297939e6264f 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,7 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.36.1.tar.gz 49645517 BLAKE2B 48325d3155721571a7df7b295d4df342b4d2ad59c14e995c79205c3eb71530a80172ff595bb15ba1d90f90841197099fd6cb8da0f42f82549971b9d3a4d7ec1a SHA512 1b84c0ac2160e2a04e7b8da2ffa2bbbda32e6306ca30f6794e4298ac8085ddee4cc2d755394e49af3a00eac393d8e79fdff284b665fba33629fbd1af1f8413d1
+DIST mediawiki-1.36.2.tar.gz 49653546 BLAKE2B 3b5a286848973a5f7f1794e834e056ac3d49f61df7c524d8e67bc559b39cfd8c69bc4dcd31a9e6ea3ec6a004ba6331846d32e9b941041bf70d73b8c7c323378e SHA512 e4f18425dad547c547cac4926d5bcb2f996fcedc5df84b1a55773954c9c98ea0db075e65d5352ae92e2040b5154393c0dfb4d25e48a44272233008b61d29df78
 EBUILD mediawiki-1.36.1.ebuild 2567 BLAKE2B 4154bffccd7c140c1c9a9299d79c551f05a0bd3a570b299b56960814675e173aeca331867f173b9d467c456324db8b5855247f104d4fb7cf1eb7213e415d7e29 SHA512 7a4d9836d9b257fd181168cf5dd7fe2c69b50a80cb5b2c1121a510f414481886c922dbbebd2f9a0de866dbf44b71c3c962e0e011358b10de03e23a818ea2e118
+EBUILD mediawiki-1.36.2.ebuild 2570 BLAKE2B 6fab5279bef31daea0a6d0077c708cab758d34675f1ff707cdd5527e34b47449f083ee8958718fe89d98e29fc364f459c265fc8c2515aaa0f114e1567113fd81 SHA512 3addd9e6f8a4026ef14d4020f9d8b2ec7f96e4b076aaf3a8faba0a11e0b215c1454638c0a2a9c7cab6e1ad9c1fe81d5f8a7fb876afcb01db1e226506ac394e62
 MISC metadata.xml 270 BLAKE2B 9041e12c102c98e539b1d69a8b47a683f7f2fd2e5c1d9b0d8ceb4af9b7abc98d56cd64f4ed335717cffe7acef253748f7798997b8edab1c73d4b4f8eb75528c5 SHA512 fbdd6fdd911b687eaa654d7a9cc25c469c68de3d582d29c142acb5f3944be4ca8205345b94841b831f1b25f604c97bdbeab2bc10bd1cc6a371f651297b56f692
diff --git a/www-apps/mediawiki/mediawiki-1.36.2.ebuild b/www-apps/mediawiki/mediawiki-1.36.2.ebuild
new file mode 100644
index 000000000000..b2781106013a
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.36.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/nextcloud-notify_push/Manifest b/www-apps/nextcloud-notify_push/Manifest
index 74a29009b0ad..8d9229daae37 100644
--- a/www-apps/nextcloud-notify_push/Manifest
+++ b/www-apps/nextcloud-notify_push/Manifest
@@ -34,6 +34,7 @@ DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7d
 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 bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitvec-0.19.5.crate 148200 BLAKE2B da9ad68fa928013a0f9403ca791072b35388d453b563d76d73e3ac34bb095bd1acabd158ccb1ce3a3e648e4ed602408d93065d9fb561338ccc80beec75ec8040 SHA512 6a2028f1354b39a734ceb5859664f9766c5a291b560c6f7e0dd8195b7f8d15a3e0552f6fba158009119103f217938dcaa22291af420580ce13b80edaed168459
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST buf_redux-0.8.4.crate 26608 BLAKE2B 32698d29b357c625ab663730cbf7717b91200a9f980d3c9107ceb5f8f83ca7f2514b9b5c7fd2b229e8490832dc78291db460fb7fba130cd61cdec8b42c33a483 SHA512 709095a4acadf032143225740343840d247b4dc130968e36447260343294b134af780604eb8214b9e6dce924e13701dcf7a9c7291340c3393a9334c8aaf5454c
@@ -43,9 +44,11 @@ DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3
 DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 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 cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9
 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
@@ -55,12 +58,16 @@ 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 combine-4.6.1.crate 132412 BLAKE2B d80db329dea0118acfe60f33809630b0b50ce0b521ce7ca22d149d79fa65ca33fc91f5522a08f93571d0d4c832370c8f98597d5aab44f3109566f150280b1a76 SHA512 8aae624bc0f754e46dba2dec54c211e36bd0af1db9fb12daf804646122da5578fc366da124dd7cb7ce938bf6ed76f955d97b06ae748c1c1451105d07fd451dcc
 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 cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST cpuid-bool-0.1.2.crate 7173 BLAKE2B c94598ab349d87a0859112433d6fc31e46eb04ec8c0edc7ce1f15a31f9f3857f93f067c4ae35e648bf2bd4f54d1ef37ffc1507b5d6eec8c3432636c589d1d8c2 SHA512 7907fc4ec0d5ed370edde0655c8223f0df6ab06c2c297c7d3bdfa958f601550851331e777065b4fe21f01f46610604e91ea2e20aa4b4147f441319224f69597e
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
+DIST crc-2.0.0.crate 8302 BLAKE2B 20c77419b10d0c1b1f1c90f372d370521b19e32e00acdb818fd533706bc09fbcdd3d1b65b410d42bfecd496adb7b8e164713b4a34e7665b1631a7a53f31768eb SHA512 ce17d148738033743b5b1f91c4f23f13dcefc86c75d352eb07c4c4ab223a15aec33d5f57dd55a41afc22087f2b95d71bf2f4f49e9b483d1a83eb8100701b9126
+DIST crc-catalog-1.1.1.crate 8698 BLAKE2B 7c118c7fa1833b23b86cbb33318d43882106f3a1c49059939cd23431b82c39712db5d2304499d56be9cf98fc445dadb1ae01c2f862a2698d66a03d43e17f4dce SHA512 8785fedc82721901c39ad858a4c92b8d6246ecc496bf0c755386c4d8577ce7e6fe8b2f815bde7d892505e1f8125bc028864951f00c76faca2f58f9129986a7f8
 DIST crc16-0.4.0.crate 9571 BLAKE2B 2f848e7a00e860d62a44832adfaad655e89dd6e46b0e7496d39364cde19342ac5b9ef69831b724421431df065939c25d07c72c3056a71d0afd768b6d06003e18 SHA512 bf5a00329906002c77d8190d25cf9744dc3135d4c6acadbd7aaf2edc8b74098bb6370a65c639d0f31a7f217a3ebad704a85cd5f7578527012a10f96e5a74e829
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-queue-0.3.1.crate 14787 BLAKE2B 136cf26e3a932a4c8035c50b8d6f905f59d3116a8bfaaeb5511e48e7225d05857722240e169d8efe3aab07c370923a57178f058f05c83cee9c1992d03f907f1e SHA512 f666d14ffe4be603ada67ac1fd28526bd2517c32856dc077e5bfe512fa012c08f197e206afb2547b9b5a52ecfb1231a9bffb5b9d24cc4e58aee37ebb87b54d6f
@@ -81,36 +88,47 @@ DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319
 DIST eyre-0.6.5.crate 38841 BLAKE2B e78fd4bae1acdb08d76b6573d8657c68ccb458f5460b370e04e2f31fe47606608b9483784d3b42ad82ab0c832ac9363ce3aad4e4a2afc6f2c025b6704cb5938b SHA512 b1db4fb1c404e4e1f55945aebd37635945d6084f59e3efd99811bb1f99f9db182fc66de1a8f9b2b47244dbd409b3cc71f9d492f4f5f7ff441a38b6cabd315b19
 DIST flexi_logger-0.17.1.crate 76546 BLAKE2B 1170402c7f1bba16e64dc9962343ac3487250ca3d0f57da648260aa6e5250a5688f0d599ff9ec2be26b07fe759df00ee68a139d38843f297f82eaf9b0002e22f SHA512 bb088f098ffa91312fd1f0d416f0b0f8302576f646df0924030045990a96a2f7d85285a3a01ef5bd585407ac36523a4441b0ad860b4b19efacdf24a302f0d8a1
 DIST flexi_logger-0.18.0.crate 175763 BLAKE2B 1fbadaf3e1fbb7bfcff7208fcf8ab42b0f64e426f06b3cb9e7277c9c796b114e95efc9b134e74f07b78a8bbf19dec5555cc22a4333d53aa4b2fc0914fcf39fc4 SHA512 323b1e1d41e72acaed27dd5453344d9b9765fe7c159e9ee55761561322e069cd65b0c45b0180e79b076fd19740a45c8c3afb3ac96beee2b663429909ceaa1aa1
+DIST flexi_logger-0.19.3.crate 194809 BLAKE2B 20abacad73412841181440f69c23ddb7977d73a1ed31bbb02bfd1a01077e765e53b973916e325a0f0cceefa4669d4f8bd2ad5f87b95ad3ecee40fbef211cbe8a SHA512 f71e003bb2fb817dd712bac31c70a228af84f02c3afbb6d3c93f4f726415772c7eb93fe365fefc839944bdf290974b1545567c9926703598a09cf9ad6f3e191d
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 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-0.3.17.crate 47388 BLAKE2B aef48709c0fd15e33308ccea3adfd2966335de4c4ea24d04306e6e8d724bc6bd3355c8fc3d0392d4a26dbe85e99769267569c1ddc96ffbcdb972c2fbdcaa9149 SHA512 c2099288119c37130692cb747c7db16cb3139ac5db8fbec9754dd373eded0593f9444b8d0b003ad3fd138086959c1b74e105f2105311eeed5a65367d9ce795ac
 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-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
 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-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
 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-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
+DIST futures-intrusive-0.4.0.crate 85596 BLAKE2B 1c84c2988c7583a492637884bd0661a85e355e9b31ed01f1ec9b52b892cb1c6fd5da97b2b86a667599c02dd10e12e5c3eb93389e1f5e3277d17100439adff688 SHA512 6042abbfe724dd3defff1eaf3528ee02d4f3b370ebdd9c0ab0c6b2e58ebeffe1c75b3fa21401f72a10dd4e901fa35e7e99dc40d856251259dfc4cd24860c23ae
 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-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
 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-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 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-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
 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-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
 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 futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 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
@@ -121,6 +139,7 @@ DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa54
 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
+DIST h2-0.3.4.crate 159228 BLAKE2B 50ca89c8caaf9952d1059175cf28a5050d334bc95b952e9cf5404556ea153e302881682699505c068bd4905c352fa61df0ae464f09605c8db7d86388a7f93144 SHA512 070def34be02d7c3eb3324c8a1d86fe51afb0dc6506825a972cf1df3311f184a46f20701a76e78b3a105de56a09dc5b3c098b743ae7f9f0d3b2f927d83bd536c
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hashlink-0.6.0.crate 24952 BLAKE2B 3bc2588dd7ab04a9f49a1bfcdb633c09cd4031177d104ef4ead0caf8d3352383f60b3550bdead591bf21bbbdc097407d4de2525fbd3012d0772c40b9413162b2 SHA512 bd019fb982f8521b818d2862b739b489539d7e15d6ffbddc0c6a11a9611c9e0eaada767f3d9c9b8a966dc0c408b8cb475298fc97c7f6afcdedbd6e8cfb5e4df9
@@ -137,13 +156,17 @@ DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409
 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-auth-basic-0.3.1.crate 25642 BLAKE2B d2e93652063c868404db11bbe5be77a0d6ec8c59aff8ecb93bb4e6f33c1dd4cd5df14257d7b9d35ce49b1a77862f9e75ebaa4700089ed090fd681447fe5b54ca SHA512 f425764d1bdddc65899b39927da1a60ff35ccc40b5863af07634ab18fabb13846a9b6b273486956f6ec6094135c8e9ee11bb175d923a6bdb4d838a503cb237d3
 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 http-body-0.4.3.crate 7660 BLAKE2B ef56f26e844f1f234a5fd96f29aed91897617ce126e6f143ee29fda2183858b3439570ee980469fd092ae8d7fab00ce7d4300e0f2506a9348876df766d80ed50 SHA512 2d72e11cbb072dde536c5187f22d88dd9aca0768e7b0191003e463900d50ba73e01ec6dd8c98d348c0fc5651ec022b859daedb5194c71fd787af4f2dfb97650c
 DIST httparse-1.3.6.crate 24914 BLAKE2B 010658b7df7cc57ae08b2a4e3ed6a7f20cc20cf8bf8c4e2d1374edc8b32669f5dfab15370a55b721c9e8741b39c9fc1e08094bd0c355735c9680f035606fc73e SHA512 628d6aec185c4bd3e8f7149382eea9dbda180fe77b8f9c741bbd1337de7655e85803422702247f2cb2b835051ad936ef87394ed099b84dcbb6982c79efde6ba2
 DIST httparse-1.4.1.crate 25592 BLAKE2B 4527521876c4c44306819336bb4b53ca92b427b1b7e6d41f7b1c284812d6c5256870f074bf5273e63922da50297fbeead19c451816f76d9b9b500a5a4316dfb3 SHA512 0dd0f41076009616a80e6b43b317e8560918f5ffffa7467d58fc9885bcfec758ee521beecd665e75d1ee6fcf7dc7c9bf8aa560c2eb885b4e42b84e24bf2ed9a4
+DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 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.12.crate 169745 BLAKE2B 946e0113cf301ef99c0c4426af4530b4217a50b61fb38073e9759663974c0ea7d31127206fdc592b714f7009851348e848d4195769aeae4e7b115ec7bbfc47dd SHA512 bff751761be9931a577d79fe4041da97ae574c178f14ebcf2e2dc53e2cb14091f978f6647685382bbe746ab4f928ccc81f2b61c5c36b16836c123ca3137857d9
 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
@@ -157,12 +180,16 @@ DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f67
 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
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
+DIST js-sys-0.3.54.crate 70453 BLAKE2B 27e8375133302950ef19de116eeeba25233bca368ac75e61f89c41216745299c07844706db187a15d97ddd2989b1d47337d29b8f6b4fa53269d3c3a84964c12d SHA512 cf927a64769ecdc9a4cfffb6c4321bf4de54ff63303cabdc8d6a7d75d4c926c69df25eb61390cf9fcb9fe9157def26e04fe7b08509f09f07565a314f55b64f1e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lexical-core-0.7.5.crate 492761 BLAKE2B 1a1e1d455ed054b2f5daebf1b6c4572b3ff505851bb9ab6117f9263c3948f43f91f83b7ef4ca0b01417efc0f932bc138ddf59885aa2703add7879efaf19b698c SHA512 f390be439d21f96a4d6f386170eee4d720ff76a9366f5950ba15ec26f1791bee01633630275e91c8b6cae1a13d823673da06672e4436886001681f62279f9fc4
 DIST lexical-core-0.7.6.crate 494385 BLAKE2B 417644e5e33a70aa4165cba77bad45c540aaf7bb2037a5461c691b646a5470c7ad68a60029ac50f1cf25de3b6928b3f491e9b7ef5cf5a7d3281d83fd33a173f2 SHA512 fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
+DIST libc-0.2.101.crate 530003 BLAKE2B 55be777a0ab91df07e06f8c5045fa49dcb356eddcda2feb3a16949afbfb395abb3a50a97fdc6b6f1b8974c07af13c9b286f8222fe8557b668247065515063d8a SHA512 876a5739c1ba29d4a4d5c9407b013afabebc6f5644dc57864104e99f0303e7e7ef1d5ee81a665f1029433b9251917b1e1571624a123dfc15586d6bc49ecfb3e2
 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
@@ -171,19 +198,23 @@ DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f
 DIST libsqlite3-sys-0.22.2.crate 2345859 BLAKE2B 284b9195b7bf48f138970dea782985cca3d105112430400ac76189eb0d44174a063751693fb2978db1503387eb4865634caebc7d7d0800cf34fcfd8a4ff4b5e5 SHA512 c87c19f7b4f2043de57da0bcf52fe0cf170bc9b894599a2c4ebd1dd489dffd40bf4f30ad78c2b1613e79fa7ccc39bf87d90d8f708d22bf278a8c682626cfd28c
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
+DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST logos-0.12.0.crate 8849 BLAKE2B 1aa4d2fcf57d7e3953bd4325da1ad43af1c0c9a968ef964a8449b6aa09e92c65c0d0e178f319e0ce004fba55618d576023f810b5aa64f2f59c2c26b0315726b7 SHA512 3fe0b51294bb929d85c7c8223f07012a292376d57b2ed8e91b974cb27501170aa14a50cfc4c64840006ffd0adcdf60bdddf1596a4bf56ca8824d7d08cb26afca
 DIST logos-derive-0.12.0.crate 32455 BLAKE2B 94556a68e8ddb65cb000877e057b46dabc03360068ce06494c400df07006eb6adfad61311420187a55b68760971708564c4b3daf9fdab5f5c864fb34aaace9e1 SHA512 be0454574faaf7e2ecbfec7f2692af2e08ede3751e4efe8d431ca3f1bcb9944c45479c3decf7232c7136390bad1fdc32b46cb2c2fd9883aa43eebe570ba5f425
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 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 minimal-lexical-0.1.3.crate 94080 BLAKE2B 9d1b8bec8e4e1858f883c77e1db6253ef7f9673d9821e0b08b10f35445e1059017a8a5f68079093f4efa9b3de367a8ef8ce1a302116c02e321477c5d23f7fc67 SHA512 7ea745c5db2c4741eac73faaf1513ca6106b508b40dfbc112c2d63f557dca6654dbb7fbfb1e628a13f22dc5b16dc64bdf75a2f8f9625e85f50a44320a96acea6
 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
@@ -192,16 +223,21 @@ DIST multipart-0.17.1.crate 64638 BLAKE2B 6edf8fa8648ff7f754cd68e23a54a165d4f6d1
 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-config-parser-0.4.2.crate 18928 BLAKE2B 131ba1e8719a554f77e3c4e419dd34a4726f22317813e2b4a359871c4b15d82f202cc838d26c6b718803172b73ea911508d03d549405ad9c6c645d2bc4a56055 SHA512 f8c14029d5abcae707c5580fc919e193825bb4750b2761e8dcd535b943f1d17223dd8c385f2e8516672a6535c3b7bcc4adbd1540578e4bcae70ce59af6cdcbaa
 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-notify_push-0.2.4.tar.gz 92800 BLAKE2B 5136f254c51994924f89eb986ae77f0034b51ac9f8c09e5acb17cd9070e3a5f1241e9795d8fde05ce17ee383b56a95c92f84f871d2471ea5f5ec401578421dcf SHA512 3faa2f5a95201824a4fb3653988ff96e180ad840b4545cdef55114c16118d510e0b7fbe396a38d6962db520fe9362380e9eac1e17df89f7ab3eda4d9deb3222b
 DIST nextcloud_appinfo-0.6.0.crate 15344 BLAKE2B ce1b16bf6de31346f51a6e507a091689c410e118b5d44520ba184f998e38d217a93ffc27910db5de3bcbdf2a82c7929f17184fe4792a10bf454ddfff61109684 SHA512 36c28a0f2932d0abd6e7a4aed65943c09d2741bb315d3e0375f38918e5ef604cdaa17855026cf93e9cfb6cdf03018f75d363d58cb47e7189f309c45fb5140867
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
+DIST nom-7.0.0.crate 120442 BLAKE2B 209c7cac6942b62e213b433c0b41a4efe2a70b6cebd379cec81ca93fc86c917b29efefd54eb2c0468bbcf071b99ab3fd6efb633d1f82ab915387abaf8b6ba9df SHA512 7f640071cd5b1870255a7182580cc94f24e69eeae06b1a1f193e91e26c1b01bf46c8baac56fdf220191ec50bf7994ef125ae1991d4c4659d0d8f7809552313f9
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
 DIST num-bigint-0.3.2.crate 89374 BLAKE2B 3195b284f5b7743d988078e12a7ca54133feede08964194dff3590f77e41373106c537e2f8220fd247d05c2087536df29d4a2243d6804380696a2d488a4ac153 SHA512 1471b43642d7bec07ba79b08c227a7512debb0a556842fb8e54a41fff2db6948ac3ecaf0cfc05209433db3b3888cf45a4b61e42d6a0c97137582c72a3c7a8abd
+DIST num-bigint-0.3.3.crate 89493 BLAKE2B 015b680a0311e0c4fc248e51872bb69999e70c7a9ee64a649189eaf3b7125c1e48b0df0af5e996ca46585a1f9197b1eefea1bfa2598ad7296530e027557d2e49 SHA512 c4e3ef01b4da24eb3676d6716fcda84418e8bfb0e64aaa4cfc9ae67e08a032f564780a8c03ed1403b68cd7194cb29dacc778e11bc821e8c9fe7372a1a95186f0
 DIST num-bigint-0.4.0.crate 90002 BLAKE2B f68f92d7796d97aad60e6b08976a08759fee51672f96e1a6c742aa3d4ae2f35b921cd948923bd7aaaafec096e9b0709a060833045d63b5352293567b68cf3d6e SHA512 adbb20a1407934a129daf25278470f76a40b3adc002994927e3d57f7370bf857761cb117f7c726e98a487ce557c4ef6ee668702958b21e90c31df4e269393d00
+DIST num-bigint-0.4.2.crate 92154 BLAKE2B 5c4067d77f7d15e8e06b006b44d31119f42f3440091029dd317f24219898f955b326d420930f972714fce97bc27183bf9091892f8b8cab71f8e072a70909cc7d SHA512 3ef8b0fdc70d1f5b6a3f26e0a50264bd065f97caee1ab623c9fcbd716b0c0b1b62988d389f1734ab3ffff103801ef3a4ee33445d14b6c3b01a391faac6ad5bca
 DIST num-bigint-dig-0.6.1.crate 123877 BLAKE2B ca58d48e2d74c2c1861f47b1e7cf9e3e5cfda14e74ff50ffde21172e710e25fc2339ec731e12c08c3fd8ad8c0cf3783634e95e62c195ec468e7ff0e8e5873550 SHA512 48cb04136d7ab9a61749014cca9edda3170da66e44fa8fb7d7cef102bb93f437328a91f36abd9b42f953c094ac64bf41ecbb0f702caf7ea7371c63c8bb956966
 DIST num-bigint-dig-0.7.0.crate 123930 BLAKE2B d6c41249cf34cdab7e2d612f3d785d746611ff1399d101f7c00ddd609e15c4fc44c62d6f74c9cc45c9152240d98c7bb7c343f5e5e58e8df531f7f134b187f3c4 SHA512 984fa9094dd16bbef9014eaf58d06df9b43eedec936bd1b1aea51e690bc2d3b1ee91d3a7781cadd9a51a38c7c8653ab3e0208c9fbcda322ca035f81326dcf090
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
@@ -212,13 +248,16 @@ DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45
 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 object-0.26.2.crate 238067 BLAKE2B d7731f530dbbbfebc506dcd12bcf33e1421785d9711864d6d824360aa249b85985f4db69ad4036bd7f8fa22d5909f973a0f58a03021289a611ed5290d2fa68b6 SHA512 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d
 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-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 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
@@ -230,6 +269,7 @@ DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb
 DIST peresil-0.3.0.crate 13573 BLAKE2B 6a5af428257c66db670a78bebf22b667b68633fd17e883ba288e089663a80c594dfe3e4b55043af3070deda8d1643e724743f5e840f7c7b7d0fa26409e00d589 SHA512 874580a62add05677f2573b7668612caee7e1653ae6263652fd495e5c871b8e71c66e20938a12348cb63450b3c88fbbe49d67b71868a8f970d82d94bd4425961
 DIST php-literal-parser-0.2.10.crate 16905 BLAKE2B 1e7ceecddaf8b2e058347e2013960811e696791ae43d1e568f976d54d75457b4748c7b557db9e35a5824b801103d8ea0ce647ef47c1c0294de684cd935097d93 SHA512 96b52c0c727842543628dbdefaf29ffeca181ee7ffa4a21577ff72ed53b974b54d9072220e1b292d76229141f4295159b4664aa739e0a4554d1c98eff12cd495
 DIST php-literal-parser-0.2.8.crate 16897 BLAKE2B 525f5d911fe7b1f7865883f3a07eb6f9fe4f6079422ece1bedc18c9533e10967ebe2c410c92f02b530c8450c3db588f611597577a332579cd31cd969179d907a SHA512 50ffd31858b936fb47b53e4220cf77df27f1c474ca5b0a5ab8cb3f17244c18653d8c156b92704bfe3afe6e28d34858e9235a4409dee2f1cc5162484eeefd5f06
+DIST php-literal-parser-0.3.0.crate 17964 BLAKE2B 5a42a19b6b8ed6044a2a5ba2043b2f9d11363f5f3baa4951dfbfe772fc69e4da52db2b302a970afcf6d2e3a9ee450eb0ebcf0a4db01a68769a2e00d91641efb9 SHA512 1edeceafab740d61309d9e4464bcbfb03c636ae260169efef4baf105f5908178cc8462f076fa84c1b13cd580d816d94ebb2a7182dc206190eda6d475d88bc818
 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
@@ -248,6 +288,7 @@ DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed
 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 proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 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
@@ -267,6 +308,8 @@ DIST redis-0.20.0.crate 127312 BLAKE2B 232d44e7aea6f519c235daadb3c14222f295997ad
 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 redis-0.21.2.crate 129247 BLAKE2B 001e8424f08b3b60c43a6fa398e4e829e6350fbb217c6bbb43659189cbdce058166d2be672e30af9b0e08da2fc4766969d3438b9d974eea5f1fe79d1cd249333 SHA512 446476818a073645232dce9b8a5fc6bb82c4afb1b156e3d99cfeba6ea3f37845ea16e3354725be44efa896af3ce69a2ce328e3deb562bce2485392352455bf73
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 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
@@ -290,9 +333,11 @@ DIST rsa-0.4.1.crate 45830 BLAKE2B 2dc876f67ca2cdb16e1b83c0b1cdc3816d32637b4f71f
 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 rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 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 rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
 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
@@ -305,18 +350,24 @@ DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 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_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 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_json-1.0.67.crate 114957 BLAKE2B 7bbd0ba10da257f058e974aa907b7f358218f409f3896285833cf2ab9950b2d9368dcd3682f2479bc208cbea39cb406d79531675aa8a6937206b90223deba289 SHA512 3199020a986a9cdcfed2adc972451df92b9d92d5d5bfe45dd24e5d23fc4a50dd497602dd9b6176c4f2ba9a88aa78942a5fbc7ace76721b85d3635e267e24ca06
 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 sha-1-0.9.8.crate 14029 BLAKE2B 80fa6903880ee36841375345d1763672ae8c3b790965b0bfc7cec7ecc69744be3a35a890a6f52b2a25f9ed1b91ce6986dd04b00ee455563b00218f8acd4b6ce5 SHA512 d4708a762d5f3dfd902ed335f0383cf63b442f95b1aebbaca3643606ed2480060d2ed04f123d0c44496147ecbb06a093980b435f9d3ff9e0f5c908389736aa9f
 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
+DIST sha2-0.9.8.crate 22132 BLAKE2B 233c2160961729590a2ee2b150715327fb09a1a38ca13b07c2c690ee6ed6eb7d180c54d84e9b3ca2e92e48d7ec923543e893786aa81b5942ecbca27b40ca12a6 SHA512 4bd858f67a3ee5a22769aaf4161d823884e112f99911d5461cafe746a19fafd2d8946eb3aa234953efa06a4dcf7becda70db6721c0d4a9b6f1fb670f31f6343d
 DIST sharded-slab-0.1.1.crate 49002 BLAKE2B f5ed6ba3d454677ee404e30bfd960c7748c02272a5c4bbe8ab6d01e0a54a8160f091ea693451cce41a3db52d2c99e4ab98b58e7071c15f8cf60cb64ba3216dbd SHA512 aa4e2e210436d4799fee76fdf5f83350b06c6bac88ad668c30090eb2c594b656238b26f8ab6ea173fa894732fe7e1b3e80a43a003e592469a402de47cd5d9c8b
+DIST sharded-slab-0.1.3.crate 49921 BLAKE2B d2ac62876bfaa60b73af0c48de2d27dfe80d7ca99898017ecf64a465b7ab2deb0544243469c8b52fbfa66507fc0163d76d7a37dff9dc2230c9e26e7fcc81375d SHA512 560426186c9fdcdd8fa8a6f5ee12260faf93d8939cc994735d2d89ef86fe719e28224acea1b2f1574061765f5f3dab01a29427c1d83fb14d5b8227c5167b94e4
 DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628b985860bd5020cc870ceb6067933c8e58be11d7bdb3c1f715231ca2f0ec2930487ceb88a82d9b9d1c0a31bfcf4a581a002f4 SHA512 2576d474c490deb6cbd759985f55340bb4e4ae0abac3ee02055bc30fa4008fc96ebf4d96f0a85c634b4f04d57b00243625194b333cf330f59fc82286bbeb30a9
 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
@@ -324,6 +375,7 @@ DIST simple_asn1-0.5.3.crate 15662 BLAKE2B 9431d340bc4fa5ca8caaae0e690c836a6b149
 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 slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
 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
@@ -332,14 +384,19 @@ DIST source-span-2.2.0.crate 109700 BLAKE2B 0c4f68e0143caa2eb68e8085cdca7ded5efb
 DIST source-span-2.2.1.crate 107624 BLAKE2B d740bdbafb1de0f8e09fec18ac91ff4c8bd2c2d249c8da49f3671ebf51ba4ae497d640c9a673f819ac0dd6f9b87224bfae186af9ad8e7b3ad225d5a7f686a521 SHA512 279032eeac106d72d01a77c5e73fde2ec61da535e60b8b44bc94397ab90287c721c52b7f600f4c383997a4b09827f704427e12cdeb7190dae234557d259e0873
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST sqlformat-0.1.6.crate 20402 BLAKE2B 24ea0f32700e4eaf5500e7803af6bca9a0ad535674f2cdeb00a4cd4dfa99c8631a97c3ef69d77c5475c49ae3653f38fafa831aa5bff2f688b151f6c0f18bf8a2 SHA512 71e66691af88a80bffa619957b80ef676bc29d64492d119dfaafec0c81868e43b68b66fd3336d8c2b5473e565090fdc85f4dd555c1d987f217537258d1b2f147
+DIST sqlformat-0.1.8.crate 20492 BLAKE2B 4ff36547a4c9a2397803e06321d13de6258794c3ac263e63eda9eb4c0a0902cadaaf71a4e146b178eb560797e748399f992c50fae750b2c89061be684221be4c SHA512 b608087f6a53e908edab1b6ebb5560e4fbece151012bcf75708086c66d80fa4742bc83d7a39ff1b6c562f018161e55f5c68a13b0041fe325a2820c42307efd11
 DIST sqlx-0.5.1.crate 78533 BLAKE2B 02877f504a274fb7002e2f2a97a432b7bbbd4cba5cf3eb6bdb90459bce43f80cd4929b293c400e6c5bb4c6262c75c95136ffe6ce0c8d7fd71b9fb99379ce132b SHA512 9b683fd52bb7dd6e98adf909096194632210823b8d776b31b1d432cee53f980aa592cd23f9d975b2228f879fdf75c5db29f44e0cb7812f63d767e90f6cd099e6
 DIST sqlx-0.5.5.crate 81130 BLAKE2B ba8049617471ac1631ef35ef0608a520f08cd303cfbed619f6a54fb84f4e32bdef215c10898978042fde61aff36f6f12b5ffa7873d8743bff906a0376d81ff1c SHA512 7ec4622d8ec5758d6c217ecfbb775dcb1da24cc6ef6936c83cae00eef513c965af8c18d753ec168197370e1078059fd748005a13860dc8f75b85b6a177813576
+DIST sqlx-0.5.7.crate 88292 BLAKE2B 628e7a75f2b7dc00c9ee7e1f688db3cb20ea65e96313dc7776afa04c502f461af2f00687913318f69504c5a410da0c9aaac4a4d7180aa09779eb1602d2c52a60 SHA512 c8f5b950cd3bc027b2270037fd451b9d0ffb6a5620ce27d1c0503fa51f04005504c4cf0e977feb0b664d6708f50093f4648f17ef9849f04c4b49a37727dccfd4
 DIST sqlx-core-0.5.1.crate 224938 BLAKE2B a5edd0558330df85f1a8eb18ca346e67775504787854ce36af108d39f764ad1322ef016370a8046a3e351887433e68795622b223512fcc6f5790c9dbac4a3d68 SHA512 28630e064a71d465cbb56cc01e117118de08a45834b9065099d187918fdcbbb4b87f83db7400fa9358596e95bb3e4e9c007897d0085c5e65468cc6fcc934120d
 DIST sqlx-core-0.5.5.crate 230417 BLAKE2B e3163d58b1fcb2bb75ba9b6553d4301181ef1f76d15aef74eaa0dafeb92a5753a8445db4e197994401ee15888b80985f88328d06d4521ba257289a183853c240 SHA512 36e2a9ce419ec87e6c4bf4eeac38bafa48fba478730006e24c85dcd6f2dac52058e109a1d6fb2c3033d841076d53530e89f0eaa7a2b2d062705d5de9c3317d8a
+DIST sqlx-core-0.5.7.crate 235686 BLAKE2B 5700bb0cbc362d15c742a5b7bf5b6fff173809ec5a2d1b5bb227e61077096a6cdca7b4ab9dd36eb55481530b41e61e5ed60162f3e345c7c9ad44fa899ca5dc27 SHA512 0c7cb6ef8731258721a4507443049ac9bf68e7b1a53408f649199743eab3cf81440dfc7cd9c3d93ab880021f0cb47e205b5f6bc59caae106c3f50eb638d3e21b
 DIST sqlx-macros-0.5.1.crate 21103 BLAKE2B 4d96592547b407bc43e176060458092e5b9f6686b1c7d961588267dfd3fde52442e64d44506556783d9d23a1a0d27cb53d924909aec20b49077f1df008b6112f SHA512 21996aa6d59e5513d925d3b0641dcf4cd68e331dd946d83da6b88ed6a2554ccb873dad9dcdf28e4c1bd09ad418b10303d218343943fed0c925659ecb949405fd
 DIST sqlx-macros-0.5.5.crate 21235 BLAKE2B d9a33111e737673f7a9752ba50e37acb4a4f14e1ec0555618463234e1c72a0eddca49991522f24b52ed096b43f461bb58c9cfdd9037683dd790bcb8bcb267b31 SHA512 2797b3f94f81967a74535d4a8e068a262e7bdb0ee79a2afb194ce019446f7de5ecaefa271d5808743ae9de36fc7edd6c77198ea76751eacabe248da7907622fc
+DIST sqlx-macros-0.5.7.crate 22059 BLAKE2B c97fcae1e7731744e0f10b29e942923dd07ec0390b0028186935d9d81933b5fc9ac13c8b86cd78be4b92e23a472362346a06fbd16931595b807495634300148b SHA512 e32f530c470e21f6cc3be1834fb8523111af419d9d5cb7878c0ed677973b6956f632ef4e05ada7e4db2ac3c9198a157f5547206692f77cf63ffec786f6ec8236
 DIST sqlx-rt-0.3.0.crate 2405 BLAKE2B 676c496f845f7784614c98e247df334ef712ff39008a116db5283919e70d7b3876ef6401f956425e4a542de9cee1903841ad9aefff52baa6b4887d9bfe503aa9 SHA512 17ccdcde1f3f0897f9e9d849f3539bf83543aee48579549243dc3072f1a3c46189aa214615100b31a313ea387aae01a42dc7400284b30362038f73f13dd14505
 DIST sqlx-rt-0.5.5.crate 2400 BLAKE2B cb4ad93526ee38ac9fa6f0440c10a5ce3e78d7af0b74f8ca012ca60e4564cc514780e46453953349eeda831fd992963e829d52e5cc59adb02b5a0f5c8643ad4e SHA512 ae323bc4b8a7d1f0fa38c4dc092a8d78d077ae7e9e03831f9c2f5f3d5876b10380d01b045915dc3f9982cb2a21468f95c16892e7aea7ee4f310afe97da27db16
+DIST sqlx-rt-0.5.7.crate 2403 BLAKE2B ae05a435591bd56a8ca9ef77e1c70901015e680732292d4d78f941839eece754133e110d6d7720bc77518efbd2d56c773e5f4ca351a9f7a9d30f72d8a58b2ce0 SHA512 37811593eb3b2a3f733ca11678279ea8d261f9dbf14d253c2915a910d0eccb1a62a2dd1d39eab5712b941e7c7911cc47e6013bb0fa311a9e2e5ba7ac594d9507
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST stringprep-0.1.2.crate 22021 BLAKE2B 4e6c18a0bedf594fec1e8d9461c276021dc96680679bc1720a7abe08c061e30683d30d5dc8c7bf0726c6c5a8a892d4dbc5d01e064378f5034e0874d0fa416645 SHA512 2f135bbebebd1bda7fb3fa4f1281ac23387d1ead0f185f13477c84cf5df4b38eb8bc3ed9ee13581540b9ea3f87db6db91b4b38b7bc584f19caf005687791d78c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
@@ -347,8 +404,10 @@ DIST structmeta-0.1.3.crate 8727 BLAKE2B 3c958b96ddfc4b38546038ca639952ea7909104
 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-0.3.23.crate 52029 BLAKE2B ad87f3d2da5a4a972b2ed0dbd49830038ab6b46243561cabcbc06013d7088e7a44acf1a29137af11a53ee8720aa8cd69cd7200a388b0ec626a0c513b6390ce2f SHA512 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
 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 structopt-derive-0.4.16.crate 20996 BLAKE2B 3410095fd88bafba6d08d0aacdca295cf86f4d8f028103934c03cb16da334955c1334039d000ef7eed471eb8020046c56cafb00dbc7713ecc1f76585cdc6f22f SHA512 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
 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
@@ -356,6 +415,7 @@ DIST sxd-xpath-0.4.2.crate 45058 BLAKE2B 93890044d12b545ba3a76ff4bcbeb20bbb56b36
 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 syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
 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
@@ -365,14 +425,18 @@ DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff5
 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-1.0.29.crate 17455 BLAKE2B 7dda520f7227d638f223f039afdc1e8e0ed0000b8657bdfc0bda2694d26a01051d1c9464502721ffecdb4d3a661497757615880222b68928bb44ab5f1c74d909 SHA512 231ebaa6cb2250fcfa608500076a4d930f625acfafd824abc5e654e0b3faace884d83666633bf2bff61ebb9cc60b61faa234ab2719417bb32af4bf62b1241686
 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 thiserror-impl-1.0.29.crate 15201 BLAKE2B f346e746fdb2ce83f2c8e7b58772b54721191470e0b5d771fbdff19f598fb8a1bd94038ab603370e037b751e028c79d85b56dae25a302c91dbcc643ca1d26cae SHA512 edcc1d7cdb7035f9a3667b8f9509e00f70dfd515ba8594cbb0562b8732380a0c1b405a47e7ec4d5fdc5bbe870be69332205f0dd15ff39396cbeacb798483f553
 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-1.4.0.crate 42418 BLAKE2B a5a3c22a9a7e9b356d2cd7c74e27d59eaa8b7a0c7706ff0bffe4f173842d35f8233ea745653d1c76d52b71da4683db00eb0ff5c61a7c9498e2853ce8d0f696c5 SHA512 a77f1cc0cd73875a2e6bf18ab95ce97ddb15f4d1c1ece0b43e242e08bd853bae5a23ae976f4bc928205d2b24dabbf412cb74650c7665cc0c0f499cbcc21660fc
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST tokio-1.11.0.crate 513247 BLAKE2B ad5e295edbaada58ae242d0154a00382d69b56dc0adb805ec680738ed0cff8eb975c21b8dffbcba47087a6b0d26a71689051e57bea36f2983f3f48a7a8e63504 SHA512 056a1660dd5b556c7e7813cbedf074936b79f1c870dcf86fff06c107992814387d3b4ac52aa492a0441e733a007ffa615cb5a5a99e16314f7f5569dce77ac0ef
 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
@@ -389,12 +453,16 @@ DIST tokio-tungstenite-0.14.0.crate 32486 BLAKE2B 510b723ea265898d440b207e31ed6b
 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 tokio-util-0.6.8.crate 74116 BLAKE2B f47f61a1566b721ef5294526f6b0fc08a5662eee2b12def6b699de38e6888e3cb61623a76a52a71843449a5657ce3829bd5fdf2826428e370b6d912320c5863c SHA512 b81ee8086a069de580bb2769145a77d12d3ae2c4d8a689d979c58988c64b221ffeeeb0f159181f92f402011931eda8549ff173b227433d6597492dc7f024b7bd
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
 DIST tracing-0.1.25.crate 68011 BLAKE2B cde3a7835328b8bd04c377108f032a3718d9ec1ca3ee95d43df855af32ebc356d988705c01b64fd5725e8274a6da7bec822f9ff532159d9711c3c4a327bc6d2b SHA512 a9c48aa6abda26d7a7f26a1db3d4ea8b2b72bc69a8d6fcaaae21342bc802b4804a38691969959b1bb5bb7adf7d67380b09dde0196f65b6e49735be79e78385f3
 DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99ce6c4fbb16cb14e618da9c794ee594252cdd7a6d4a7c149a8ea86d63f6e4f1d75ad3bd76590d70af107616eac SHA512 19ddccaebb2d3b2230a6ceda5f72af29200ae760e8d411c2073e7338a6ca2231c8b2b14180eabec78dd521ab7b48996966b0419725adf8c67a03d1775ec834be
+DIST tracing-0.1.27.crate 71332 BLAKE2B 22cfdac33bdb444857d44ede9618e51b1000c4b31bbba6c5be54c30bcf16df22061573f366092b513e985b01987f2cc20102936fae4648f5334d0fb667c41960 SHA512 807b3720d3ddf89744f00f68153a1bb7dbbe808a86647677707065f3e50e812c426c5e04b9916d07af5bb7148fbf95fbe027cd448e182ce910c05da2191b6d6f
 DIST tracing-attributes-0.1.15.crate 20632 BLAKE2B 77e78d3dde799de16610d35f6d30bf15e03e8724ea80302a661fdd958a25574c7d6620f480669917dc94152bf0dd1237310523d881f4971f4a5e837ff26e0da0 SHA512 750836fab24caa68bbd8f19c953a45d2d1bc7adb9fae65b113b8b9bc1cec97b9f6088b15bea3c1c8c7a106345440037c880485e4e4f4d1e5690ca4841ff135a4
+DIST tracing-attributes-0.1.16.crate 21685 BLAKE2B 92543437f79b776d92cb8ce1cec7cc58d991c45a25c9ffaed2de99f646a76971a95d7eb60f69c04b1d8d0fa8583dd2d1feb2b2842bf3ea7b3ae4ad9e4988f506 SHA512 44ebcb45c0b98f9345de807678af6aba1e369ea2c35db63a94c69f90549d7b2aa5909a8641ee0cbe9cf021661618a6b626ade4d5e8e36414c1c3afae0896e393
 DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
 DIST tracing-core-0.1.18.crate 48381 BLAKE2B f175efd5481bbc9e881a36dad6c29eeb4b39400dd117e178d9e7a0e765cfdd3f36abe7e3fc2a537c79c5af544c764a0273a382cae907f5e79b6c140ffd2b9a91 SHA512 a5fddcc04651d05e61c2422d028a399cca260672f7a8e5c072126d9d4e21ef7a38911fca09e32c6da287a0f1cb6d1297d30e0f6fbb951fc190d2a67281a115b7
+DIST tracing-core-0.1.20.crate 50446 BLAKE2B 7c665c7607d4c9f873194d0d8dd37ae84a7ac9ac424b85332669bbd4bac60274f27041199fb67fae6b8153ed09e04fd99e09e239de98846697a46a6c509fe0ec SHA512 bbf9c0802e04bf5e2fd192af7e00b2807319661212e88dae9ef4284886c34fc58ce6e9b17e77522e108b2c38f47357bed220e1832fcc6b464e0bec059b57b388
 DIST tracing-error-0.1.2.crate 11101 BLAKE2B 5f816e759f8128fd67bc039c1c080cb275ed3192ff00774ccbc0c5f955384f7a009be00bc14ed9146251871c51f1d493e6b9c1e30677d5c708005f45c314953d SHA512 f004cf7440d7e2e04d85bf5d617e08395b52a9e5918ad83c706b3e6cc697c8462e96cd754a262ce80d8772ad086a1be5ebbcd6e9c4e311ef28e4ed3bfd7fc262
 DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
@@ -402,16 +470,20 @@ DIST tracing-serde-0.1.2.crate 6362 BLAKE2B 81eaa1f5fd51de57a2e2d7c78c1441513e1d
 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 tracing-subscriber-0.2.22.crate 145219 BLAKE2B 9e85eeda68387c7bd789198da0bb436b78b24e33b100d720038f3a11b24627d39ef303c19f95bb0506b327860b7a8fc2f32ffee2237431c7444970f064c6bcf4 SHA512 2f076b9b5d1634b5cbb6848f291b42ee368221588efac08e9776a040462f9aa4f8d564bc8521c0b696b9129bfd0274896c528e96c1658e3bb6acfe91c1d79474
 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 tungstenite-0.15.0.crate 59529 BLAKE2B 3524ad37070f3b6316402c5ae8bfa86f82030b4525484dd25bba4d8f91220d9768833f543fd0125b65cd23653587234eb2c7b99674975a5f0c03b3d2dbb3b619 SHA512 19f4d331144d1952d928d7e6b331f31a16d8cb7dcfbeb0851559ee26dc6d0f01e4123ec80d99056dbefaf6dbd3c8ad409a3ca0283b72248eb99a0d92503c8f31
 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
+DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST uncased-0.9.6.crate 10413 BLAKE2B 67c9c7da6c706e6e51831453b5c8140568efd046588ec4d972bbf895c191da95ed8d7e5ebd65f6b1ce83544bcaed4dd4f631c002daf7495e2b47eb1a7e8df254 SHA512 8d0f29b60cf800afc92d08fc4d4b92f5ca80c6ad4f38c64c2cff88b959cdb7e59952eda1200c65eae1c379e3e3d55b946a8588c393e60938a776538492af9989
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
+DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
 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
@@ -423,6 +495,7 @@ DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST ureq-2.1.0.crate 78365 BLAKE2B 9f2534051b4b4eff86df79ce4484061cda8da828bfbc2c6dd1721d448289b549dc4823fd807279e019933cad342b929b4143c231c2f74a006a5e012f35559bed SHA512 fa02d4128ad7951a2f46e5c2c336fd09c7b2a502407b04284ead83e174711aece148e1551cecee4a10b542d8b40a31ab12fdbec40f7de426f4b2e3061cf4efd4
 DIST ureq-2.1.1.crate 79196 BLAKE2B 8e2f0e555826e6575d20df003954e5fc2d7b13146afc88731cb0197e39a158147fb7e9fa5e3384e0c665c92e82101f3e8f183642fa03cb93b60e46c1824e0f64 SHA512 74c77ede9ba6485d536fcff9d6880fdf89492d2e9481c26e8520bb350fc03f8ecc982fb45cbb2e44f0579e82fa5a07184e30036efe952c901b68677de09e3234
+DIST ureq-2.2.0.crate 80014 BLAKE2B 1b414f3c7edd673f1598fa471301b218205c7688525bf9fc1d89a83d589761363d11c122c3812c4f70cf09aed1a4830397aa37c9a3091c6bfab84f09c84e51f9 SHA512 55d0b2e7152129cb887e210b52b3301611aba5cf97502d938125b3ecd6f528c69896bd32db61722d9ff493bf2a9a75f721fab1295793f46fe953ab9f398947ab
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST utf-8-0.7.5.crate 6551 BLAKE2B 57c6b05714195c578ad304ec8906f8e0dbaf0383ee2af437a669af783ecadf1b30d38e98707f185ea51f22e620b6e789f21211be542d4137f3110ee485888f8e SHA512 610dba6991597b117f3ec602c2c1df42da3a554bd452283f56867d53f1bdc7c0bac6e593b63ec3186016d886951397314ff7e0cf0bfae8015281a6afe77f19ec
@@ -440,21 +513,29 @@ DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
 DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
+DIST wasm-bindgen-0.2.77.crate 162133 BLAKE2B 5f9470408157d1bdcef693cbbf6728b014159315176e59a48d484014df5d04a5dc7ed501f2b14082f9403944a8870c5afe4968b4205755125646440ca6f98f59 SHA512 22d279c13bb3443f335fed4df753cc08e50fc632a757b499eae63a8a846b1d1567a9041f7360c690372dd38b3e830dcff3e6e27a50ea3258872d87e90e8f2d4e
 DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
 DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
+DIST wasm-bindgen-backend-0.2.77.crate 25608 BLAKE2B 02c680618257f1503728be1e760d3bb9c3d82daf3b96001993c11a301c6e8869edb6e06606068667849bf5f06dc2af30f9f9309881ef12cfba5b0b3bec7e9c58 SHA512 b6beb9f8ee93fdc212ff094392c2062ff7b148682dde417999e33fe8af69752c90ddd99cb1484bf10afc006eb297756870ca78066d8bd682b75e54753efc32b0
 DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
 DIST wasm-bindgen-futures-0.4.24.crate 14759 BLAKE2B 608e230509509508130e955d839cb1cef0b3f4c2ce4b69ec61e6357397b9d476e63b69335510f18289de74d63dd007486b5bb74020b9e79344d4c2bb91db0825 SHA512 a1b2220c7760300fe07937b039eb6dbb86e0110f5600d366a6a365ab74ca7894ff251902a78bf5aa3757cdc55a9de316e24fa26c68bbfda4ecabdc42e273a385
+DIST wasm-bindgen-futures-0.4.27.crate 14775 BLAKE2B e2f87ccfe49870996e04cb6f1c60688bfce7f5cbc4e7a914ebe5d3c89c94d6697a46b4b6007b201a7651b7b6dd97dabc9b23c80a46baea579bba0d9757f6c6c6 SHA512 1aa9d786994382dc0a61cdac70f8890b250ae69b8a16e43e9c53e6d8d515a31da964598790c407b12941f76300f26eef1e32667c0f54ea704f63e39f127182fa
 DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
 DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
+DIST wasm-bindgen-macro-0.2.77.crate 11550 BLAKE2B dca0c9542ac8cd140d27221cb13ed886cd14088b2b893ce4ea9103e5b17ecc7022361b4917fc9424dfd5acc5182810963bea208f31919eab7d9cca240025a020 SHA512 2e0ce89d64654fcf3ab530f5317149a583607124651b55f138564b11a2821e68d7118687dae140160a0d7d7f1a1f83b80876ddc2a79a062959099b0ee8764418
 DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
 DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
+DIST wasm-bindgen-macro-support-0.2.77.crate 17897 BLAKE2B 33f233c1e7ec7e338f6329e4a64df4a996ddd6789c7d97d533549549352386eae34b6b0dd71564a9c69ad38dca9b320ca98eaa3e24c923446b053f9633b4dc17 SHA512 5fa8ad0ab21fb17a25a934d9f96728773d95c243972d4ea9768b6ba2e2a17989575c04d555dc79e55beb50738ab36448e179c76b863c99b986bd3673b230ce92
 DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
 DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
+DIST wasm-bindgen-shared-0.2.77.crate 7247 BLAKE2B 81ef711a4cc585acc064a6862940990e8bb6e2cd86a595f64b70b710be269dd91fa0b42bc94dd4b48fe036be3d7db9d0358c9910c4b4e54ecadf02dcc39b218a SHA512 a19f408503dd86fefa96834702b4165537292491b99411b686e7318a96ec74ebf1812a0d627561355e4a912077756482be35b41c24566fe7225711603d97f092
 DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
 DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
+DIST web-sys-0.3.54.crate 664935 BLAKE2B d8e21a76216be59784ec1df59582f15923aeefb9107aa06b3b7ed8a80a9120f2fcfbc251c4c77d345ec7c4653b43a72e6b052b22f33bb1c28aef14a9837983a8 SHA512 5c516f0ab96707647d2a33b327eb54af538980c1fae701d4f94eebbecb1d7b6f8cd213cfa18ea913eddabb01944ac36041541ab6943e549ac3594e0808d26cc2
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
 DIST webpki-roots-0.21.1.crate 223591 BLAKE2B 9f3a2720a1b65112fbf8661216195598de9da59b0bc028f0666077150b02dd873cd6f7ed820f47877b4a37a1840dcaaddfdce91cce02473ac14d3b864677f332 SHA512 12563743c86a908c9f56c25234e08d810de418d80714bc8d2eb36c8500b5bb02f28f50ba2d53fb162cdce8ab35db0103d9f63f064d44ed8c17523a93418ea72a
 DIST whoami-1.1.2.crate 10583 BLAKE2B 1ec4396cd91b5784d6ee9c5f3c547b0258c98c5799f974e65c3659b17b549730a5e3f7110262796da36eeeedd13bfb2a0e563bdf5a788f7226b8748b1edfd76b SHA512 038f66e1c342952b81306957f960f531eb42ea91266cba013639fd5b3d43a61575c43de30388832d495ce72fcdabd1acc9924c290f44846ad75e7ca7f82c7ffe
+DIST whoami-1.1.3.crate 10565 BLAKE2B 40b83eec544680e51806065f1f1643510594d34ef83361c5ae5bfa1657e2dc4351a2d7502a744f7c3302e81616ef861adcbb144faff267a6cc666fe616f9f383 SHA512 675e8e7586326b2c7311572c8978c441bdf3148cd0e916dcc081ca99197f6f1344687d07ef34867b115743d0150a0b11031f8f01227cbdfe2f9c2ab56bfbf4e9
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -470,4 +551,5 @@ EBUILD nextcloud-notify_push-0.1.7.ebuild 5760 BLAKE2B 9417510443f02ed5809a73274
 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
+EBUILD nextcloud-notify_push-0.2.4.ebuild 5816 BLAKE2B f81ffd23484da46657be53152c531691ed93a32b10ec4400b7eb9b75af8b88f84005f0912561571806b6564d8b4d3b2e3d25104b79b33d2fc9eee82aa7312f1c SHA512 ef081a5a1d619a3ad47db296dbde82e3bc8cd7161b07914caebbd41d6b3ae1d1264fc7184172503a13a937103500f3cc2f9e7083f358d39c65583e2255918367
 MISC metadata.xml 407 BLAKE2B 09e8ff7f59db8683d478d3197f4b465ecfc2272e05e267084acef49c29a33652733282ce28df61b51d628c88c6333c8f2a86afed6aec457909b51e9380bd4438 SHA512 15fae1cdce4e157864413fb30f61a04a2b1aadbebd4ebe164262e0250c6133c86b5aa948f565d5b30a49eee270f7ffe6b7745d38819340887258439fa26cb064
diff --git a/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.4.ebuild b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.4.ebuild
new file mode 100644
index 000000000000..81b432c9fd2e
--- /dev/null
+++ b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.4.ebuild
@@ -0,0 +1,322 @@
+# 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
+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.3.2
+block-buffer-0.9.0
+buf_redux-0.8.4
+bumpalo-3.7.0
+byteorder-1.4.3
+bytes-1.1.0
+cc-1.0.70
+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.1
+cpufeatures-0.2.1
+crc-2.0.0
+crc-catalog-1.1.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.19.3
+fnv-1.0.7
+form_urlencoded-1.0.1
+futures-0.3.17
+futures-channel-0.3.17
+futures-core-0.3.17
+futures-executor-0.3.17
+futures-intrusive-0.4.0
+futures-io-0.3.17
+futures-macro-0.3.17
+futures-sink-0.3.17
+futures-task-0.3.17
+futures-util-0.3.17
+generic-array-0.14.4
+getrandom-0.1.16
+getrandom-0.2.3
+gimli-0.25.0
+glob-0.3.0
+h2-0.3.4
+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.3.1
+http-body-0.4.3
+httparse-1.5.1
+httpdate-1.0.1
+hyper-0.14.12
+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
+itertools-0.10.1
+itoa-0.4.8
+js-sys-0.3.54
+lazy_static-1.4.0
+libc-0.2.101
+libm-0.2.1
+libsqlite3-sys-0.22.2
+lock_api-0.4.5
+log-0.4.14
+logos-0.12.0
+logos-derive-0.12.0
+matchers-0.0.1
+matches-0.1.9
+md-5-0.9.1
+memchr-2.4.1
+mime-0.3.16
+mime_guess-2.0.3
+mini-redis-0.4.1
+minimal-lexical-0.1.3
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+multipart-0.17.1
+nextcloud-config-parser-0.4.2
+nextcloud_appinfo-0.6.0
+nom-7.0.0
+ntapi-0.3.6
+num-bigint-0.3.3
+num-bigint-0.4.2
+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.2
+once_cell-1.8.0
+opaque-debug-0.3.0
+owo-colors-1.3.0
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+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.3.0
+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.29
+quick-error-1.2.3
+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
+redis-0.21.2
+redox_syscall-0.2.10
+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.21
+rustls-0.19.1
+rustversion-1.0.5
+ryu-1.0.5
+safemem-0.3.3
+scoped-tls-1.0.0
+scopeguard-1.1.0
+sct-0.6.1
+semver-0.10.0
+semver-parser-0.7.0
+serde-1.0.130
+serde_derive-1.0.130
+serde_json-1.0.67
+serde_urlencoded-0.7.0
+sha-1-0.9.8
+sha1-0.6.0
+sha2-0.9.8
+sharded-slab-0.1.3
+signal-hook-registry-1.4.0
+simple_asn1-0.5.4
+slab-0.4.4
+smallvec-1.6.1
+socket2-0.4.1
+source-span-2.2.1
+spin-0.5.2
+sqlformat-0.1.8
+sqlx-0.5.7
+sqlx-core-0.5.7
+sqlx-macros-0.5.7
+sqlx-rt-0.5.7
+stringprep-0.1.2
+strsim-0.8.0
+structmeta-0.1.3
+structmeta-derive-0.1.3
+structopt-0.3.23
+structopt-derive-0.4.16
+subtle-2.4.1
+sxd-document-0.3.2
+sxd-xpath-0.4.2
+syn-1.0.76
+synstructure-0.12.5
+tempfile-3.2.0
+termion-1.5.6
+textwrap-0.11.0
+thiserror-1.0.29
+thiserror-impl-1.0.29
+thread_local-1.1.3
+time-0.1.43
+tinyvec-1.4.0
+tinyvec_macros-0.1.0
+tokio-1.11.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.8
+tower-service-0.3.1
+tracing-0.1.27
+tracing-attributes-0.1.16
+tracing-core-0.1.20
+tracing-error-0.1.2
+tracing-futures-0.2.5
+tracing-log-0.1.2
+tracing-serde-0.1.2
+tracing-subscriber-0.2.22
+try-lock-0.2.3
+tungstenite-0.12.0
+tungstenite-0.14.0
+tungstenite-0.15.0
+twoway-0.1.8
+typed-arena-1.7.0
+typenum-1.14.0
+uncased-0.9.6
+unicase-2.6.0
+unicode-bidi-0.3.6
+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.2.0
+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.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+wasm-bindgen-0.2.77
+wasm-bindgen-backend-0.2.77
+wasm-bindgen-futures-0.4.27
+wasm-bindgen-macro-0.2.77
+wasm-bindgen-macro-support-0.2.77
+wasm-bindgen-shared-0.2.77
+web-sys-0.3.54
+webpki-0.21.4
+webpki-roots-0.21.1
+whoami-1.1.3
+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
+xpath_reader-0.5.3
+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/prewikka/Manifest b/www-apps/prewikka/Manifest
index 67cfd3b61ca8..e20089e2b000 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,4 +1,4 @@
 AUX prewikka-5.2.0-fix_siteconfig.patch 331 BLAKE2B 0aa3a6ce4d31067b1ce38976bfa6081527d760f0b5461494c36a9fccedba2fbf8bf44691090fea285d70c6743fa948708c32561beaea80758fc528bfd71b360d SHA512 9d7c48ffa8f225f6927961a94da2d69b011209c1c69fe98efb3d37343f7ad78774ac8d5b1a56b5831605800471117e34ec0ec49309385976a41557c3713702df
 DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
-EBUILD prewikka-5.2.0.ebuild 1381 BLAKE2B 292a983a0ccc08d6bc4fd196032e56fb291d16d03b88fb8a297a1d387490b3f011dc0a46f37620835e0c7330f31681afbaf2afaf7a98d1eb549db7670e61fc8d SHA512 4d1b2cec9b0f25e5a8e81dcd04a3f37961865c3af44f6cd3899313332b9c640b92047b506366ed9ca4f90e1f1102acfe5c71f9068299133c59e13913b6efbbc8
+EBUILD prewikka-5.2.0.ebuild 1365 BLAKE2B 1537eadd7ed99c15679dcae5e8cdde44ea4cc09d9dbdc7030b4c18ec48863dd30e378afbaa3a0ca44ce9e7b81e122572015abdb3bee403c452185c59294c76dc SHA512 907ddbb7cb7759f4fb0a7e5c2a903e145874607b6cbe2fa50787d39d42dc6700192b4cbd1a190eeeb445cd293f754c4794d3abc36a8055c7ed6e30220baa07f1
 MISC metadata.xml 820 BLAKE2B f00528fffcaf1f75e1f9a13e8a15cf27f4edf87b7c1ec7e51c6eeb28eb17f3baf1783f808480f3ef5cedb27d133012c9c1e618893e2a7f1bde608ac8dffdd6d2 SHA512 a579c40f4e00e1e37b8f5b0871c4e9eb79c67a21ce74c55ed15309175411c8bacd43a4e8e250079482898f7b5f66c5bccb5cc6645d15a229ea249cea3b05b449
diff --git a/www-apps/prewikka/prewikka-5.2.0.ebuild b/www-apps/prewikka/prewikka-5.2.0.ebuild
index 592238c984eb..112641e22195 100644
--- a/www-apps/prewikka/prewikka-5.2.0.ebuild
+++ b/www-apps/prewikka/prewikka-5.2.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ssl"
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -48,5 +48,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "Asynchronous DNS" dev-python/twisted[${PYTHON_USEDEP}]
+	optfeature "Asynchronous DNS" dev-python/twisted
 }
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index d86909dafa5c..b33189b1059a 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,6 +3,8 @@ AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d26
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-4.1.2.tar.gz 2719030 BLAKE2B a169d024a76dc0b592a71da55e785152ba1cdb2203a864cff905571f1eae350d77e6955d819c660379e3e7b539664bf77a21f0f91ed5c4299f173221e763859c SHA512 a7ed547e8907d98c16c9d7c775fa3fcdb322d3e4494a1e5467cbc37c9710f04b9d5121fbdd9d8444b2028f7c8a842237ccc9d1b62c066c26bdc150cf408afb3b
-EBUILD redmine-4.1.2.ebuild 6721 BLAKE2B 31b6199982251014d96d7b9b74662cae2b68d735fd6515d587d5276ac56f05c269072e4c75159b9539bfb4ab96ba584274d55aebfcc361b7b79fefa2b5f770d8 SHA512 982db3106881601cfadecb6ef559f62a70d77dafa539e00af17474f7c3332cfd7b58caaad6425a2ac8413af48a474fc0c42f58b18ddcd0c4534d07a87faa564a
-MISC metadata.xml 558 BLAKE2B c68b2cea6f6c996441fc2f1cae3dc7a3c42bdaf156ff223465a4664053ecc0c2e0906cedf9d4b7700dd7d41e758dda31834abc5d8378358360974213063fda33 SHA512 571325be9e8a47f79575f6205109bdedfeafbd31a8aa0d1129491a3909ba2d7c040b0e6062c1c8e016f2f4f6c3724b108d8eeed597861c9a99a97b12a10ba3e4
+DIST redmine-4.1.4.tar.gz 2720709 BLAKE2B 9e0c2b990248c9000fd6062e3928bf4bc8e8043e0d9ceff13d5000da824cde027090121ce3a8be2f5d92eedb97b91629fb8b681ae5e380459fdb97904abd9b98 SHA512 93e46f2ed220c05b83b7bab34327891a7f05a46a01c6cbfc1a5c9bf18613e308d94d84fc3158a8bb7af740b8792448d935bc9d29795ee341bca577c82ac0619b
+DIST redmine-4.2.2.tar.gz 3038398 BLAKE2B 995179b6a5f75548525912dc20b4c0ded8709a12d6eb84873d899b20cf3b83469af7f14713187cce8ec720be4d501a9e7e890e1f38cbe2b118041dc91f555f53 SHA512 71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2
+EBUILD redmine-4.1.4.ebuild 6783 BLAKE2B f38a88860cfb25cb1d8b353feea94b2022508fded695d82b0c3ab1044c539b4929ccb1a9e8b8dcdd29e793c75b78ec76ecd2f839f30fd8726a6259a0441749e4 SHA512 2df24ff810aa0513edd620c8dbe9e222381b896eb63f14abf027aba4f2350691de665b8333efaa53502cfcd026ecd0ca9e433b98bd84440b53b1d6b33658f50a
+EBUILD redmine-4.2.2.ebuild 6974 BLAKE2B 1c0617a830ddfba65b86811fec00d65b90db586b060df715954a1fb25ae069ee9a46a88e836b670a781b6694bee5e972bba304bb46d4e430bb412d9728a912ba SHA512 22439e771ac9fe6c6c943eea48829bd54078c558450165bc292f1d732b0453523d794307715868905753b39331ca151559750564ff8702f0b36c53eaeee98fc5
+MISC metadata.xml 659 BLAKE2B 1598079638eae3152ded1c8129eac0386737c2eb827e3e0d4d16cfa5506acebbb12e51c2084e43d43ff5c3ff220bfde3e7e0d84c4b03502b2f1b593543442d50 SHA512 ac1674ad83f39871d410c338915fba222c6cddf310b62abd7eb3725dba294b1595c291cb8f87debf7e350e67703c7b30ccba223c3b8a7692e916d2a17adb4434
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index c957cd80dda1..c1fdc250a8e9 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -11,6 +11,7 @@
 </maintainer>
 <use>
   <flag name="markdown">Enable support for Markdown</flag>
+  <flag name="minimagick">Enable image processing support via <pkg>dev-ruby/mini_magick</pkg></flag>
   <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/www-apps/redmine/redmine-4.1.2.ebuild b/www-apps/redmine/redmine-4.1.2.ebuild
deleted file mode 100644
index 6225d28927ac..000000000000
--- a/www-apps/redmine/redmine-4.1.2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-inherit depend.apache ruby-ng
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
-
-DEPS="
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( dev-ruby/mini_magick )
-	ldap? ( dev-ruby/ruby-net-ldap )
-	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
-	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
-	passenger? ( www-apache/passenger )
-	postgres? ( >=dev-ruby/pg-1.1.4:1 )
-	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
-	dev-ruby/actionpack-xml_parser:2
-	>=dev-ruby/i18n-1.6.0:1
-	>=dev-ruby/mail-2.7.1
-	dev-ruby/mimemagic
-	>=dev-ruby/mini_mime-1.0.1
-	>=dev-ruby/nokogiri-1.11.0
-	dev-ruby/rails:5.2
-	>=dev-ruby/rbpdf-1.20.0
-	dev-ruby/request_store:0
-	>=dev-ruby/roadie-rails-2.1.0
-	>=dev-ruby/rouge-3.12.0
-	>=dev-ruby/ruby-openid-2.9.2
-	dev-ruby/rack-openid
-"
-
-ruby_add_bdepend "${DEPS}"
-
-RDEPEND="
-	acct-group/redmine
-	acct-user/redmine
-"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-all_ruby_prepare() {
-	rm -fr log files/delete.me .github || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	# newenvd not working here
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# Fixing versions in Gemfile
-	sed -i -e "s/~>/>=/g" Gemfile || die
-	# bug #724464
-	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.4'/" Gemfile || die
-
-	sed -i -e "/csv/d" Gemfile || die
-	sed -i -e "/group :development do/,/end$/d" Gemfile || die
-	sed -i -e "/group :test do/,/end$/d" Gemfile || die
-
-	if ! use imagemagick ; then
-		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
-	fi
-	if ! use ldap ; then
-		# remove ldap stuff module if disabled to avoid #413779
-		use ldap || rm app/models/auth_source_ldap.rb || die
-		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
-	fi
-	if ! use markdown ; then
-		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
-	fi
-	# Additional dependency for Gemfile (#657156)
-	if use fastcgi; then
-		echo "gem 'fcgi'" > Gemfile.local
-	fi
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config.ru" \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT}/${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	# Remove old lock file
-	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
-
-	if [[ ! -e "${EROOT}/${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT}/${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT}/${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT}/${REDMINE_DIR}" || die
-	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache."
-		${RUBY} -S rake tmp:cache:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT}//var/log/redmine/" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-4.1.4.ebuild b/www-apps/redmine/redmine-4.1.4.ebuild
new file mode 100644
index 000000000000..f331ffe6d232
--- /dev/null
+++ b/www-apps/redmine/redmine-4.1.4.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26"
+inherit depend.apache ruby-ng
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
+
+DEPS="
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( dev-ruby/mini_magick )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	passenger? ( www-apache/passenger )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	dev-ruby/csv:3
+	>=dev-ruby/i18n-1.6.0:1
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/marcel
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.11.1
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.20.0
+	dev-ruby/request_store:0
+	>=dev-ruby/roadie-rails-2.1.0
+	>=dev-ruby/rouge-3.12.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
+
+ruby_add_bdepend "${DEPS}"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -fr log files/delete.me .github || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	# newenvd not working here
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# Fixing versions in Gemfile
+	sed -i -e "s/~>/>=/g" Gemfile || die
+
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" Gemfile || die
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
+	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT}/${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
+
+	if [[ ! -e "${EROOT}/${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT}/${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT}/${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT}/${REDMINE_DIR}" || die
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache."
+		${RUBY} -S rake tmp:cache:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine -R "${EROOT}//var/log/redmine/" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-4.2.2.ebuild b/www-apps/redmine/redmine-4.2.2.ebuild
new file mode 100644
index 000000000000..bd3fc3e7a87c
--- /dev/null
+++ b/www-apps/redmine/redmine-4.2.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26"
+inherit depend.apache ruby-ng
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite"
+
+ruby_add_bdepend "
+	fastcgi? ( dev-ruby/fcgi )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	minimagick? ( dev-ruby/mini_magick )
+	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	passenger? ( www-apache/passenger )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	dev-ruby/addressable
+	dev-ruby/csv:3
+	>=dev-ruby/i18n-1.8.2:1
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/marcel
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.11.1
+	dev-ruby/rack-openid
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.20.0
+	>=dev-ruby/request_store-1.5.0:0
+	>=dev-ruby/roadie-rails-2.2.0
+	dev-ruby/rotp
+	>=dev-ruby/rouge-3.26.0
+	dev-ruby/rqrcode
+	>=dev-ruby/ruby-openid-2.9.2
+	>=dev-ruby/rubyzip-2.3.0:2
+"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+	imagemagick? ( media-gfx/imagemagick )
+	pdf? (
+		app-text/ghostscript-gpl
+		media-gfx/imagemagick
+	)
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -fr log files/delete.me .github || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	# newenvd not working here
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# Fixing versions in Gemfile
+	sed -i -e "s/~>/>=/g" Gemfile || die
+
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" Gemfile || die
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
+	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT}/${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
+
+	if [[ ! -e "${EROOT}/${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT}/${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT}/${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT}/${REDMINE_DIR}" || die
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache."
+		${RUBY} -S rake tmp:cache:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine -R "${EROOT}/var/log/redmine/" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 34eec3cdef78..d90b6a1a2e7b 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 57b0ab45a02e..7b4d0642906a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,10 +10,10 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
 DIST chromium-94.0.4606.61.tar.xz 1039880428 BLAKE2B ed6993c9f1352c58bb6f534d1bae96ed379b2114d76f4383c79211589482d12e81df74f4ca057c26c54b47ee9b6ba94012bc9ec7391f510b2820ecac0df5b031 SHA512 e33e1dfdfc2839b2c7481c4cb4482a9456a76d5e2bee066d21dbe8a01c619104191978120a1b87606722d9b9d53333ab2046df80095805b252c41036a11e3c57
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
-DIST chromium-95.0.4638.17.tar.xz 1212354740 BLAKE2B 5f4d65a3c21814cebe10134e73ec6c546beef92a5c3dbfa4798dd42141c0705cabee9f3b11a22c01422cf7e41e197ff7d249d84422728eb5411f691f7029f1ff SHA512 1e730e2855343d86d30a21e2d2cd7687b72f247e9e443c26f91aca3326bb70bacf525f23eea4b047ed441a6134774c1b0d931c601ff8125df226a1caff5989b7
-DIST chromium-96-patchset-1.tar.xz 3812 BLAKE2B 166aaf657b0e390668669d669d8e3a5efc3ab0e8fa9ffe31a376616cfaed8a17bf2afe5b4e338a3e1dcc80d58cbc6810054df36300838f11057625ab2910aaf0 SHA512 26affaf999aa2ed1ab16d8ac09b31163fa91badc03f0542f6f0022925a792029b8799ade9e152ad855d55caa909c3172f3380ab53032d0877337bd26caf30610
-DIST chromium-96.0.4651.0.tar.xz 1217921832 BLAKE2B 5fb3c214bcab050cc6e134afc50deff00458cf74862a494d3eb6095893b96c97a7574543f9a2ce95d3e14eca42e188e9672aec322f11ff7033d26a4b960c3386 SHA512 b8905dc1fad0323b9979a360f92a1daa2f7dff3f8d131564fd86ab2d497e9141875d0fc5d4fad20628972f76979720887856181b9d0c2837ee782446b71c4149
+DIST chromium-95.0.4638.32.tar.xz 1213270600 BLAKE2B 302bf31e0c160b6ee4efdab8e0309ddac46f9e9d7fb164f0be42713803d657e6db766963cec288da210aabbe6326560bf672d6bf5a02ac2f53b511004a427415 SHA512 b00502da09acf4fce71887e7bef1e95d56f4c2b43f2caa39d51efa444741ac460460ff3ae55174acfacd78e3f2d152a6b690b17a784078ed97ed801793e08a91
+DIST chromium-96-patchset-2.tar.xz 4208 BLAKE2B a5b1c9eafb7a6807bc28ba9f6f1136adc73337c7964c22c4a245ab7c622fb9f6daa28eb46292cbc80d5fd8ac827d733f36929e620327d637f8bae60e3e41b27a SHA512 d8b5e94f95e3b57313fa5e132940056f73fb4f0ea922db0b40c6c41f0ee51e0c9043c816b378a9e5bf3a151d4cdf293c6a33c98ab2248b2b9e8109f8b4317bfd
+DIST chromium-96.0.4655.0.tar.xz 1218779336 BLAKE2B ee3bb0dfa7a417ed39d5f33fcac581856c9cd58579b9b24e037cc93998dfba39807a36e690b30a70afe47b2af772e9caa222825354dba3802bc4b2a88e9d79b3 SHA512 cc77db8f028968176cae647897812e765b477664a8f27d7df2b832f378891719244aace2b2a9a7ff3ca43e3898c39665d5f632e14b6c010a45056fc5f8a305e4
 EBUILD chromium-94.0.4606.61.ebuild 29944 BLAKE2B 0dc7ec42cb346c388bc8efe476a37109e8537ddc9fc96b5225066327d5416b9180c8d1c9762dfc848bb634e36633681668f42b589a0bbdb5fccd155b45a56f23 SHA512 0a39fed46c21f2d9d48a2e22765e2541b9a0108c65ead271774e674de70195063da6f64a6613d2a909793d933a6ecf976ac6b0253a09e7bf585e908325e66ff2
-EBUILD chromium-95.0.4638.17.ebuild 30127 BLAKE2B e94711146d28ce2c69a2705f98ef4d9dcccf85a3de733b9bc03acb56fe2721237883975c8bca78aa56e9adbed92fadf3cb1f68dab5963ad7abc3f644ce88b446 SHA512 deeab5582fe4be3c7a209c0ea13841b97f921745a5959fa90d46c8a496f6178f7757a1adb5d39d6f21ddf7722badb0c5a6c69ccd849d69da6cd7de2d6c40d131
-EBUILD chromium-96.0.4651.0.ebuild 30051 BLAKE2B c6f48f035e0db3c8ace8b05c1183b0b7dccf436d64f0f56edca39a9dd18716eac5c4edb270d89a5570e095731d3417024359eb12a8943bf4ad300127bb008546 SHA512 d4b8f08083aad7956f022503bcb645c94758bee2c6a24f736f7aa8a4f377adf429a2e66eb8cb19cf0c129b7c1cc838fd530f8da5d3e08eb7f584fd3cfae72336
+EBUILD chromium-95.0.4638.32.ebuild 30106 BLAKE2B 2ed4ad5cf19ecbe3ce22ea5d2bb3eb31c36830e2b39a3374f84b5eb1493a9406d76d53abb56e9cfe394f49bd308e2c3f10755ee3479fe428f062818ec926439e SHA512 fb908c37a958fe9dbd334048a193e3f05289d5f1924dafd40d351d36e04a26192874b4a5b9281186fe56f9bf5ee24be6a81454318018336342a4576ac3f1b50e
+EBUILD chromium-96.0.4655.0.ebuild 30030 BLAKE2B f11f68bd23001b22730d8d09d774a1c42fc0c59c34e7e8e7a298822cdfbe9ac5f95ae5754a91fb2d2934ed5b6b5e5afbf1bc6ab853707b0b7db6e461809e9029 SHA512 2d1f57162f0a91be132f80620c8317c25300ec1baa8693cb4149715309a3233951df5ec892ea9fbe8e78111d0d55158ec013e999c1afd0ea02ea5a08b6bfee99
 MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
diff --git a/www-client/chromium/chromium-95.0.4638.17.ebuild b/www-client/chromium/chromium-95.0.4638.17.ebuild
deleted file mode 100644
index ec95c0b0bedc..000000000000
--- a/www-client/chromium/chromium-95.0.4638.17.ebuild
+++ /dev/null
@@ -1,950 +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="4"
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	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-95-maldoca-zlib.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.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
-
-	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/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/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		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 system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	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"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true 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_protobuf (bug #525560).
-	# 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=$(usex system-harfbuzz true false)"
-
-	# 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)"
-
-	# 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. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false 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
-	else
-		myconf_gn+=" ozone_platform=\"x11\""
-	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
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	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/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.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
-	doins -r out/Release/MEIPreload
-
-	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-95.0.4638.32.ebuild b/www-client/chromium/chromium-95.0.4638.32.ebuild
new file mode 100644
index 000000000000..15e8a2665309
--- /dev/null
+++ b/www-client/chromium/chromium-95.0.4638.32.ebuild
@@ -0,0 +1,950 @@
+# 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 ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="4"
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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="4G"
+	CHECKREQS_DISK_BUILD="9G"
+	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-95-maldoca-zlib.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.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
+
+	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/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/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		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 system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	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"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true 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_protobuf (bug #525560).
+	# 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=$(usex system-harfbuzz true false)"
+
+	# 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)"
+
+	# 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. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false 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
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
+	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
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	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/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.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
+	doins -r out/Release/MEIPreload
+
+	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-96.0.4651.0.ebuild b/www-client/chromium/chromium-96.0.4651.0.ebuild
deleted file mode 100644
index 909981765699..000000000000
--- a/www-client/chromium/chromium-96.0.4651.0.ebuild
+++ /dev/null
@@ -1,948 +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="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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	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-use-oauth2-client-switches-as-default.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
-
-	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/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/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		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/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 system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	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"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true 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_protobuf (bug #525560).
-	# 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=$(usex system-harfbuzz true false)"
-
-	# 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)"
-
-	# 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. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false 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
-	else
-		myconf_gn+=" ozone_platform=\"x11\""
-	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
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	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/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.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
-	doins -r out/Release/MEIPreload
-
-	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-96.0.4655.0.ebuild b/www-client/chromium/chromium-96.0.4655.0.ebuild
new file mode 100644
index 000000000000..15e18722e200
--- /dev/null
+++ b/www-client/chromium/chromium-96.0.4655.0.ebuild
@@ -0,0 +1,948 @@
+# 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 ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="2"
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +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-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.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="4G"
+	CHECKREQS_DISK_BUILD="9G"
+	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-use-oauth2-client-switches-as-default.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
+
+	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/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/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		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/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 system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	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"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true 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_protobuf (bug #525560).
+	# 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=$(usex system-harfbuzz true false)"
+
+	# 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)"
+
+	# 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. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false 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
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
+	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
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	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/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.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
+	doins -r out/Release/MEIPreload
+
+	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/epiphany/Manifest b/www-client/epiphany/Manifest
index 88fb9c13e56b..41bcdee8ced7 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -2,5 +2,5 @@ AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23
 DIST epiphany-40.2.tar.xz 5372180 BLAKE2B cd75f645980c37b0cdd92133505cf7961168bf5d67ad0bdf3140f155c737a070f7ffafa63bb8a0e5de175826b79b2ca380a2851e7f1f0454d4f372d48f48c9c7 SHA512 29a5b7e65f7e5decb3c370fc9ae654727cce30f397ffd3289a9f77f3527f0471c821e3bea0f1a5ab9c1ab44e670898b46e66e41de5cb8c76fabd23b135a4a1a9
 DIST epiphany-40.3.tar.xz 5379072 BLAKE2B d0b2ecd5db6953261efe6658fe60798b93b6589e1c79032f659a3d69dcf1e2ed77156bf46768c2891916a48f9a28474f8690e451c8631a0455f06d525f9349b5 SHA512 86d896142171f50d0375c4efec370986741d89f341b613c137fb4719ba5359a9e5523e52635c4bcc9ac7acf96f2276486d878d5ed44a57bc1c8124a01af2d30d
 EBUILD epiphany-40.2.ebuild 1945 BLAKE2B 5fa7e097a85e8d4d0a1be45e48a98fa1c43d52a1c9e49dbbdf6de4712bf6442a3c9d8f8c50fce9f1573f276fa73c020bd66ce4d8546072249c28faace04fddc4 SHA512 6745e1cd14815143d0a35592df92d7c51c908f4d24e988e0b5b19cc495bc038996584969cb74a3d2d9fc375ed72d4ebce9115634482ce7eec4137d278462ee0c
-EBUILD epiphany-40.3.ebuild 1917 BLAKE2B c565e3daf3c8c7d0abd0f82c9d603b563b72736264b8296660afcd056a95f4505ecc087c64551b49cab1ace761bd45445d7e3830edc7e572c6d0fe5d4e98a968 SHA512 ebaf5ffc34b976e0dfc160e41b5e1bab84eb6546d6a1bd512f55187e5d3e4dcc92fe29be1ff26c1015c65b994916527966e8b820cb26499a250789daa5bc834e
+EBUILD epiphany-40.3.ebuild 1924 BLAKE2B 1bd138803b301a577c6e85f6cc894bbdf7e82ed5745c7356f13910b497e1c1ff609bd52a7bac144aa657db72105a130a16e7a8200a7728e02c00f1135e3f4662 SHA512 6c3dba420833b3594dc67dca82bc308fa9642d6c5647bb9ee6b09946d81a2d10e18e103e972796a99cbceedb77766710c0e856667ace34353a9b6e71635dfc5f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-40.3.ebuild b/www-client/epiphany/epiphany-40.3.ebuild
index 71d0a74577ca..8b06f903df9e 100644
--- a/www-client/epiphany/epiphany-40.3.ebuild
+++ b/www-client/epiphany/epiphany-40.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64.0:2
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 6a5e7dfa0ddb..061e408a405b 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_95.0.4638.17-1_amd64.deb 89846788 BLAKE2B 22be2ba9f2e7e307f4a6f1076faf2c138481c1b26619f3704a03adb960c4e5b861ae197d6ac100cf09e84ab671be3aece42fe910e4763ee3291dbf915acdb78f SHA512 c1a131ba53e170b3603cc5160489e527393928a9b6fc4d5c20001fbcb10c0d97e3b64365169c2d9b507fdc24a06993105e65e696a8bf6525b5abda5f93033d53
-EBUILD google-chrome-beta-95.0.4638.17.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
+DIST google-chrome-beta_95.0.4638.32-1_amd64.deb 89580228 BLAKE2B 8d6f1eeeae1f109a59bf859e7b3ef7099997973abc12c9eb16be88006eca97c69db0cf525bb614f2ef35ecbdeceb7cac5f3ca9f7234f359bf6825eb6a4fa4363 SHA512 0c659b1e97c7cd1cd79547c5697a12decaefa22a9fa8f5c994d71e07af2d812e578f38d2f9e09b572a8643988ebbb92e6504dbdf5eb275db460e84fe59a28d1b
+EBUILD google-chrome-beta-95.0.4638.32.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.17.ebuild b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.17.ebuild
deleted file mode 100644
index c92f2d8d73a3..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.17.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-95.0.4638.32.ebuild b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.32.ebuild
new file mode 100644
index 000000000000..56dba81cca90
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.32.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 329c4acbe4dc..7b46e969e3e0 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_96.0.4651.0-1_amd64.deb 88841160 BLAKE2B 4ee01a3187d4092009e24cb2d7f585eb4bf87eddfde7bf32c9b9bfb4e05a5120fc2f29db749ea3b9758f903b1c1c407187bb39a4cc650ee421f30ca3c6418613 SHA512 c3b5aa6d27d38f67bb509724814cef389418c808edf831465095c3e4b2de36c669db894251c3769e4da1b0430ce78152bb1c504a36ff90dc4c78b7df05944e2a
-EBUILD google-chrome-unstable-96.0.4651.0.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
+DIST google-chrome-unstable_96.0.4655.0-1_amd64.deb 89354896 BLAKE2B 69b2e65712351b3b7835005eb975dc5ededb09a5172efd8f0de75ec7f0c781513d6af6014f90fa03ae8c7ae3ea4ab1299b8a9ee4ef61feeba7d26b9f64c1f379 SHA512 fae22eb0cb6b1e52cbc12f9d18fb2733da9efa53c7b8fbd3a71132766c0be9c341522aacb4853b9317f01e11e216dc8c4b970ae70a606149122a0eba95f5d165
+EBUILD google-chrome-unstable-96.0.4655.0.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4651.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4651.0.ebuild
deleted file mode 100644
index c92f2d8d73a3..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4651.0.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-96.0.4655.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild
new file mode 100644
index 000000000000..56dba81cca90
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 3527fa7c663d..c04b8da9cdde 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_94.0.4606.61-1_amd64.deb 90287596 BLAKE2B 0ac80477a3248ce2aaff59855e10542364e50e8baf80a52cb4e3ffa900bb369a22eae73d659d1f87f93b9f19deb6630fc2b9eb1185b851cb0ec1193d8b77246f SHA512 1a596bf6941688b13d1e74d1ee7c8676fad1f79f8224526dd7372c5bc3cb7c96cff3267b4b812f81ca114eb3acac6dd6e5576b536e0bd8cfee8263aa7a91e3a8
-EBUILD google-chrome-94.0.4606.61.ebuild 2714 BLAKE2B a3c37c76fecee2863e95ddebdfdd53ce34a915b86c1a4d3a618b10a09ee6f42986b0841ffaa69477a5763d83b1e287f1517bcdd98c2d67fcbe63b54b46b14274 SHA512 0aa9b731fe43bac9130de79e2c1e94111986ca7ce63878a94b2265cded219146c3f2be13bb458a148f7cb4773ae89aa502f2bb5e9165b49fc89ca9bdd1b7a468
+DIST google-chrome-stable_94.0.4606.71-1_amd64.deb 90273096 BLAKE2B aea33d4b2ead51d71b85139ba6581eb75e31cb1723e7047a96390246c91e346e12142476f227379f182cf03a8e1154fc00678a494e3578e46063d9cb7ea1a43e SHA512 d86e208730f1ff4b7ad4c831d79021930209454ba1fcb1a1142c4c9ea469be2bc91d2517e80b3547ebb737d9ed48a4cd23431864b0587508b0d2df0e87a25773
+EBUILD google-chrome-94.0.4606.71.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-94.0.4606.61.ebuild b/www-client/google-chrome/google-chrome-94.0.4606.61.ebuild
deleted file mode 100644
index f2955d88a367..000000000000
--- a/www-client/google-chrome/google-chrome-94.0.4606.61.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/google-chrome-94.0.4606.71.ebuild b/www-client/google-chrome/google-chrome-94.0.4606.71.ebuild
new file mode 100644
index 000000000000..dbce15cdcf9c
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-94.0.4606.71.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 2292180038f7..b20845ae42ce 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_94.0.992.23-1_amd64.deb 115135864 BLAKE2B 18328b01f282cd78f4997c7ec893c3e2e1d40a808f0d17e81285be916813207b7d1a31918603f9e04ef2c3aae90eecd5be09f92e0f81d08378dd61009228918f SHA512 7971de51d214a0ff769c31490ef287be3a4865f2edb7c542a1194fdc50220d44c017b3a4215bd69e1301e9c2d217686e05ad698f9841ea6963d8f1b4dd23536b
 DIST microsoft-edge-beta_94.0.992.30-1_amd64.deb 115094820 BLAKE2B dbddc2268b77e0ad8dae82f036fef6db41412a7cbd61b6415c6340a68d074c6e7da5d4a29145a292bfe92a0f4d71cde2031fe72b800f3ee428293b75ff7ddf7c SHA512 cb32641a07aa96ef5c6839b865dd10eb70c8f707b59ef7a9badb86330a84047d4afd93e55d8aa3bc50b31f8462609bccaf9a6590b04695dba1fe16ae8b9c9391
 DIST microsoft-edge-beta_94.0.992.31-1_amd64.deb 115045128 BLAKE2B c8e8475cf6608c548070af7e94920165c885c791671136884ceaf084043919a7f6d4b898cdedcd2b3fe1220f9aaa2a85e11110b4a0330712494fa875248ffce0 SHA512 ce68a505d220b4a5e1a5a6942d3501737747e8ee1c6b9a01b2a94de75406bc6ba2bfe361ebfb728ab6db16fb53b656a8ea0e089d9a141c29dc7ab43477cc9920
-EBUILD microsoft-edge-beta-94.0.992.23.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-beta_95.0.1020.9-1_amd64.deb 115261788 BLAKE2B afa7ef4d5a40cf12d7f4c16e525cbdc56ac64a0298ecd64ddea8044dddf11b5ae61936e39dc04f2bd09012b04d50fb40fe2f212d714dc35e8ea590524be7078d SHA512 4dcf0963b174b38bdffc80e7aa8dcb02caf909369ba5803d206b9bfd55087f29d75716f669dd14bd9bd4021eb14673631a6e9e9e5b91abbb526f0b30c5c35f5c
 EBUILD microsoft-edge-beta-94.0.992.30.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-beta-94.0.992.31.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-beta-95.0.1020.9.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.23.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.23.ebuild
deleted file mode 100644
index 3b1abf5f25da..000000000000
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.23.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-beta/microsoft-edge-beta-95.0.1020.9.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild
new file mode 100644
index 000000000000..a14f69804a04
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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/Manifest b/www-client/microsoft-edge-dev/Manifest
index 5ad14a77613e..109e7ec154d3 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_95.0.1011.1-1_amd64.deb 115948988 BLAKE2B fbae0ca4805bc18529c43fdab645fe4065c0af66be4afeb012d2282e7dc3103b5dafcc29e53a41804768425b189857722eea89bfb665c20d8df61d01f549e341 SHA512 ce27882236671a94ef4926595f7283a69281a06d236dfd4a9e5b4b4acbd6f4c21b4d808c96de595a12d64c5858bf42a85f40933a4640f0ae902b1840b859a3b7
 DIST microsoft-edge-dev_95.0.1020.0-1_amd64.deb 115147332 BLAKE2B 62d7990cf6a3aca5d955afd45b6c7bf2f0531c3f05aee2959f3498d6405444ad0e557453a38991ad98108fd09a54133e497686b077412a274dbe5759f7dbcd2a SHA512 fa58419cbfb9068321a586e26c6af5c8351734f737cbff58a97c5b2f072839b515208eb9388f85c752de043e09bfa960edfd069a46fff6d230119b015171d295
 DIST microsoft-edge-dev_95.0.1020.5-1_amd64.deb 115316476 BLAKE2B 5e99b0d43e5c7cbf7ce5ba1ee2d2a4c1dd7c60e0575d3c8c1c9d1506d339774ca832aaa2d69993c61c379654863230853fd414a96f1c1431af94a9d0ad11f785 SHA512 a565da7f78195410553145cfb6dff5ee32f62dfbe3f9522815dce64a6620aeb686c6acca43079fea3ac7febacbab82461df5c1b98fe4f9cf7df51936e2043df0
-EBUILD microsoft-edge-dev-95.0.1011.1.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-dev_96.0.1028.0-1_amd64.deb 115444532 BLAKE2B 13a1d6b04dc410fc54a9381daaeb173a4b4d3e3e923b0a7bd8ae06d240965757e5a3a7bb76fc6c4218ef11cc169bccdebe81ddb4fb840d12524614b307d52107 SHA512 18e3f34515ac5040097616e623386bf574a378d57d96e24e03759193e9fb03ef6fb57560138566834a5c99f494f08b7264836d466ce9d3552f78938791c97b00
 EBUILD microsoft-edge-dev-95.0.1020.0.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-dev-95.0.1020.5.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+EBUILD microsoft-edge-dev-96.0.1028.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1011.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1011.1.ebuild
deleted file mode 100644
index 3b1abf5f25da..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1011.1.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-96.0.1028.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild
new file mode 100644
index 000000000000..a14f69804a04
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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/midori/Manifest b/www-client/midori/Manifest
index 272eac8f33d1..637b26b57027 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,3 @@
 DIST midori-v9.0.tar.gz 1902467 BLAKE2B 0a6b46bddd0286c56d3f30b429dc46f90177931f8c596912183ed990124b831b5407807e2693e3b5e0d02074386b46e98823b33f6e785963b9507742bac58763 SHA512 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3
-EBUILD midori-9.0.ebuild 1285 BLAKE2B 0e9a3e09a5cb3ef98c69f9914353747c979badffdca774d49fd2f530d25941ca1643a2a985fb43949e64ba1e03e4ffe022f0684ee5de5c305371bafe325779fb SHA512 f87427d8a8369ce7468f2703b3a4808795d5892e512f1779ef75853668b21eb8d7be6572d8f331d1bbd843bc4cb03ed9cd8d98632cb6b94f602fe2ee14a03f6f
+EBUILD midori-9.0.ebuild 1292 BLAKE2B a43accdbee271948925c943b9e1fcbd9448702c28a77f478e3776e5dfd4d8c791b95e0ea11e2c98ff61f4717b764bc6210f53020533671962fa5ba2f6e6e83c1 SHA512 506bfc5b3f1075da3fbb138f563fee3c8a570a020f2416d811bf2621d60d451fdaea440f793a65aa07126421b02645988030855eb185a5e577374f18d27145c8
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
index 75a58cf254d0..ffc74fa3d240 100644
--- a/www-client/midori/midori-9.0.ebuild
+++ b/www-client/midori/midori-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
+KEYWORDS="amd64 ~arm ~mips ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 89b9050699e5..94e83ae10751 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,8 @@
-DIST opera-beta_79.0.4143.19_amd64.deb 77588480 BLAKE2B d55e0621fc26d4de8708da8084a43cd2d4893a5273d1420f09fa2e37e4a2bda5242aadcdc7a3f8b965b167d22852ededde3e60d69f906ebd6bbbba1fda6d0abb SHA512 9f75b8d66977eddeb50474115f8d11f61eee8235c98b1e28dcb95ad4c295fc340237d0ad1a3e64e73c84dbe7003618dd10a9c2ec39884a1d34199e3c9715d83a
+DIST opera-beta_80.0.4170.11_amd64.deb 80002328 BLAKE2B 735ec69af328e8c79b65a46dca486c34ac290256ecc17283b8bee41bb5acb3d8e32facf73ea57f11d342ce2914b07c863773028cbcdfbee80c1e23c1e8c4bb5a SHA512 dd4729e16aa3078b932ab96b3e568032e68e0e6be2988827f68b0ff59796eb3b931d2629cecb5262dc6287b5ba2259e13e31394c4deecbef52f71fb4fc36ada1
 DIST opera-beta_80.0.4170.4_amd64.deb 80037964 BLAKE2B 040be729ef754438a793abca7ee448ab6eefa5929c75f09f8881a5a646efd4a301d27db35d3c02a54d2064c86e1279050dcc02c30af70de5b64bfe937ac07767 SHA512 00461d53d59ea3d5f0a5dabe7c70fa0e6e38d04fcd7e28106c1d6463ef75e9f1f2a501245e5eb603e3638cf38ee2b8055155802ae6ed05f993bb75d5b13c1968
 DIST opera-beta_80.0.4170.7_amd64.deb 80013760 BLAKE2B 8490351b1eaf05dea8d058074ef28dba00927805da669d958351893b28a54f560b21446f840db60553f32d5f2cfa4180374543ea8e1359f66495107270ebc980 SHA512 fdeeb2ea94429bc8aae0cdf5c59993fdc8b024e56e8ec58ed04a9dcebe3d7c1028b7b9fe4f51898354bb797fa9594cfccf64b3dcdd548c78f3567c9d02ebfcc2
-DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-beta-79.0.4143.19.ebuild 3620 BLAKE2B d2e68ce6aa72a2c2b2f55f67d5d4594fc97e0982b8047900cc6a21f388c0a364975182f6e9f7fe1168d7205ac18924b0537f5017280a946028ba47353c20775c SHA512 06be214ec536e3b5d55d052eae1e83e1523bf249f885ba6f1f67207d7d925cb7fd68f28426c4c1a5942c30171131f00d338b084b9a4a9d12c4d50a51742582a0
+EBUILD opera-beta-80.0.4170.11.ebuild 3611 BLAKE2B 42a56e953f11106cd28e9b88ba0cec6e31e831523ced7ea1fde9dba991b11d89ff98e59f4c5c45171c83d7c6ac2f003bbb65267ebc4038edd47721226999c387 SHA512 5b85ad1843fcfa711979928aa750e6322912aee18cf9b57a4bf2184d16a59eaf7cf8918b0d5e2eb1d92102f99543f0c1dfc4b85c0a49f821859331e56ec2081a
 EBUILD opera-beta-80.0.4170.4.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 EBUILD opera-beta-80.0.4170.7.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-79.0.4143.19.ebuild b/www-client/opera-beta/opera-beta-79.0.4143.19.ebuild
deleted file mode 100644
index d85e8c828656..000000000000
--- a/www-client/opera-beta/opera-beta-79.0.4143.19.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	OPERA_UNPACKER="rpm"
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	OPERA_UNPACKER="unpacker"
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-inherit chromium-2 multilib pax-utils ${OPERA_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.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+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
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		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
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-beta/opera-beta-80.0.4170.11.ebuild b/www-client/opera-beta/opera-beta-80.0.4170.11.ebuild
new file mode 100644
index 000000000000..c2107b1fd880
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-80.0.4170.11.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 pax-utils ${OPERA_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="94.0.4603.0"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
+	proprietary-codecs? (
+		mirror+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
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		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
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index d228d92ae61a..3993152dbcfa 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,8 @@
-DIST opera-developer_80.0.4162.0_amd64.deb 79608536 BLAKE2B 23900af1f692c650b71cfe3f4f1b94c5e9ef9c8f161657596763e5bb75b1a1ad0c1fa98cd95002e73831661800f512527ca7bef6452fba83fea82f27c6b82552 SHA512 79a365ca877826ae795e7bd05b3fcc8478fd45048cb0831d7a03de1545632eaf8c9210f0fd908670ec4306c173cfc91e2cb299afa5aa159f3632aeac06f8213a
 DIST opera-developer_80.0.4170.0_amd64.rpm 76951444 BLAKE2B d8ac71a974641f8c40af38c4c115cec90ad8e3aa65952fdd3e6a3af3588a8b85813337231c2c86e902a96f5ef23523f1d53a44296f32f6f011abdbc68bf46102 SHA512 5bd6e42e9e6fd84f77e2dd7d566d536385d989f68c5bc0b1470847414e4efe0b75e4207b0ad0c00a8c72fa1f4eceed84b1bc54ae3e889b83cc0aeded54edd5b2
 DIST opera-developer_81.0.4175.0_amd64.rpm 77215724 BLAKE2B 6f3b0331923438789c6f8c4b0cbefdfe7bbc4dc219dad040e23049102b8cc3089f2dadde6f63c175fd4f5086ce610d4700608a61bb93efbcf33f4a0067ee3ece SHA512 6af3846beeff70672287ae142b5b85a7d353607c48000ed9b052d9e7b17c9e28f1ba54d6f030addeb8166d40be2a1165fe96e40ef2641f5764adaacb9c9f8db6
+DIST opera-developer_81.0.4189.0_amd64.rpm 76325920 BLAKE2B 4f43c91e6e34065f637f2c93096ee484e4d9e366c15ce720877b82eaa3fe8860ace8d1497f6dbd9783621573d46517cde35b7ee17bee5da3ac70b9a1ced4ad05 SHA512 b23d957f5c314f59205b6d487fb2c2848d18542ed36ffd6bc8a76f148d3d223174b8a080f029caae547901e5b3eb4b4fc39495e2ca40d7eb37d3f3533f7d47cf
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-developer-80.0.4162.0.ebuild 3620 BLAKE2B 80ea5a14b3daae17dbdff93b6759c578914c68e0048dfe68a8f67472f66e2399dacc8d06f93592bf6907dfb5e2c4f636fe131ef65401cc74f1742cc2924a539d SHA512 ee4153d867272cdfbd9add330baa09520df6ecea6c0a60891255b002b263bf0677a8ea987a8b3332971d2b71218bf28add2d100be2b68064ca5c7d24c2d2f49f
 EBUILD opera-developer-80.0.4170.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
 EBUILD opera-developer-81.0.4175.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
+EBUILD opera-developer-81.0.4189.0.ebuild 3621 BLAKE2B e6b43da7a4b47a97dfa6696bb0f503a308afc18745baf217f22e54f079f3bdd25264a544edba1ecbdde30917ddfb7bca1b3742197c0396467757dd28829ea594 SHA512 59567f04f693831906e66d5c5e42a64de04b9c386920aea58da987f7db847219d6f8b42253bbfdc2ad28a768247cf9acaae8f409f154bf511dde2fe7e4275953
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild b/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild
deleted file mode 100644
index bf0853a5f751..000000000000
--- a/www-client/opera-developer/opera-developer-80.0.4162.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	OPERA_UNPACKER="rpm"
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	OPERA_UNPACKER="unpacker"
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-inherit chromium-2 multilib pax-utils ${OPERA_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="94.0.4603.0"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+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
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		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
-	fi
-
-	# 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-81.0.4189.0.ebuild b/www-client/opera-developer/opera-developer-81.0.4189.0.ebuild
new file mode 100644
index 000000000000..705285545fdc
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-81.0.4189.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=yes}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 multilib pax-utils ${OPERA_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="94.0.4603.0"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
+	proprietary-codecs? (
+		mirror+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
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		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
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index b2499204d647..bf2454f94e35 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
-DIST opera-stable_79.0.4143.50_amd64.deb 77519244 BLAKE2B db1d241ba5c1a793428cc2af7229ada3e57bff96c27a186977c894260e4d9d2fc2da58c4b42528a7403d9ecacc25a22ccfeb015674b8272710f581e14d6eaed8 SHA512 8ab2d8ad7bc1dacc9d80208d255a8a44e24563fe1939316734c0fca0a58062b949614833bb63a29cc63febf23a717d50ff68929a83d77766ac2e43a89b170798
-EBUILD opera-79.0.4143.50.ebuild 3619 BLAKE2B f98165d607c674be96a0d2263fbd99deafa4af65e9c012c12140bc08ab508e0146b3ce4fd4a7d772f28280afe6928dfa14f1f24e71ee0614ef4b263eeb2f4ce0 SHA512 08a40d9c2907f9ae3b705dfb6d127b6d63838afde2f04bb0ba83d6539cc9d06793017317e5115aa38b8968c898c672b1a1996eaad9415c178dd5821e017093ca
+DIST opera-stable_79.0.4143.72_amd64.deb 77563024 BLAKE2B cdcfefd1e8ee3e23b8300d405a70f5f73bcb42e766369bad5ff91d82b5968602e9327e9ef03f18f171e15efa39b93e36061f80b23ddd045c61f3565f2f8a81b5 SHA512 37739396d3180973f1999001cbc3cf1e4d3caf9449961b6afc77b2366e9b6a63cc208423c3acbcb1ba1d0811ee2e9518752a3bd631e36a5f98edc7bb22ed7696
+EBUILD opera-79.0.4143.72.ebuild 3610 BLAKE2B f8058e2b7cf1b164325e2581c83da96050b9a4ae4aa1b82e2e54427837e68b662bce349d52a6cc86d0dddfcb56adad186447b2d7276ab851cd9d7b5c72ec744d SHA512 d73314c17cb2788dbb6c303e69638637d240725cfe9ed514959f7938749f68bd5324533e8d1a5412b3b64e4908abd42c751cf190ba86224c617acf247591766d
 MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/opera-79.0.4143.50.ebuild b/www-client/opera/opera-79.0.4143.50.ebuild
deleted file mode 100644
index 632893a0d6f2..000000000000
--- a/www-client/opera/opera-79.0.4143.50.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	OPERA_UNPACKER="rpm"
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	OPERA_UNPACKER="unpacker"
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-inherit chromium-2 multilib pax-utils ${OPERA_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.${OPERA_ARCHIVE_EXT}}
-	proprietary-codecs? (
-		mirror+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
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		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
-	fi
-
-	# 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/opera-79.0.4143.72.ebuild b/www-client/opera/opera-79.0.4143.72.ebuild
new file mode 100644
index 000000000000..28c4c0360979
--- /dev/null
+++ b/www-client/opera/opera-79.0.4143.72.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	OPERA_UNPACKER="rpm"
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	OPERA_UNPACKER="unpacker"
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+inherit chromium-2 pax-utils ${OPERA_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.${OPERA_ARCHIVE_EXT}}
+	proprietary-codecs? (
+		mirror+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
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		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
+	fi
+
+	# 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/pybugz/Manifest b/www-client/pybugz/Manifest
index aaf607f536d4..f751742d754b 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13-r1.ebuild 988 BLAKE2B 784c24798d5d45a6f3a41e3556957b44b6a3a49b0c461fbfa2c49ea133acea7b5ff712098ee499853430610218f5cd0f4daf1dd460d92d9cfc1446bace94f2ca SHA512 b48eb371d1a6b64fa04e6bedecd3d4c3f4369400cd383ce168a9233e061b449179918af12dc363b90c065fab487ce95de41de8e034d93cdcf9fa533431669076
+EBUILD pybugz-0.13-r1.ebuild 995 BLAKE2B 8b971943dc334afe9c755981295e6e138a065a946e79a5e9d873865221114590f9bb7a9be35983af28e56281a16b6064bca915e65f310d5e3e86f8f6824fb6cc SHA512 978648b636100f80127222bfa2c124d3e0c58675d01ca0b430d8ce436b00e64f928fb8d8fd2baad1e15cc9394303ab9bbcabadec96696ebaf6ad09b81cb05eb7
 EBUILD pybugz-9999.ebuild 990 BLAKE2B 17d724beb858ade1a2909f51494ef18aff5b17884ccad430a246504831376c2f403e2ea362d631aa2c955701df25c05a5ebbb0c06e4b05cb0503e668d2f4b420 SHA512 d1e20b7f25c5bf60a16781f494103f569fe0fc9d2af9e11f322e7ee4ae942b6b2022443bb9d3b075edb0d0f91f3b951de1bdef6e29b4906eaeeb9cc7c7e9b781
 MISC metadata.xml 308 BLAKE2B bfc1cff927d620d35217d2339fc84192107c306a07f413078371f92e588679ae33d68f211601737cb50b177a1bdedc3cb5c2a92d08d4c83799aa4482ff797234 SHA512 30fbb7b65f76ff9ca76a593ac635e20d9115128ce9acf10b769bbf46f34e81ba857f068c729743e6565e3164d7e33de994003c15c34d5402a0ec47a254fa609e
diff --git a/www-client/pybugz/pybugz-0.13-r1.ebuild b/www-client/pybugz/pybugz-0.13-r1.ebuild
index bdd2da64a75c..9b656c02fba0 100644
--- a/www-client/pybugz/pybugz-0.13-r1.ebuild
+++ b/www-client/pybugz/pybugz-0.13-r1.ebuild
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/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 ~sparc-solaris ~sparc64-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 ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 20f7af88c8bc..e9f32b9255b4 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -6,9 +6,12 @@ DIST seamonkey-2.53.8.1-rust-1.45.0.patch.xz 12256 BLAKE2B b311b69ee11a5875beca4
 DIST seamonkey-2.53.8.1.source-l10n.tar.xz 13542220 BLAKE2B 8b043136595e481077e60cf202ae66d04ad30f089e842f6d4660807cdaf086b99c9252afccf8a6302558f4a1ce38e8e59f72ade6f72929335b0bf7bce72b4569 SHA512 047defbfac18f360ad089d90de3c0e139d3707dcfa74570fcfa1f2f1e789ca2930d08ee0c94f7d88cc79f4e162eda2d0073493656528e0f9b579f452fe13ad8f
 DIST seamonkey-2.53.8.1.source.tar.xz 283254760 BLAKE2B b078e0333a992b5b6fc9b3966528cc8201ea2c3fddfff8584d3ae9fa5e4b3b7b8abd25dc85dc9fb5ce60b55efcc1692dc56490f520a3b486dca7e873689f0f26 SHA512 1e3eb8686b3b04bfc95f0229c71df7e6ffe085e3ba0bf043c6714789b08e701ede1e288c47df238fa3c5d5979efffe7a9b73b04a32a85f04259ce2c77937a366
 DIST seamonkey-2.53.8_beta1-patches-01.tar.xz 43208 BLAKE2B 947b8131810f3f9855e1e8ff45d841e05dde9dc8c1d1204b1a3d55a743c2c7f9b23b251460d6743ca760edc4609eb08c1df3b165acc56af95e5ecb3c871fec3a SHA512 8196be87112926de0becf272bf44c1ce5522579d4b66f93f455cc0e503c4c3bb96fba5ec48a73e0d53ad9683820cb167e677bbf2497fe266e93d154c8d4a7837
+DIST seamonkey-2.53.9.1.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
+DIST seamonkey-2.53.9.1.source.tar.xz 285481656 BLAKE2B c96107de40c83515fff49d4bf409a13f3a712daf19b466044d6eff244159ebe6d37b7dfc16e6dc0676be344378e9838f7c1d055064bc63ba36a92844e54bfd33 SHA512 67c0645a2b8c4ddafc148da80166d6cff9ceafbeee0683fc4099e69720c4bb725a4165643db37abf0a0545e170e30e811eb0ad198f5c7cd4196294624b86775f
 DIST seamonkey-2.53.9.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
 DIST seamonkey-2.53.9.source.tar.xz 285118824 BLAKE2B 524e51ca00e36658787aa734dd775ef009ef6d4dfd6917f00ebc8d4ec4ecb72c61a50dc33c89fabe2e65e4b95086645db9e26ef12776574f47d3928a42af100b SHA512 17f7009f2b5a1f337c24f98e2bfac2b63498f6e5b5080cbfc1c541ee60fa07f5116b76b7f20f2fc4e000b8c38c4558c7c9ef10abbdfec52dd597bc25d5a952f4
 DIST seamonkey-2.53.9_beta1-patches-01.tar.xz 43328 BLAKE2B 66869b0ebb3259da19148473311b00cb2b2ca762f6ae7003b5374c51f53e6d58fecdf00084d9c43c62023b14666b08efa6138fb28642cc11272851d799f8d0ad SHA512 38b8759da9230d745ab5c8cf1f3964762893e88174f20f3a0458a3196297845fb0876bdb330fac21a24a2661c2b319c8bfb0a7d6e8e47048ced1955500291638
 EBUILD seamonkey-2.53.8.1.ebuild 16934 BLAKE2B a2135f9da2d222e348069e7ac8430dc0e7addd7abe3bc004b930258b28c606d2de1842a2cc8401c5f45904d5fb9b0efa8baf88db4ac14869a1334626e5c02c20 SHA512 121b6c5b8abd1db2d1b0f51832982d93f6ad2ac9812d6287edddb39314f17dd874396ae6a377cc9dc3b9612543daa5b1bccb37a88b094d5ea0d770763c78a211
+EBUILD seamonkey-2.53.9.1.ebuild 16865 BLAKE2B 322e2a5fd063719b1c42d0d1fc07f2e5a6b83b577b3d6f1274dab319c8a32c529521d0912ddb05b01544b96c2abb6ee985e6f8ef6061e3cb2f66a7bbf690dca6 SHA512 5878b32b4291ca8f25791522a882f59a40be7f5432a8885c9503e2d2947db814346e933a0812a0b4b267b85ca1f6281e42cad89242fe3d456dc5bf11bfb776fb
 EBUILD seamonkey-2.53.9.ebuild 16868 BLAKE2B a40c7c0736d27291b0275ff7e1eadaa1893faed988bca249f3530dca12add8f1ca2343772baab01f6e7c2fd1395206887a6b417c5989f449f8b8ea3313f74a6a SHA512 8448ad5926db3c0e53754c5b88e3f5ea75e1ceeb5012e2a42e5e9cb90b5b19ad610c8122ce89b03fde8dca465b6acbd5b29dbebabe36898674ce3146fc172acb
 MISC metadata.xml 1932 BLAKE2B d016ed891d8859b8f616522fee67799b548f0eb1646d40de8a13e8efac1653be57eb98a417e4f1c531abf4b0dc9dea1c95720c4874dc8be0d83d07eca306f2d3 SHA512 ac6daaa37e093abfa282bc5df8c15410776d021161b3cfe219708c1657f33b129655de6f2efbfb861c9dfa2f5a7f420a02bf0ee6ef05921cbcfb93afef875a6e
diff --git a/www-client/seamonkey/seamonkey-2.53.9.1.ebuild b/www-client/seamonkey/seamonkey-2.53.9.1.ebuild
new file mode 100644
index 000000000000..021b6d5a98ff
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.9.1.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+PATCH="${PN}-2.53.9_beta1-patches-01"
+SRC_URI+="
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
+
+"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/nasm-2.13
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? ( ${ASM_DEPEND} )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( ${ASM_DEPEND} )
+"
+COMMON_DEPEND="
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/libpng-1.6.31:0=[apng]
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	>=x11-libs/pixman-0.19.2
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/mozilla
+
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
+	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	use system-libvpx \
+		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Don't error for format with gcc-9
+	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			build/unix/run-mozilla.sh || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	######################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	######################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_use_enable chatzilla irc
+	mozconfig_annotate '' --enable-dominspector
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Broken on some arches
+	mozconfig_annotate '' --disable-elf-hack
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# workaround for funky/broken upstream configure...
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
+	#emake V=1 -f client.mk configure
+	./mach configure || die
+}
+
+src_compile() {
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	#emake V=1 -f client.mk
+	./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	pushd "${BUILD_OBJ_DIR}" &>/dev/null || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	popd &>/dev/null || die
+
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	#emake DESTDIR="${D}" install
+	DESTDIR="${D}" ./mach install || die
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use chatzilla ; then
+		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index a1dca6be0805..0e50c8a0f709 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -3,6 +3,6 @@ AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.0-r1.ebuild 1220 BLAKE2B f0d509f11751b7e714f2ee38a3506b715ec7e41207de8f18a6c9fd6473895dac63bda8589a8839212babf5ba1b7a9ad0cdf654759e0e015bf2f7b18c23217caf SHA512 ac693af61ce07b3f112f68604074f708419e7c98d8e289a0f37bbe908506935ee4fe46a682f6ce484dac29e99a9441c424040655971f6453ef87b01f5c65cc4a
-EBUILD surf-2.1.ebuild 1403 BLAKE2B 927a745af173f49f4c33c2d47f087611f457eb5281423b6076b282fe1a99174d38457e98a234ccee933161c03994fe19a3f487e05e55a4ae68d4b52c1f20e515 SHA512 266442cc185292cd2751e95f252f56e86d743d5b3dcb0ceac6460b77c1c9c5908a8b667d6877062227b80296c9e8c2f50f21a4f0e4d9fe34e16a49fe84793999
-EBUILD surf-9999.ebuild 1855 BLAKE2B 2c8c238e27d72a3a3b61ff02b203177b213a6d2de9b243c750137b6a99b63f4257fde60f5ccd85cffbcb921b2d98327c0812b70c3c74a05828294a0d3777d051 SHA512 8d72209cdc9d1fd76ae8b09c7a132209635c97c52b58f0ac680726a8460958234f23f77f8f7612e43d1af54354a0a47f33d1846f81356dd9d852fec4cb52e446
+EBUILD surf-2.1.ebuild 1410 BLAKE2B e1247d1fd4ea4c7e93336a0423c89710fa7cb3f22fdc3cefaf80e2944bcc7e9fe535810d3000a852182b500a9c8364b9a0fc92701636032fe24771343680d416 SHA512 e31b0605491640ce60d7ea97f732217a65db17cbda3ca0ec09698ac00bac696182d66a5d656c4ab6d026593323193eb29fcba53469f75417fa02f273562dcfc5
+EBUILD surf-9999.ebuild 1862 BLAKE2B 32d174dce4c799a5555602454dfc25264cc2d0d84f85895996fa555869c22f9c60b8a0696cb98156d8d0faea3de2d2fabdf84fc8a20313cfe038b543053e4a13 SHA512 81676813aa151ac0f755d1da5870201ed121c060dded59d9fd04d3ccc8a3007b6dc7ddd483b3d8e26bc789ba06cf0ff6513c57a840e90732394a9ee9fc6b57bd
 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08
diff --git a/www-client/surf/surf-2.1.ebuild b/www-client/surf/surf-2.1.ebuild
index 15922a19958a..c4af2cd640b4 100644
--- a/www-client/surf/surf-2.1.ebuild
+++ b/www-client/surf/surf-2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="surf-webkit2"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 9dce31f41287..49c122b93dac 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="surf-webkit2"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 1b7bbc2173bf..9774c56538ed 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 c0bcfd7b7240..f0b28be127ce 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_95.0.4638.17-1_amd64.deb 89846788 BLAKE2B 22be2ba9f2e7e307f4a6f1076faf2c138481c1b26619f3704a03adb960c4e5b861ae197d6ac100cf09e84ab671be3aece42fe910e4763ee3291dbf915acdb78f SHA512 c1a131ba53e170b3603cc5160489e527393928a9b6fc4d5c20001fbcb10c0d97e3b64365169c2d9b507fdc24a06993105e65e696a8bf6525b5abda5f93033d53
-DIST google-chrome-stable_94.0.4606.61-1_amd64.deb 90287596 BLAKE2B 0ac80477a3248ce2aaff59855e10542364e50e8baf80a52cb4e3ffa900bb369a22eae73d659d1f87f93b9f19deb6630fc2b9eb1185b851cb0ec1193d8b77246f SHA512 1a596bf6941688b13d1e74d1ee7c8676fad1f79f8224526dd7372c5bc3cb7c96cff3267b4b812f81ca114eb3acac6dd6e5576b536e0bd8cfee8263aa7a91e3a8
-DIST google-chrome-unstable_96.0.4651.0-1_amd64.deb 88841160 BLAKE2B 4ee01a3187d4092009e24cb2d7f585eb4bf87eddfde7bf32c9b9bfb4e05a5120fc2f29db749ea3b9758f903b1c1c407187bb39a4cc650ee421f30ca3c6418613 SHA512 c3b5aa6d27d38f67bb509724814cef389418c808edf831465095c3e4b2de36c669db894251c3769e4da1b0430ce78152bb1c504a36ff90dc4c78b7df05944e2a
-EBUILD chrome-binary-plugins-94.0.4606.61.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-95.0.4638.17_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
-EBUILD chrome-binary-plugins-96.0.4651.0_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+DIST google-chrome-beta_95.0.4638.32-1_amd64.deb 89580228 BLAKE2B 8d6f1eeeae1f109a59bf859e7b3ef7099997973abc12c9eb16be88006eca97c69db0cf525bb614f2ef35ecbdeceb7cac5f3ca9f7234f359bf6825eb6a4fa4363 SHA512 0c659b1e97c7cd1cd79547c5697a12decaefa22a9fa8f5c994d71e07af2d812e578f38d2f9e09b572a8643988ebbb92e6504dbdf5eb275db460e84fe59a28d1b
+DIST google-chrome-stable_94.0.4606.71-1_amd64.deb 90273096 BLAKE2B aea33d4b2ead51d71b85139ba6581eb75e31cb1723e7047a96390246c91e346e12142476f227379f182cf03a8e1154fc00678a494e3578e46063d9cb7ea1a43e SHA512 d86e208730f1ff4b7ad4c831d79021930209454ba1fcb1a1142c4c9ea469be2bc91d2517e80b3547ebb737d9ed48a4cd23431864b0587508b0d2df0e87a25773
+DIST google-chrome-unstable_96.0.4655.0-1_amd64.deb 89354896 BLAKE2B 69b2e65712351b3b7835005eb975dc5ededb09a5172efd8f0de75ec7f0c781513d6af6014f90fa03ae8c7ae3ea4ab1299b8a9ee4ef61feeba7d26b9f64c1f379 SHA512 fae22eb0cb6b1e52cbc12f9d18fb2733da9efa53c7b8fbd3a71132766c0be9c341522aacb4853b9317f01e11e216dc8c4b970ae70a606149122a0eba95f5d165
+EBUILD chrome-binary-plugins-94.0.4606.71.ebuild 1162 BLAKE2B 42cef63e0c49460e11b95cfe4383999f466204cc75069085ce15e435f9662e0d7eb143708334503c7c30df0144e5aa7bd378677ce36c4cfb5c9ccd82eea98b21 SHA512 d3d92b3333fae312d1ff0505368d67a9395f7aa19b4d89daa9241c844284c9465780639b485f9f132b1e85929f1f7713d8d4f86557b10c83e695002c0ec58c49
+EBUILD chrome-binary-plugins-95.0.4638.32_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
+EBUILD chrome-binary-plugins-96.0.4655.0_alpha.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.61.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.61.ebuild
deleted file mode 100644
index 575d76b0e179..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.61.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-KEYWORDS="-* amd64"
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.71.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.71.ebuild
new file mode 100644
index 000000000000..60e3ad6a5e17
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.71.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.17_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.17_beta.ebuild
deleted file mode 100644
index 969dd2f57c6a..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.17_beta.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-KEYWORDS="-* ~amd64"
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.32_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.32_beta.ebuild
new file mode 100644
index 000000000000..e11c8c2a2bb2
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.32_beta.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* ~amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4651.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4651.0_alpha.ebuild
deleted file mode 100644
index 969dd2f57c6a..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4651.0_alpha.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-KEYWORDS="-* ~amd64"
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4655.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4655.0_alpha.ebuild
new file mode 100644
index 000000000000..e11c8c2a2bb2
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4655.0_alpha.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+KEYWORDS="-* ~amd64"
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 6ec2e30b20d9..93817da43b54 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 367a898357dc..b74647b8527c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,6 +2,6 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
-EBUILD uwsgi-2.0.19.1-r104.ebuild 11509 BLAKE2B b845a7063d53f31e939063699ad96c28d0558c4bb6fb31719c44afa1c6d87f21177a6d43c3885baf5236804648979b3aec2b19fdf7fd4e02ca568175326d7a5e SHA512 8b2873a1e0cc290e2f68e5c07306b0007afa125f13f7c9db06444844d97341be87d5d23c509831a654db5b5f88aa829b041153a9181be7acb20e8a3cde79ea23
-EBUILD uwsgi-2.0.19.1-r105.ebuild 11518 BLAKE2B 80817429c87bcb3f3c17d496988d422995d66fe45d12a9191404c94c68992296aeda059743336485259cd5a784f68addb477d2baec1bf6d01ce3fcb9d708eadb SHA512 f5a44bf4be58f4bb7bcfe4ad176b17052dcfdd642ab4497c0eeb89d8cd45177af4345064a216ea2343bf0b9e51ab7f3286dcfaf0051f25ec37857b05f3636feb
+EBUILD uwsgi-2.0.19.1-r106.ebuild 11511 BLAKE2B 690f25947b578387c65b5cbdfa52c55bffc0ac155db10dc172458aaa6175f9ab48623a3809544222b95d743dab7ad72c58abc6a61a83c4c26aa427b90a88dd23 SHA512 b593fa88bf9b653400fa227af638150d1310df99c9940cecc2bf7d1c42803769b7801f5f3fd7219c4784d1ec3bcdcdf1752ed4223e2b372325c536800f1be929
+EBUILD uwsgi-2.0.19.1-r107.ebuild 11520 BLAKE2B 022aeefd01cd4a672f2dfdedf16e3c4a26e4ce6c28101073b0a2f030c0fb83ae2771f7b5cf547a176724b1226a8aad25e3439cf803593799e4d069000bb04cef SHA512 215b6f4af79daeb6e0b2cb14b688383951ab59d1429fc30532a8dae689d34db06efe48be024669ef367de5b6ecfb093259356f31c9b94d599aee6aaa9af62e01
 MISC metadata.xml 1412 BLAKE2B c4f2831a4f5e53f49953045619adbe15ae45dc5d9c019eae8defe3de586121b3fe2292c9c7921b086d8bbf6a0c727ef1cd443c01df99e7532db9126f1b82bdb6 SHA512 2fa796e52f80dc37fe43190541675bd69a082932b00b8c92998b717d8a332300a12b19dab7cfdf1ebf0c1363252b6035a8f17e285bd86bbd685aaa2ac3464dd8
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r104.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r104.ebuild
deleted file mode 100644
index 238144e3df34..000000000000
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r104.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-PHP_EXT_INI="no"
-PHP_EXT_NAME="dummy"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php7-3 php7-4" # deps must be registered separately below
-
-MY_P="${P/_/-}"
-
-inherit flag-o-matic lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="https://projects.unbit.it/uwsgi/"
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux"
-
-UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
-	http ugreen signal syslog rsyslog
-	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
-	{core,fast,raw,ssl}router
-	redislog mongodblog log{file,socket}
-	spooler cheaper_busyness symcall
-	transformation_{chunked,gzip,offload,tofile}
-	zergpool )
-UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
-	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
-	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
-	rados router_{access,radius,spnego,xmldir}
-	sqlite ssi stats_pusher_statsd
-	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
-
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
-
-# plugins to be ignored (for now):
-# cheaper_backlog2: example plugin
-# coroae: TODO
-# cplusplus: partially example code, needs explicit class
-# dummy: no idea
-# example: example plugin
-# exception_log: example plugin
-# *java*: TODO
-# v8: TODO
-# matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
-
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
-
-REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
-	uwsgi_plugins_logcrypto? ( ssl )
-	uwsgi_plugins_sslrouter? ( ssl )
-	routing? ( pcre )
-	uwsgi_plugins_emperor_zeromq? ( zeromq )
-	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
-	uwsgi_plugins_router_xmldir? ( xml !expat )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
-	python-gevent? ( python )
-	expat? ( xml )"
-
-# util-linux is required for libuuid when requesting zeromq support
-# Order:
-# 1. Unconditional
-# 2. General features
-# 3. Plugins
-# 4. Language/app support
-CDEPEND="
-	sys-libs/zlib
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	json? (
-		!yajl? ( dev-libs/jansson )
-		yajl? ( dev-libs/yajl )
-	)
-	pcre? ( dev-libs/libpcre:3 )
-	ssl? ( dev-libs/openssl:0= )
-	xml? (
-		!expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat )
-	)
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )
-	uwsgi_plugins_alarm_curl? ( net-misc/curl )
-	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
-	uwsgi_plugins_curl_cron? ( net-misc/curl )
-	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
-	uwsgi_plugins_geoip? ( dev-libs/geoip )
-	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( sys-libs/pam )
-	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
-	uwsgi_plugins_rados? ( sys-cluster/ceph )
-	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
-	uwsgi_plugins_router_spnego? ( virtual/krb5 )
-	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
-	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
-	uwsgi_plugins_xslt? ( dev-libs/libxslt )
-	go? ( sys-devel/gcc:=[go] )
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono:= )
-	perl? ( dev-lang/perl:= )
-	php? (
-		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
-		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
-	)
-	python? ( ${PYTHON_DEPS} )
-	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-uwsgi )
-	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	echo ${PYTHON_USEDEP}
-	default
-}
-
-pkg_setup() {
-	python_setup
-	use lua && lua-single_pkg_setup
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local embedded_plugins=()
-	local plugins=()
-	local malloc_impl="libc"
-	local json="false"
-	local xml="false"
-
-	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
-		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
-	done
-	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
-		use ${p} && plugins+=("${p}")
-	done
-
-	# do not embed any plugins
-	if ! use embedded; then
-		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
-		embedded_plugins=()
-	fi
-
-	# flatten the arrays
-	plugins=${plugins[@]}
-	embedded_plugins=${embedded_plugins[@]}
-
-	# rename some of the use flags, language plugins are always real plugins
-	plugins="${plugins/perl/psgi}"
-	plugins="${plugins/sqlite/sqlite3}"
-	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
-
-	# override defaults as requested by the user
-	if use xml; then
-		use expat && xml="expat" || xml="libxml2"
-	fi
-	if use json; then
-		use yajl && json="yajl" || json="jansson"
-	fi
-	use jemalloc && malloc_impl="jemalloc"
-
-	# prepare the buildconf for gentoo
-	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
-	sed -i \
-		-e "s|VAR_XML|${xml}|" \
-		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
-		-e "s|VAR_JSON|${json}|" \
-		-e "s|VAR_SSL|$(usex ssl true false)|" \
-		-e "s|VAR_PCRE|$(usex pcre true false)|" \
-		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
-		-e "s|VAR_ROUTING|$(usex routing true false)|" \
-		-e "s|VAR_DEBUG|$(usex debug true false)|" \
-		-e "s|VAR_MALLOC|${malloc_impl}|" \
-		-e "s|VAR_PLUGINS|${plugins// /, }|" \
-		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
-		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
-		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
-		buildconf/gentoo.ini || die "sed failed"
-
-	if ! use caps; then
-		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if ! use zeromq; then
-		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if use uwsgi_plugins_emperor_pg ; then
-		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-each_ruby_compile() {
-	cd "${WORKDIR}/${MY_P}" || die "sed failed"
-
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
-}
-
-python_compile_plugins() {
-	local EPYV
-	local PYV
-	EPYV=${EPYTHON/.}
-	PYV=${EPYV/python}
-
-	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
-
-	if use python-asyncio ; then
-		if [[ "${PYV}" != "27" ]] ; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
-		fi
-	fi
-
-	if use python-gevent ; then
-		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
-	fi
-
-	if use python-gevent || use python-asyncio; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
-	fi
-}
-
-python_install_symlinks() {
-	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
-}
-
-src_compile() {
-	mkdir -p "${T}/plugins" || die
-
-	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	if use go ; then
-		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
-	fi
-
-	if use lua ; then
-		# setting the name for the pkg-config file to lua, since that is the name
-		# provided by the wrapper from Lua eclasses
-		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_compile_plugins
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use go && dosym uwsgi /usr/bin/uwsgi_go
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_install_symlinks
-		python_foreach_impl python_domodule uwsgidecorators.py
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
-	keepdir /etc/"${PN}".d
-	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
-		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
-		ewarn "We therefore do not build them any more."
-		ewarn "    [1] https://bugs.gentoo.org/650776"
-		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
-	use perl   && elog "  '--plugins psgi' for perl"
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			elog "  '--plugins ${s/.}' for ${s}"
-		done
-	fi
-
-	python_pkg_postinst() {
-		local EPYV
-		local PYV
-		EPYV=${EPYTHON/.}
-		PYV=${EPYV/python}
-
-		elog " "
-		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python-asyncio ; then
-			if [[ ${EPYV} == python34 ]] ; then
-				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
-			else
-				elog "  (asyncio is only supported in python3.4)"
-			fi
-		fi
-		if use python-gevent ; then
-			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
-		fi
-	}
-
-	use python && python_foreach_impl python_pkg_postinst
-
-	if use ruby ; then
-		for ruby in $(ruby_get_use_implementations) ; do
-			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
-			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
-			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
-		done
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r105.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r105.ebuild
deleted file mode 100644
index 58d75fe1305e..000000000000
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r105.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-PHP_EXT_INI="no"
-PHP_EXT_NAME="dummy"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php7-3 php7-4" # deps must be registered separately below
-
-MY_P="${P/_/-}"
-
-inherit flag-o-matic lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="https://projects.unbit.it/uwsgi/"
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
-
-UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
-	http ugreen signal syslog rsyslog
-	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
-	{core,fast,raw,ssl}router
-	redislog mongodblog log{file,socket}
-	spooler cheaper_busyness symcall
-	transformation_{chunked,gzip,offload,tofile}
-	zergpool )
-UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
-	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
-	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
-	rados router_{access,radius,spnego,xmldir}
-	sqlite ssi stats_pusher_statsd
-	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
-
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
-
-# plugins to be ignored (for now):
-# cheaper_backlog2: example plugin
-# coroae: TODO
-# cplusplus: partially example code, needs explicit class
-# dummy: no idea
-# example: example plugin
-# exception_log: example plugin
-# *java*: TODO
-# v8: TODO
-# matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
-
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
-
-REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
-	uwsgi_plugins_logcrypto? ( ssl )
-	uwsgi_plugins_sslrouter? ( ssl )
-	routing? ( pcre )
-	uwsgi_plugins_emperor_zeromq? ( zeromq )
-	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
-	uwsgi_plugins_router_xmldir? ( xml !expat )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
-	python-gevent? ( python )
-	expat? ( xml )"
-
-# util-linux is required for libuuid when requesting zeromq support
-# Order:
-# 1. Unconditional
-# 2. General features
-# 3. Plugins
-# 4. Language/app support
-CDEPEND="
-	sys-libs/zlib
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	json? (
-		!yajl? ( dev-libs/jansson )
-		yajl? ( dev-libs/yajl )
-	)
-	pcre? ( dev-libs/libpcre:3 )
-	ssl? ( dev-libs/openssl:0= )
-	xml? (
-		!expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat )
-	)
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )
-	uwsgi_plugins_alarm_curl? ( net-misc/curl )
-	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
-	uwsgi_plugins_curl_cron? ( net-misc/curl )
-	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
-	uwsgi_plugins_geoip? ( dev-libs/geoip )
-	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( sys-libs/pam )
-	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
-	uwsgi_plugins_rados? ( sys-cluster/ceph )
-	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
-	uwsgi_plugins_router_spnego? ( virtual/krb5 )
-	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
-	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
-	uwsgi_plugins_xslt? ( dev-libs/libxslt )
-	go? ( sys-devel/gcc:=[go] )
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono:= )
-	perl? ( dev-lang/perl:= )
-	php? (
-		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
-		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
-	)
-	python? ( ${PYTHON_DEPS} )
-	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-uwsgi )
-	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	echo ${PYTHON_USEDEP}
-	default
-}
-
-pkg_setup() {
-	python_setup
-	use lua && lua-single_pkg_setup
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local embedded_plugins=()
-	local plugins=()
-	local malloc_impl="libc"
-	local json="false"
-	local xml="false"
-
-	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
-		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
-	done
-	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
-		use ${p} && plugins+=("${p}")
-	done
-
-	# do not embed any plugins
-	if ! use embedded; then
-		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
-		embedded_plugins=()
-	fi
-
-	# flatten the arrays
-	plugins=${plugins[@]}
-	embedded_plugins=${embedded_plugins[@]}
-
-	# rename some of the use flags, language plugins are always real plugins
-	plugins="${plugins/perl/psgi}"
-	plugins="${plugins/sqlite/sqlite3}"
-	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
-
-	# override defaults as requested by the user
-	if use xml; then
-		use expat && xml="expat" || xml="libxml2"
-	fi
-	if use json; then
-		use yajl && json="yajl" || json="jansson"
-	fi
-	use jemalloc && malloc_impl="jemalloc"
-
-	# prepare the buildconf for gentoo
-	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
-	sed -i \
-		-e "s|VAR_XML|${xml}|" \
-		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
-		-e "s|VAR_JSON|${json}|" \
-		-e "s|VAR_SSL|$(usex ssl true false)|" \
-		-e "s|VAR_PCRE|$(usex pcre true false)|" \
-		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
-		-e "s|VAR_ROUTING|$(usex routing true false)|" \
-		-e "s|VAR_DEBUG|$(usex debug true false)|" \
-		-e "s|VAR_MALLOC|${malloc_impl}|" \
-		-e "s|VAR_PLUGINS|${plugins// /, }|" \
-		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
-		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
-		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
-		buildconf/gentoo.ini || die "sed failed"
-
-	if ! use caps; then
-		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if ! use zeromq; then
-		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if use uwsgi_plugins_emperor_pg ; then
-		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-each_ruby_compile() {
-	cd "${WORKDIR}/${MY_P}" || die "sed failed"
-
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
-}
-
-python_compile_plugins() {
-	local EPYV
-	local PYV
-	EPYV=${EPYTHON/.}
-	PYV=${EPYV/python}
-
-	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
-
-	if use python-asyncio ; then
-		if [[ "${PYV}" != "27" ]] ; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
-		fi
-	fi
-
-	if use python-gevent ; then
-		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
-	fi
-
-	if use python-gevent || use python-asyncio; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
-	fi
-}
-
-python_install_symlinks() {
-	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
-}
-
-src_compile() {
-	mkdir -p "${T}/plugins" || die
-
-	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	if use go ; then
-		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
-	fi
-
-	if use lua ; then
-		# setting the name for the pkg-config file to lua, since that is the name
-		# provided by the wrapper from Lua eclasses
-		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_compile_plugins
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use go && dosym uwsgi /usr/bin/uwsgi_go
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_install_symlinks
-		python_foreach_impl python_domodule uwsgidecorators.py
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
-	keepdir /etc/"${PN}".d
-	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
-		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
-		ewarn "We therefore do not build them any more."
-		ewarn "    [1] https://bugs.gentoo.org/650776"
-		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
-	use perl   && elog "  '--plugins psgi' for perl"
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			elog "  '--plugins ${s/.}' for ${s}"
-		done
-	fi
-
-	python_pkg_postinst() {
-		local EPYV
-		local PYV
-		EPYV=${EPYTHON/.}
-		PYV=${EPYV/python}
-
-		elog " "
-		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python-asyncio ; then
-			if [[ ${EPYV} == python34 ]] ; then
-				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
-			else
-				elog "  (asyncio is only supported in python3.4)"
-			fi
-		fi
-		if use python-gevent ; then
-			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
-		fi
-	}
-
-	use python && python_foreach_impl python_pkg_postinst
-
-	if use ruby ; then
-		for ruby in $(ruby_get_use_implementations) ; do
-			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
-			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
-			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
-		done
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r106.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r106.ebuild
new file mode 100644
index 000000000000..b5a71218edef
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r106.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php7-3 php7-4" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit flag-o-matic lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="https://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	uwsgi_plugins_router_xmldir? ( xml !expat )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
+	python-gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="
+	sys-libs/zlib
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap )
+	json? (
+		!yajl? ( dev-libs/jansson:= )
+		yajl? ( dev-libs/yajl )
+	)
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? ( dev-libs/openssl:0= )
+	xml? (
+		!expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat )
+	)
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( sys-libs/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( sys-devel/gcc:=[go] )
+	lua? ( ${LUA_DEPS} )
+	mono? ( dev-lang/mono:= )
+	perl? ( dev-lang/perl:= )
+	php? (
+		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
+		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	echo ${PYTHON_USEDEP}
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use lua && lua-single_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python-asyncio ; then
+		if [[ "${PYV}" != "27" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python-gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use python-gevent || use python-asyncio; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since that is the name
+		# provided by the wrapper from Lua eclasses
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
+		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
+		ewarn "We therefore do not build them any more."
+		ewarn "    [1] https://bugs.gentoo.org/650776"
+		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python-asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python-gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $(ruby_get_use_implementations) ; do
+			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+		done
+	fi
+}
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r107.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r107.ebuild
new file mode 100644
index 000000000000..5f63f129cf8a
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r107.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php7-3 php7-4" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit flag-o-matic lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="https://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	uwsgi_plugins_router_xmldir? ( xml !expat )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
+	python-gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="
+	sys-libs/zlib
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap )
+	json? (
+		!yajl? ( dev-libs/jansson:= )
+		yajl? ( dev-libs/yajl )
+	)
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? ( dev-libs/openssl:0= )
+	xml? (
+		!expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat )
+	)
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( sys-libs/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( sys-devel/gcc:=[go] )
+	lua? ( ${LUA_DEPS} )
+	mono? ( dev-lang/mono:= )
+	perl? ( dev-lang/perl:= )
+	php? (
+		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
+		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	echo ${PYTHON_USEDEP}
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use lua && lua-single_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python-asyncio ; then
+		if [[ "${PYV}" != "27" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python-gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use python-gevent || use python-asyncio; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since that is the name
+		# provided by the wrapper from Lua eclasses
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
+		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
+		ewarn "We therefore do not build them any more."
+		ewarn "    [1] https://bugs.gentoo.org/650776"
+		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python-asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python-gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $(ruby_get_use_implementations) ; do
+			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+		done
+	fi
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 26986b8e089d..126beabd2320 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index b0074c5932a0..fc2633f887f7 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,3 +1,3 @@
 DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
-EBUILD xcalc-1.1.0.ebuild 399 BLAKE2B f7206f46718ec56094e63eab37ccd8b6a581a6a7fe28f71fd6190b4552b5b6e26714f0450ccd1d5708c7d313da8d3a17e78e97437f5983510a8b87891bef9f30 SHA512 69128a79d0e6bbfba8ae8298ff4fc7abf01b5ecea0162f1da935b142554479a1b8019932e0cf7e099ccf1caeac52bc200093bd10d2a3eec64537e580108d30b4
+EBUILD xcalc-1.1.0.ebuild 406 BLAKE2B 54f544bd220946bebd58be10afc930cd413db960412d9cfef28227504d29cfc7871b396f5da4305599501acb5600114b5d20bdad128b2372f09bc63754403c75 SHA512 a73d9ccf820c7c109a640379169cc5bc899c33b710b1934ee5caf880805b448c18316d419bdd37624fb5930d53de8e75ff5001de920d23453ecc09b509bca946
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
index ee00cee34728..110fb3082444 100644
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 56d766b9ad47..5ad802edca70 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,3 @@
 DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
-EBUILD xev-1.2.4.ebuild 380 BLAKE2B 2009d3b4fe8b42514489f916b525c88c96ad72378b9206c3678c2e6882583702efa972c3b46c4613527a5a5665bdbc13343357200f990da238c30fdf7f540949 SHA512 9cbc1adacef857a6e0999e8d52be3daab3d944c3f1dd6e3e765ef43188495c39f37c3e8a9a3d4d38fc045107eee4419cbbb536640e14f19bb62e3715a90ed80b
+EBUILD xev-1.2.4.ebuild 387 BLAKE2B 3a2a6e9b12c54a896403d34e070597110fc36ee6507ac28418ec7a10e0697f44dd33aceba1cb53e29d68813d5e53db7f2397aa5ada63f9ac41984ab984ef82f8 SHA512 9a20b20bae3fd657bf7ea16152a09fc37b547346706aaa2bda9fbb2d5e785ba18e15766cdd1ba0194624d4b4ea21e162a0f36cec166f9763e1450b60e99fcdaa
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xev/xev-1.2.4.ebuild b/x11-apps/xev/xev-1.2.4.ebuild
index ca81668ad06b..acc7aaa27433 100644
--- a/x11-apps/xev/xev-1.2.4.ebuild
+++ b/x11-apps/xev/xev-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index 084c55aeb4a6..c74b32697321 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,3 +1,3 @@
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.6.ebuild 394 BLAKE2B 356c14e9f455dbefaa43cc9c2ac999a05b1ac9e1ce599337175ba32ce371a741e8dbc8798ba88b332008a80e715e6e041781e3a3005cdf1c7ad28f92c1f16263 SHA512 54220873efcd3637ec3c40535809439dacd6571972fd806ad2fa7a0a58ffc02ce5c001b5a97ee0426dbc972f809e8670ad4d62427340bd1b1e20a08494ed1d2c
+EBUILD xfontsel-1.0.6.ebuild 401 BLAKE2B ba8740496a607caa61135c5f6dab8ac592570c3a459eb62bd95e3193c000bcf8697720975e838926d9e00cc4ee3a45c6b6759424f931e7a654ee907bf69a3099 SHA512 1651e4ec5a34d950811a3bf9c9374b4b7be45324d6f6efd4d00eae96be44ef8a613fc69082a4d7c70152f38465dec48683e08f0e2fa01f1f1c04e1da16cbd919
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
index 74c543c2d071..edca0997fc9b 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index e510dfd49acb..ddc7662a695b 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,3 @@
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.3.ebuild 384 BLAKE2B d36bdd5aaf07e86d70ae188b45fbeaebb58c1785e1ad978cee3be2a7827d3131fa9b2200b1f3982895133a2fc62e80c99cfbaaabeca68d2cdeaa3c59f5910203 SHA512 038afcdd217fc5171b3de167631f0024097f5379a3986ec1e46184310ba9a5fdf75f2fa34137360654e4d384384d494f3eaa4da8270e4e2956a61a7790f7bfcc
+EBUILD xload-1.1.3.ebuild 391 BLAKE2B ba35977a69a9bb3dd66e3a7ab7d14953d793d58641921c3f1a9f862e17a882bfccf8b06aa124caa28ac466165e95dbe3489784d05d0821a1e18cb0e935568585 SHA512 5853cb89b03efcd91bb1499acc38f506f87f5d66e3c955630b1a5e77bdde95b0324982b3b0fc82798109743d62b047f587504bf33797dcec1b54f4534a3c678d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index 71c7c8fcbdd8..82a498240cfe 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="system load average display for X"
 
-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="
 	x11-libs/libXaw
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index d437977a6ee3..2980bc0f027c 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,3 +1,3 @@
 DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
-EBUILD xman-1.1.5.ebuild 384 BLAKE2B 6449ecdc2df3f4f078dfff8d8a3f3f97e11c29bf111b313f646f0325eec076452ecccdf40b7bf767fe604ea3209d8cf1f5bfd458912edd118022bd20ede70cb8 SHA512 4d31303a158ed2377da4669d36861f98f5fb95f4c089829ef5c61f0b1bb03b97d3e71ddd40de88ceb293b3d6d8ea2bfff664475575bc5d153ee955265a672725
+EBUILD xman-1.1.5.ebuild 391 BLAKE2B bcc93eeca4549081e11c3b641b7115d28ec9b1151fe00bf35996953c8bb4708e1158d875f6ca73d0b361a729aab918223e443b4004533a31f0fa2e17b2d4331f SHA512 f9a6968db987a7eba097f7f03c0d5a92ced1d271c0c7d803de633939e0cc4ac7f1efc2b2ba078e9aaefc5fff3b10b96e2d00bc7d5972f05e3212a06beb129cf9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
index ca387d371d70..5d54e0ce9a4a 100644
--- a/x11-apps/xman/xman-1.1.5.ebuild
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Manual page display program for the X Window System"
 
-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=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e9295103250e..88e71f5f8c87 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 1bb283d5bbc0..372664819611 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,5 +1,3 @@
-DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84
 DIST libfm-qt-0.17.1.tar.xz 363052 BLAKE2B 5931a5f06f0d085aedf0b178efe4f47ccc90d6e99dfa88955d692736d0dbc4fb8ebc9c5b834547b473b84ce815bb7e1e2e991fee38f390e7ff85c8a3effe8f26 SHA512 1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1
-EBUILD libfm-qt-0.16.0.ebuild 901 BLAKE2B aafa398a6dd5477f7e70cf24ad5609912ef36eccde5598e48cc1ffc0406176e01a88d8099a8af3111e9e6be3a7102e3677c8031405a86fa4ad7167d553620e4c SHA512 57c07e9574fee97332747f98e3f6ea2a0f612b2a203f17ecdf234be41d4fe0ac1b58ec793212c957d428491d8767469c5147e36cf6447645c2819775dcaea345
 EBUILD libfm-qt-0.17.1.ebuild 885 BLAKE2B 321c46149eb3867c1130b4d626f6b1e517859223a45c45c5355f999d6919add7d34c93444ebfdc346db20f2723afeb5dcec580555f649cf7bb10ce4727e60f26 SHA512 a252a63e2f66b77bac030dd93fd54f33249ecae1e9ed5d180763d8a683f9c15152838f3d99ac6d22f619f8a50a93ab4a4ae2a14f48257a5ec2c8388bd3bce8a2
 MISC metadata.xml 315 BLAKE2B 1ca0894e1b787a755d024f95c4b09659b300f957f5cf69958bb3801e464eb84385303bbde99be3b491fc85e4202656dfefd40e5aa97ba47533307bfe07d40a0a SHA512 f9df6f22d74db03f845ad296b50e6d53e204867b2f00cbb04448c33f5ed3d22af6de3f9c58238f0e657aa4b963e467db74864d94266e5fa6923f2cb9c330e56c
diff --git a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
deleted file mode 100644
index 7b04c4a72ebd..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.16.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 cmake xdg-utils
-
-DESCRIPTION="Qt Library for Building File Managers"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="BSD GPL-2+ LGPL-2.1+"
-SLOT="0/7"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0:=
-	media-libs/libexif
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index fe3a75657475..a0849bc40884 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,4 @@
-DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
 DIST qtermwidget-0.17.0.tar.xz 187424 BLAKE2B 8053eae3674f12839a205b0686bdb42d83662604da1f43ee6c4feb60c35af6a2f7b65a095a89b64ffd9d2c3ac10e7c78df721862f15f401126fcab3d321fb92e SHA512 c8f75dcd5182a6eea933452c89126fbe64035b278e8e9817d6966693f741691244e5766c49046e83add8f38cb00ff08e2640d2fa149c5aa46b20d8a06a22e78f
-EBUILD qtermwidget-0.16.1.ebuild 633 BLAKE2B 5c7d1f9baeea398f98e6a451df22bcd8706edc46345fca21368ab702ab948286abe9f35729738e9af095a6bd12c29e2cb8dbce61661a6cc9e785cb2e89cc27a8 SHA512 88c2036dd7fef67ec0553652a89a8b53e4bc715663149a6ad47e6cdbd23945530d927f03ffd7a428813b481ac60fe362c13c32ee20e81c56b588ad5052edc1a7
 EBUILD qtermwidget-0.17.0.ebuild 640 BLAKE2B e20ebb05b376b29f29cf3ab3947e632cc3c3919d85a2b71d43319ca90067f576d533e14b475fb46959297f96e49f37cf64005b50cfec57ad5f55a7ef6a397f42 SHA512 54d12f19ba5ee6a4616896709026b1c9b880816e4733b8d9df90f60fe42504dbc95fd261d60481d960dfcc46897898f22fefca402e275d37f34baab17f0bd7d4
 EBUILD qtermwidget-9999.ebuild 635 BLAKE2B 3129aee3f31e8924869a8c0be9638956e6222d1511c3b5d2eade676f0f39b3551239c25d563e64fd0b3defb9fce12069f22fcb195999c6b5a6131e6c959e674f SHA512 db6c0072be09d816d7ef12a0e99f14b8e74eeb42a1908fb32e7c533d07fb9c76e9cf14aaf82f319a11578c1dbf2ef919be89f020671e7c73cfeab8f244b29922
 MISC metadata.xml 603 BLAKE2B ea430f4683aba5813eb7299f56de863dbd4f8b31d23ace4a727fd09c638d038b7bfed6c01274e184b0db0131009eac282e9505a786e6e65b7071a8f14c2da269 SHA512 462305496afcdcdeef9677be6492f8739874892e80fcd789e83b8349e32bdcc822016d8b2efc58a47d32b2385a08538faa64179328ca9309eeabeabbec5cc21c
diff --git a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
deleted file mode 100644
index f739ad66dc10..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="BSD GPL-2 LGPL-2+"
-SLOT="0/${PV}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 414a5fe545ff..04268b0a424a 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index 1f0c2ff2187e..6f80093f4d7e 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -1,4 +1,4 @@
 AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b31c47e3b96a8551a93c0cabd84b9782bbfd1c8e87cc6e1a49c7fcbbf3b8e33b69e69fa7a3cf0e1cf105bb90e4b038707a65 SHA512 2e6b9666e2a79a4dc65e1393018d79848e72b73290bd65bb8316ceaef741ae835385190b0e3592fd9175c68c402c504a679a22cebf8b8684c759787c49d70173
 DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
-EBUILD hsetroot-1.0.5.ebuild 1103 BLAKE2B 4cfabda38cb594baa6d5482bc3f093a63652c9aed6021c2e15860369a6d7c87e796239012815e7d933e422ccd6e2a72cdaed07cb54440307fbbfd731abc72db9 SHA512 0c2ce2f371d7d14394452f28a705f21552c9201ecebf55c7b529c1607dd2fe688d1b5088862f6ee2a3e065e867dea905cdc949ca8e719f5236d81ec65f72fe87
+EBUILD hsetroot-1.0.5.ebuild 1110 BLAKE2B 41ee02ab4690d9a57055d6558df854eccb34d1ec65f0af10ef31c8b9175766513df89fd2103425f52ab124ad5aedf48e60b02bc1372d5d7f2afcdd959f3eaedb SHA512 8abef3d32af48126bb4a6d62a2fa6f11a3dedb415118267b1099beae46453c602b74355dc4deb7b658c537d659372b3c5e0b569dbe9e21f509eef83073fd7f16
 MISC metadata.xml 1163 BLAKE2B 703b2591ab3c58503a1040596a2a0869e2b0e5803165da9c54239599e352d8b5ad2a746e23ccd583d750cbe6c0c7a6dccfbe21b32eaa37ac9c1abdee232d2344 SHA512 8c03afddb58ecdb72c0efc444f83f94175eee78c13ec4ea27512ee04acafe64b1c075105238e6bdbedf805ac3a99b732427009d669e91035ce24852e93853b61
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
index 0596a0349b4e..350cbd2fc58a 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=media-libs/imlib2-1.0.6.2003[X]
 	x11-libs/libX11
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index fd86fa994e8c..2422dfcfb0d2 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,3 @@
 DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
-EBUILD i3lock-2.13.ebuild 693 BLAKE2B d52e903c7bdc80e8add5d608392da3ec29964c70edaee54fcd225f68884156482d0094586e57f4a9cbd6b4057fca9993c559579bad4e6cb52c49926972e1e44a SHA512 ad8a941ef22b74bb307ffc4347ce8a72be740104ad83eee449a252b4306491d6435f92fe4be8b46460fcd4cec47f47da944a3f1cc4982d9bef81362cdfa48c39
+EBUILD i3lock-2.13.ebuild 700 BLAKE2B 084d7874c12f5e311f7c02089aa59ce8126385a96c6afb77969f3bae51c99881d638cac22656bb1b6b12c6cf6fdd04a697da547471d7656f1a198de732024b2f SHA512 2efbdcf1fa1fbe01d78d18b2c55ef1afe4ba8f87393905837bbf45837036d7747b1630dd6a827fbba3a641c72fb09ca4574ca491b7d92b0a93f9f945d9af7bee
 MISC metadata.xml 354 BLAKE2B 7ac8f18c5369a061aa50ea7bb68419d3567f56c0880d4d9325325bff00f17c7b10bd304e8b79b481aa8bef4b3c7ab631b3d789191fe036fe6eeb65f39be5845b SHA512 a847af326d7e82d2d75859f10b9b4fd172a89f8edd425710aed88a430b2896ad53ff4a3f3283603dfeeb77f33e7d8138e8b0b0819c3e0bda6ae4b28a16681cdb
diff --git a/x11-misc/i3lock/i3lock-2.13.ebuild b/x11-misc/i3lock/i3lock-2.13.ebuild
index 8770aa432d5d..21a4ca54e6bf 100644
--- a/x11-misc/i3lock/i3lock-2.13.ebuild
+++ b/x11-misc/i3lock/i3lock-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libev
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index a78ad80e9643..a62bd3e91412 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 549 BLAKE2B 64b16760cb6fd337bd2b9d601ab0b84635b0615fb5d0a9e2dc580c3b8ddb5deed239a42775ecd27948124fd5cb8d78236f7437101ad5d1fd4e88e10a47584fad SHA512 705cc7887c88b3d87a110773a70236b0b33e34a70acf8ddd15f6fe6233c5ee213ce0fe83aa27ca1d0e566f965a63fe8f8f8d72181495aea2c07159fef4f1b3f6
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 556 BLAKE2B 1e93053e660eabf7fdec42aa26ca02474c87539430fccff7c1532749c924ad6bbda7c0e1565d5a4e6fee86a78bd8789c9169c1e0624d7a75b5fcda0004c43d76 SHA512 a6714ee91542825f68b4cc7fb0d484e20172e49c0d4ef8e1778af2ae6d21e4d47517e2f41577e3a1df5c3876505079478267e6ba5a2296f84b2379e427140ae5
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index 6d69b281aff9..c9422f549daf 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 9eda85761675..b5302d550562 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
 DIST pcmanfm-qt-0.17.0.tar.xz 296000 BLAKE2B bfe6a7ed701d375030c8a20fca3a9b1076810c426388e03644bca0a0482f5b86ac784e197463c7316514e78fe72ab360c73df75cb1ee16dc22a2fe313d4f9d01 SHA512 6de9083b90a2d06db892941e50dc9817e1ab8cf5bab80e331cd083c4756b7ede1207ca35fc1fc43b81b52651acb57dfd85953ab8f8deef2a2c0d362374726daa
-EBUILD pcmanfm-qt-0.16.0-r1.ebuild 1104 BLAKE2B 61a8f6d92cc8fed341460e4c53f129076d1f3751e3ea89125c0d5588c37d0ac6ed4a888851e38253d851e32d6770a74e314f235479c859f4e46d4f9aaaa4f2eb SHA512 0e2bc95c9a8339c4a7697d69425f07724ca626f56e087b85c7df3ca80c9ee0d6264cac7697592559738c63fc32b683915dc4f686e5c2cdecd10c80b816cc954c
 EBUILD pcmanfm-qt-0.17.0-r1.ebuild 1120 BLAKE2B af25db71e7dc32d0c5c4a28c5f61081da34ba78ffe239399763acb1e51b3d929d34ccdecbeaa10ea8b3c92483e0940f73b0f3bc287a5233bd93ed9603d8638b8 SHA512 9bf9a8113e78b2774561971c680ff94a8cd6733928b98840beb84bccf25156c6bfafee37bce3bf7555923453c933037269e4396aed3be879262aede5b4a27c94
 MISC metadata.xml 317 BLAKE2B 2d1773f0bd25bbd367f590a419615c5016ad850906f9a5858a6091109c359e9c677e2c58de2df9515dff7c1e2e659fd80e10b3e7ea605b5035c939790aadc4d6 SHA512 e91c385569fd6309b842e62b0303d4dc5ddb8721e39c9f1d22956c340c776edc940b727312f3307d8bbb6d5fd3459e410568c3170adc94bebc53e2811146fa7f
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
deleted file mode 100644
index ca97c1aaa28e..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Qt GUI Tabbed Filemanager"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	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-$(ver_cut 1-2)*
-	x11-libs/libxcb:=
-	x11-misc/xdg-utils
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "mount password storing" gnome-base/gnome-keyring
-	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 044f2af423b2..59574d35264d 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,3 @@
-DIST qps-2.2.0.tar.xz 205940 BLAKE2B c5454df5d7f8465687de8d59250db5f8e06edcbceead6f4ee316e02bc7596173d2319fc21e168968d9a155b0bb9aa98f074d0da3b9d618d051e2eba9159b5b13 SHA512 640c228dd9712d6becf7583cf2cf21bd35df638fcbe088650628d678a1f8f5abb055bdf95150dfe7b24687e043ebd805d1a98f331e329058b5db9dce01dd8f20
 DIST qps-2.3.0.tar.xz 212660 BLAKE2B d52521f11775fe3d169b81851dc78b9e62641bef9d35d3a6b90b440fd6509e228ffe4ad5f51130e901c90710eab525f459c1b384cb01ba23f123841c3b3702c6 SHA512 1b884088fbdfeeaf4814453df4f7a345ebbb1825da0c09e768a655e8266f2089e7c2b9cca5f8d84dc0316a97d884a91ca5b8d9c2336a195c14432302db71171a
-EBUILD qps-2.2.0.ebuild 736 BLAKE2B 487b8d36f923e0d7e88504f0bd5791ff27bf2b6d880b602186c22e976eb609c09a84d364a3837732fb5ad47c192e370dbded002c508f5c95d811927f71d075f7 SHA512 c6da011d9407a1a8635487e4abfc674395ec8e19417fc88b965c8a794eb6e2279ea0bba1f19f246ecd53d0924119aeba0f422134562a64117de8f09a825aed46
 EBUILD qps-2.3.0.ebuild 743 BLAKE2B 3d68cddbecd38205861d87d58e76f46a209843491c11c3f5a0f262f445fd8a4968893466d2b3495ad13315e5a999552a33ba6baf6de8a0b83106774e810e6d4c SHA512 187ffee19381f2ce96de81c58945ebc4737cc789eccfa6d91a76d4047da96163ca6bfc30157e7cae56f1443a62e00e133df3592492a799c4c3d32ca1bb29a763
 MISC metadata.xml 321 BLAKE2B 43225270596add6ade36ef9b48fa3d7f246c17269300d836108939a534776e4fa8892ddc4da14b4a0c223eb85b153b76a0c5f1043743317d505bb83f97c05200 SHA512 1c71a1e2169606e6935523e2ebee5479fe43f5fb9135c4ce43b4094a17fe298568dc95b1df74382eb1355628f2a65ccd9e58f2426987deffc3128ff4137fceda
diff --git a/x11-misc/qps/qps-2.2.0.ebuild b/x11-misc/qps/qps-2.2.0.ebuild
deleted file mode 100644
index cf7874777bee..000000000000
--- a/x11-misc/qps/qps-2.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Process Manager"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxqt-base/liblxqt-0.16.0
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 213fc0682ab3..2c84c03d3df2 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,6 +1,3 @@
-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
+EBUILD qt5ct-1.3.ebuild 983 BLAKE2B ee87fbc6d7fdec639af3ccca9d05c87780a1e45d284f1a4988eb3a13daa3189db6cc0065b181c7d1c327524b763ae4374a2779b85ac5f9e94f3c57e8bc1085a2 SHA512 503757a6945405b48a1509ae9602ff451ac1df141c863da09f987c1df61256048a026ae86897c9b93f14b27e906ddd784264692a3564e4aaefbecd5bb0c6a2b0
 MISC metadata.xml 567 BLAKE2B 1593756b7456b9656c81d6884112022fbf1cafedaf8acdeb41589627bb7f176c78f648a0da43c8145d79c268aded1e6f8c8ffee89f251bfc3eab65c4e054adbb SHA512 73894bc13974d9fa795b749c5ef579f450e61197320ca777a40ebed2fc9b94e657ec9bfeb1bffd33c7809715c4025a844a611758f24f5dc23f346ddfe9542e87
diff --git a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
deleted file mode 100644
index 67313d824fa8..000000000000
--- a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@
- set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths)
- 
- if(EXISTS ${QT_QTPATHS_EXECUTABLE})
--    message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})    
-+    message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})
- else()
-     message(FATAL_ERROR "Could NOT find qtpaths executable")
- endif()
-@@ -54,8 +54,8 @@
- add_subdirectory(src/qt5ct-qtplugin)
- add_subdirectory(src/qt5ct-style)
- 
--install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR})
--install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR})
-+install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
-+install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
- 
- if(UNIX)
-     add_custom_target(distclean @echo cleaning for source distribution)
diff --git a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
deleted file mode 100644
index 782e8c460938..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-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/qt5ct/qt5ct-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild
index 726b25b8dd9f..d12ebfa8b546 100644
--- a/x11-misc/qt5ct/qt5ct-1.3.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 958cda134f60..19e3b6438dae 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -5,5 +5,5 @@ DIST synergy-core-1.14.1.31-rc.tar.gz 4617773 BLAKE2B 3124165e755a494bfe6601dfb2
 DIST synergy-core-1.14.1.32-stable.tar.gz 4617994 BLAKE2B c015ddff44175ea6b0436ab0d7eccfc4e693d7697a67a1b256d310784d794589b1f1815c95fc5948b9987b2c8d11b6bd0685efe08fc87291835fb03b7dcce970 SHA512 c0835d9f1b3f05a994d8340c7abdeb4ed7ab68739d3c0f05e61f639924978d2de1ed1ded58b398287aa29d013a73114b71a578572d2ad6f96e3fce3e0e1a8bc6
 EBUILD synergy-1.14.0.4.ebuild 2413 BLAKE2B c03039c5a861919a581a543d5d8b06e993dbf04f752d7476f1c6bd07bbfd6a0fd5db0da038ad80dced59c0a31e3aef14fa1d3cafe81525f1db81b5ad036c26c4 SHA512 3be5e9de850ca04c950fb3952e4b5f78e7adc53bce0746d4343439143caf0335abc9cc7938146a79472390a4ab347a5e7aff145244c4ee4d0b13b32fa96c4994
 EBUILD synergy-1.14.1.31_rc.ebuild 2481 BLAKE2B 0aabf64bf493091c1311641668f6b62f8edec2ed25aff87fc31e1125410cea7de507b821fd065661dba4d2101fcb64c0a5de4d3a7b6afc2da265c46181a0cfe3 SHA512 cfc9e80d306d0f4c1d39ffcdee4e6e950d678c0cced01262955b385d39b164f343ad746819317684efcba7ed615044c188bf59d94cc8cb15b5255af82c8c212c
-EBUILD synergy-1.14.1.32.ebuild 2481 BLAKE2B 0aabf64bf493091c1311641668f6b62f8edec2ed25aff87fc31e1125410cea7de507b821fd065661dba4d2101fcb64c0a5de4d3a7b6afc2da265c46181a0cfe3 SHA512 cfc9e80d306d0f4c1d39ffcdee4e6e950d678c0cced01262955b385d39b164f343ad746819317684efcba7ed615044c188bf59d94cc8cb15b5255af82c8c212c
+EBUILD synergy-1.14.1.32.ebuild 2480 BLAKE2B fdde5dde71a4f4f415f43c43bd8618ad563517ff774c8ab2d0765c50a9e88ec50e175ea59aa906b65d6012b8b8f391af85574d21f4d53899b4ef4237118fa196 SHA512 5e3e749c6821bd14dd842a1b8b34e0e8b0bca93187a32b6395b2fd6012972ecac2dbf612247b28639e8b603cbc5db97532a9e96106aa3b020d57356df301a193
 MISC metadata.xml 333 BLAKE2B 912556e2d341670a5d4229562606b8c7770228b4b95888fbbfd0e2c9050d40e3bfd0cf9cb2b51799355015f76b68ccd9797408e3b726b494e9682a08f30de9a4 SHA512 e7893b8700886d9e6ea368c57459a4b3185a0272829ebf210002f593b7cdd31b2acbe7d24dd714d81d80628222ae7cd6e60d202969aebe8f3089599903483109
diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild
index a78eee5c4b7b..ed1586ea37b1 100644
--- a/x11-misc/synergy/synergy-1.14.1.32.ebuild
+++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index a6ff8027f032..65460a004b29 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 968 BLAKE2B afc340c83772fea0c290492a263204dc61638fa733b0a8c32be76a9bb3edc08ece30cbe22b02d5a85dc7ca03d93e78deda4b19bb4abe67d8e2aa4eb79f920acc SHA512 63026c59d94a4ff5d774d6cfa97092d2137a4022904aa39d54a7b1a0688c4201744eae044714e4978a003d7e1e9ea4ebc23d0225c893d3e2de80990c02dc917d
+EBUILD tabbed-0.6-r1.ebuild 975 BLAKE2B aba3153ef2ae976380555aee19a390f02421886562c98f4b12f4a489522aa066121bacc8399e30263400922c181b3d74b6533a8dfb912166e15d1b2ce310f570 SHA512 2357091f0c4f889700e6946bab5a239de0e18fc02bfb822b13153fe3a7eca70f02c5f7575fb2af26652b9d4a27ee0248457c5dcd1b7987c0edc58d3f1958b85a
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index d03d6b606626..790999dd6b2b 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index 682adfc67643..c93631e9e9f9 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,5 +1,3 @@
-DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
 DIST unclutter-xfixes-1.6.tar.gz 8965 BLAKE2B f0975c2fdf1409acf85cb44faf5d0e34a23bb934f8715fb19c9c67a2218f0f1ca85fd83b1a180be2d2362c2547ec040c4494247c63f5bb0bf74da9e779206aaf SHA512 aebcd85d0474471a3cd4a4e190692cf2fe91e47da1057b46e33ee79e5c47e3a488f4ac264530df71a0fbebeb679e0da33bafa19a29c73acd0ae62d0edf8acead
-EBUILD unclutter-xfixes-1.5-r2.ebuild 727 BLAKE2B 3088ec27606defbe47ec80e8beb5baa2f79e1099eff3059f3542203bb3478edd892f1422adb51a28b735d30195e6c432cfb449d47d419ce48dfb347025d92966 SHA512 30f102c84a2b7b5ea2f0e41093e82ce435c89b90c5428f8b4d7a826f3419ceec2816fd727580fe9c6f5d9551d4ab039cf1a8150fa8bf343cfdd547f4c9d12be0
 EBUILD unclutter-xfixes-1.6.ebuild 759 BLAKE2B 49495c8841018539ab68726f860b0b8ef916dccba95da0e5efa58325d6d87cab44cc42cde88591c687a544ba04a506f537bce0738ad18273ca8459c4cd3d3e21 SHA512 0a13e0813d15de25dd0f5e015c7ec478801ef580ecc2f7c1a829904891dc15d153f6b81e3cefd9f0db2db7f0e4b47d96d9cb3c8e237f4875899235289c0ab12f
 MISC metadata.xml 337 BLAKE2B ca2dfab1349ce6f9568873a6d72b8514e8bf913d68701fca5c07326385da86d71b7a8a04fb1999faacb989780c086694b6d557a7ea8a4d68aa1a11f909910843 SHA512 446921f13cc5989413a9a7f6ec65a0cd9f818461c14fc0e0ae883b95e0e891dd3cb5bbf45fbea4e630931bfc2f3869441812eb2700affffa3d13e3990dc0f0b1
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild
deleted file mode 100644
index 81baeb486509..000000000000
--- a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hides mouse pointer while not in use (rewrite of unclutter)"
-HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
-SRC_URI="https://github.com/Airblader/unclutter-xfixes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libev
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	!x11-misc/unclutter"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin unclutter
-	newman man/${PN}.1 unclutter.1
-	einstalldocs
-}
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 1ba61edcfca3..2384ceaa4dca 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -3,5 +3,5 @@ AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a426310
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
 DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce
 EBUILD xdotool-3.20160805.1.ebuild 1329 BLAKE2B 53992c6c31b1ee1c710b53e4a0119e47c3ffed95621ad6fe68073321ad880ee5f3d190c33825b27d8422ea096d8c1ad67eb3ad63a85861554041e5eac5d83126 SHA512 ce2fe778428e897074ed7cf69d3fe68d08492fc67224c1a8e88ed3365adefe87ce037ed732c30256dd516976a660012f62b090d2a30685cfe6eea8620cfe0e6d
-EBUILD xdotool-3.20210903.1.ebuild 1409 BLAKE2B 60c3ffe87b7caf08a942d90065c7b2a104d0b95eeecc2520893598e0cb7ea914f4b9ecefc9d15fdda0ea7784fdb0fc39c225786ade596a5f1b597d7d980c8076 SHA512 bb919f202e75ba5611a8efe7b146033340195d49774c3036e1d4646790b60ab08a8203ff02621c89787936d8e3e33bf9ffd2282f9a5cfd78efad53192c7a6d21
+EBUILD xdotool-3.20210903.1.ebuild 1408 BLAKE2B 3b92e6250b4db542b0ff3f103b6a82d470910a628f7addbfb7ce52f25b5bdb0bca155900c8ac255946779c9a2b9667ae857d51250a0d140821a707a64dfd20b6 SHA512 46cb622492b1a3a057e2eb6e450bad26f259b377e3bd3abbac8fb6151c82ee342d7db74e7bf641821ee448adb319730ce584eaa976484b769180b240f308134b
 MISC metadata.xml 560 BLAKE2B 9977cd6c5efe52174f07e4ef10141b7742c904c86afb7305ee82f9f222b2cf62a5b052f171f13d69cf3a7b00bf53f759f4cd108e7b285fafec5f5995828c0888 SHA512 381d5c1933c426b1847d2f239de60c68ec4877b482e6c33b60dffa74c7ff729cd5c62f852adcdf92b830ae8081f0b4c1a498b58416022f49bbae2013ca82ee74
diff --git a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
index 35ad1026e943..633b1908a40f 100644
--- a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="examples"
 
 # Many the tests want to manually start Xvfb regardless of whether there
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index fae1e82f00e0..9219ed8c1dda 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,3 +1,3 @@
 DIST xiccd-0.3.0.tar.gz 31676 BLAKE2B a6ef614a5f34827011196474fdf73c0cebfdd6af25f0ee8925edadf4e3338dbb17a43c2da3cb1fee3531f4bbb3cbd760fe350e3860451e7188452cdfd595674e SHA512 d507d91ba1a6d702c0ca63d1583e0ba330210e8c143ec72b866fd042ed9b8987820fb793fa8100077d59f4c01bc068eff68b8377ed4156956ad44c07f448a45f
-EBUILD xiccd-0.3.0.ebuild 502 BLAKE2B 18a00b11c96bf19dcf8f7c06f23d48de2f66a285ab9c3eac023028b3be4b345a5bfb12ad1583c2f84fe462d2aa8dcc4b89c76a44c3f7928931062b0ab5a21c93 SHA512 b6691aee673744b53ba59f93e0f88fd526b6e895e70a0a3202051b116099a123d01ed1af04bd291c82a58fa89ebca7c6cd8bf3cc227d9009533d88be3da3789d
+EBUILD xiccd-0.3.0.ebuild 509 BLAKE2B 06b30ac9be01ce3c3720ce9736d33e88262a2ddad28dfd982840fbce35e0ecd7353c32d0f81ce6944edee720982f5785d8a122cc8534b8a48e93168987497f61 SHA512 185379bbf517538312994e821a2a637f6e5026789b94695bc6952da4bd48455c67f54ca23f8d29325014b025422e638c0a68a3845521bfcb2218625a139e8535
 MISC metadata.xml 765 BLAKE2B cba96c662ca4913749e5edacb8adddab4d4ad89d6ea77d9d1396092425c3a6a62de57c9b33a075075ac8352c860e1892d339157ebed10d1a480c501626dac909 SHA512 29a04dbb3855419d2db12e5ce0912d9089c0c435d4998864c733e32ab5f965f119ba23b45c7eadca20f90eb5ec9c27654929052400236e51322c4a4e6f465ae0
diff --git a/x11-misc/xiccd/xiccd-0.3.0.ebuild b/x11-misc/xiccd/xiccd-0.3.0.ebuild
index 680cb69d1d70..2d0c6c8e2084 100644
--- a/x11-misc/xiccd/xiccd-0.3.0.ebuild
+++ b/x11-misc/xiccd/xiccd-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-libs/glib:2
 	x11-apps/xrandr
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index c3846ed99c96..00ad1e92d3cf 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,5 +1,5 @@
 AUX xnots-0.2.1-gcc6.patch 1134 BLAKE2B f169cdd6236c4f068aa2661c3d937d5d97035572a4e09322531f3ab3eefd2b2dc8f4f7b529973c342dad8bb80817bb7c2888c038cf1f2c4faf8f4bd926d2ff6c SHA512 236afd11f535ae142f380926ce0c8c7a6ff299ae1718b3a946aedb7daf63da949cfd282d8f4c87975ac4ac77ef7493296e95e51a49e0adc796d8a39ed5dce7a6
 DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
-EBUILD xnots-0.2.1-r2.ebuild 1003 BLAKE2B 51e9e4a85bb183f634f50e5a2a340f006ff05fb8a1c9941041295a5e9a0b791c3e8caf7a7ae9b39e3780bf4b943dcf48e60efdfd94bc6692874c99d2eba8e093 SHA512 533815f7dd9896083a2f535857d23c10f20325a3c8cc068e3fc429b70ae502386ae500fccbc4a286a7a2e8b02dfe441a326655c9be9eba31556796d4b1c9459f
-EBUILD xnots-9999.ebuild 948 BLAKE2B 7a7183891ab4b05a031b395ceb60e853eaa13d3235ebd0fdee2d4a6dacdf0d8dfdff10319278954fda63031872ca8e37c1b7e485fb7115cb9e2432986c495aaf SHA512 854cfbd3b99291da2fecc789f3f07f37cdc56b2e367020fac9367c1c843f5087db9bac2c71c15dab520815f24988b90af0063f830849a667fbd7f15854ac76c5
+EBUILD xnots-0.2.1-r2.ebuild 1021 BLAKE2B 61fd6c1968d3bd624f871672337d905c0132822b5a73c063a28a87367c01289205800e7be798e69bd51d789974d35edb71502a49de8b35e4bedef0b2c5921952 SHA512 2774369734797f42250f37d70ec01e5b7d5280c608ab32f73f09c74d445101a97d14c4b0c18175f4564be2f88c01f133246023bf24f9e40eebe5b93ab37c1485
+EBUILD xnots-9999.ebuild 955 BLAKE2B e0eff7bf1d5be96495952077f84fdd0450cebdeebee5a2e1c6e52b71027db409825b011e622cdc66264df002a259a1d5ec4d3799e3ed2538e9d2a7a56856dd2e SHA512 e2bd55be25d0f42da10ea7e388b3304f46d0d1767aebeb9901355953f77bab1e818d7eda5a7f10a804c980357ae7af34e88129771fd11a61eae81399be0c9c68
 MISC metadata.xml 380 BLAKE2B c884315924e50e9a4067693f8d949bc6d3b590e3a8e4773800c7f622e23922f29c2b21f8f498763c19d8d7c632d0d1ecd381b86813e16958b4eab53a2984ee76 SHA512 891cb62d7e52aa1d8a79a59c6ad84040cd76de669d2647411b89728a895ecadc816ffc487ae29e1527cf602cd6a43f66352518675e1117b937149dd75d0e9795
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index 4037d3a8f0b6..808203035bee 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A desktop sticky note program for the unix geek"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 -riscv x86"
 IUSE="vim-syntax"
 
 RDEPEND="
@@ -23,9 +24,10 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.1-gcc6.patch
 )
diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
index 3f81446e468c..3f2faa519ab0 100644
--- a/x11-misc/xnots/xnots-9999.ebuild
+++ b/x11-misc/xnots/xnots-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A desktop sticky note program for the unix geek"
@@ -22,9 +23,9 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 6b15141e1fa3..208c13b7bcc2 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,6 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
 DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f
+DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a
 EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
 EBUILD zim-0.74.0.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+EBUILD zim-0.74.1.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.74.1.ebuild b/x11-misc/zim/zim-0.74.1.ebuild
new file mode 100644
index 000000000000..131369dc0283
--- /dev/null
+++ b/x11-misc/zim/zim-0.74.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7212ffc7d736..d91bb089c88b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index d6594794a752..4b9b3404a1eb 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -2,5 +2,5 @@ AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce
 AUX mrxvt-0.5.4-fno-common.patch 430 BLAKE2B b5fa23b21524ab486a9c95863af1f858727778a2cdec363e800666bf3518bd1dcb85fbc9e2cb5e90def93ac4243e89f1aea7c73b9c1bca225f4a88ada9415450 SHA512 1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3488 BLAKE2B f20e2fc6fdce8a128948d036425a331fee3de9ec5081fb103a15fa589062ab4de72400f6ae6793e4fb3b9c79b1df78c4c2a0c6d10e66179883dbc665143efc2c SHA512 92d01241b1874cb8ae6fb2ddc8cb000b28c927e0079ebf2179321b0ad5736230bf4e2c291ca74a1dd8581955582904ff19710433fd0edcfdbe0146041e7eaf59
+EBUILD mrxvt-0.5.4.ebuild 3495 BLAKE2B 8f240a80cede126e8735516574e0e0968058de30fbb9d9c984b79c36824346d20696ae84facac5a4612640d140fb93bc696a77f17ea9bc6a69428ad37195f048 SHA512 222feba86bfb5ae7a616d5d4e25936b1471199cd171ac2986ba7c8c13f990a65f9d68236b97461a83174c6d8fbd2e2b369edd806c62f4afe203839738162c4af
 MISC metadata.xml 479 BLAKE2B 263a42c1a71327729db5880a68363e5c704952b5952a70a4ef95d54cbfdc47682e548ee081fd5d794560e8acfc423a615795d05d5ab9c7fba9256895ecb0717f SHA512 60b34d806e18d1c35d0874613a28b53737ffeaabb99c891f7353b5361584e0fafa23e60b29ac8243249407bb5a9c71fac7d77c8bc361becb7abc96083c89310a
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index dbbfd4f073da..2f7189b2cdca 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 75a6281b6f5d..fd1393da13ce 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,7 +1,5 @@
 AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e0ad5130d3e8c7f5b4bbe111d8fd0cb4be4a5e29b434395acb1fdf03635681a33965e74df125da0eaecd0fb8b0b7fab5 SHA512 f67478af84a9fb14a7e95e030cf1695febb4b0e7e47949272dd4ebae0b7183f23abb37089017c2b69ced33d3295f9c37035576b913478e347aee01550ee2a80a
-DIST qterminal-0.16.1.tar.xz 185144 BLAKE2B f775aae132e88c5074e009436da15989a2ff047359ad7d79b9ec2b9b0927d72323eb5d04885012bf68280218c16900d03af1d295a49f6434229274130fe39e27 SHA512 0d9736cb6e220a019e6a8df9507604c144a9be6cb8702719e489c6868858a4e0ab362f713f697ba7a6f9e8cd9c9a94aa8e6daba1adcd698a52729ca6e8096def
 DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57
-EBUILD qterminal-0.16.1-r1.ebuild 847 BLAKE2B 9faed689aaacd5b3b2ddbbedb78bc77e909b9ba64c6769cd9e733b05c69c16fd054652bc15e70638fb7cac4336bf6813041af53457a7317b567765531016d8db SHA512 7a6f1da4a57685fef6d659f8921898a832fd943b5a5794c7439a8ccbf84f06024cc1a32283031bc5dfdbbc8eab408b0738dcab2798c8cd7810cd5e4f9af22d2c
 EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
 EBUILD qterminal-9999.ebuild 834 BLAKE2B 7d083ad025507a0c640d684046b9e6fe7c3dde4afa713cb7304db6602e2de8b5498e4f5a2eed85db450f6d11b4a8c208f28a20ae01e4161c505b064e4a38abd7 SHA512 662116f94c3132d4a94e4d3f9544fc43ed5f2baef0fe5399f7e3b59f71a51e22e9a1e14618feb629a34a61d6b2e0f56d87f7c361681fbe911eb1f623b68b12c0
 MISC metadata.xml 332 BLAKE2B 624f66a3b8a745cfa2f4486cd22cf18f2f650d3be2b9b702527983f7a16bd81adeed917daa5520fa6de32191d30b6cf590eeb12e83e19032d7ee720eb07dcaf2 SHA512 c4e36da6992031391c905fb0908fcf1fcb2061ba2999814e8b33a194dde60bde987ef5689d46ef8a1bea67e8094dcb30fee7749d29f11bb560aec5a6a86742f6
diff --git a/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
deleted file mode 100644
index edd6781423e4..000000000000
--- a/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	~x11-libs/qtermwidget-${PV}
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-PATCHES=( "${FILESDIR}/${P}-appdata.patch" )
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 691ffeb78c00..8746d1a9128b 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gnome-icon-theme-symbolic/Manifest b/x11-themes/gnome-icon-theme-symbolic/Manifest
index a9e928df825b..da35797b8bf4 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Manifest
+++ b/x11-themes/gnome-icon-theme-symbolic/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-icon-theme-symbolic-3.12.0.tar.xz 230420 BLAKE2B e9543bced2f49c98890cb684cfe58d66b84e0e18a469b1c77e24cc10968a2663a1f15e3dc49d937706eb39bbcc83189a59069c666490153a3fb460650210c613 SHA512 e2a662d38c5c1328f384d9bdd73ce54f4e1174a1d88763e4a5f772c2479081f11c81937ba2dc159ce250e433762f14de824516fc68209200d95dc47790471eda
-EBUILD gnome-icon-theme-symbolic-3.12.0.ebuild 1015 BLAKE2B 4f9070a62271fc7d17f798a6427bed1f2d82bbd081ad188b31bb177c1f516a434d1628b67f5439540760d20e866a325e6b6f2a9da4c8ec05274f531b6ba540ee SHA512 75cd2ee4cd53b12bf1eba25dc2799cb0735184e814c70ace4aba82458d19c8f8c53776fb4a3246a60d6283279794ed5af613b957db0129d00477ede4fef34ad8
+EBUILD gnome-icon-theme-symbolic-3.12.0.ebuild 1022 BLAKE2B 113ec7478cee194e4ef7f1ad6d564a43ed34bf7ccc4086f42a1208dc1f8e8228cac6556c8ead3c21faeaff59da9de0c84c5994c23b2921ea83bba17414431092 SHA512 df4ae6dc15d20805b9eab32f89c0e512f970d1e8893873de88fa123a2735685120ba4401474e9aeb423c17ffcf7db769de3a3d57544f9ece8593e32440d5970c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
index 466bc6b30d18..2c90572a16ef 100644
--- a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
+++ b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.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"
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic"
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
 
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 4946db587b7c..e2482d0caf72 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-themes-0.16.0.tar.xz 3220864 BLAKE2B 93f5b7c964f7907204234164db602842fb2247b7fe27c27647cd6981f114c111f5ae4b0c9efd220e1c1283d8dd689d1b90e0a112cd23289d58ccb29ae8e334e2 SHA512 fce067e621df4e3cad62a73f552c06ecf413e83ee2d67643424c4bdc0752c2c0acd1095c92714294ecc3ef96d137a2685860e360e09b81880fadf69b2c041258
 DIST lxqt-themes-0.17.0.tar.xz 3221148 BLAKE2B 6445aedcd26f65a046193b3dc0e9c6ff8e14c84e1a1a3f42334b1af42834f08e953eaef6ba3e3f54c8465266a54f52825a63618e40527226465ae7e069cbeb20 SHA512 60e89e65095f9478501719caa2262ce559ebb9e0ff6ef3c001ee87f76cb62c8b5f2e5a9f4fa72cdfbbd4c97dffacfb88a52cff6de31a13b2635487441fc07328
-EBUILD lxqt-themes-0.16.0.ebuild 488 BLAKE2B e52598acf4eabdebdb649824aafbc70aead2e4cc588403bdd4354ca3c30266d270183c2bdc9b390d2cf61f6c28391b5a59f6efab04b95c04a6a9f44a10987d84 SHA512 26656382bef9132b883e9d4fdccf3c3a0b64b35bfc98ce5bccd045a2868dd7030fc9ee895f2ac813f597123fd664a8a3297f55967f9e41afe4d820119994ebfa
 EBUILD lxqt-themes-0.17.0.ebuild 495 BLAKE2B c02c42a3b45b59a468f8b0502d1ff363d4338d39f84de442b2ea9eca7d10048083be7f0809f7d5f2ed1416da857d61c0daa7775e7ad9ce7976f49b48b294dd2b SHA512 e85ee6910d639622633ad38730b4394c175aec29b695263c7d8db0df124c9f61a390f85ec5648ad511c1e7b863923f64aa00a61f0b5c792550a79e3b116f2176
 MISC metadata.xml 318 BLAKE2B a95d6fc96a978f09e9b2c5f3c8a4c27c79f3d6ab6266cb3b385af306ce516174b7fcdafe4c87d5979f66d34be0eb735cca696744d6f8a79d1ae088e527bef234 SHA512 6be9975d31da48a98e53e5082fc300f5318eb411a7e5b1de3a9f32e22ac843a395bae25233a155b3bf4d0561fb464560ed54d5ded5b366b8b36526431df185b9
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild
deleted file mode 100644
index 1920c2762231..000000000000
--- a/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt Themes"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.8.0"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b07d7cb9c0a2..efd0c7d82f9a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 60afa6422ea7..067d50c9bdce 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -2,5 +2,5 @@ AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a08
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
 DIST blackbox-0.77.tar.gz 394176 BLAKE2B c52872fd02eba6857d2a3f5a8e122a6a8a0cdaa9c2d83f5b2510f9e770e650626d07f6d2b43b18bc3d77de4bfefc9bb9fb10321de0e72d4f82e5988f3c670d59 SHA512 d1f86707d9a2acb68db6a9af947e47acfd687752d06e3e2a60932550fbfa087730e6890b6ceb086f8aa8cf04e932ed7864f92266368fc43dc70b4b58140a792d
 EBUILD blackbox-0.76-r1.ebuild 1309 BLAKE2B cb145a0cbfcf13316301bd2542e540ef63cdd320c7ab9efb679d795e6ff422737078a13cf545ddb4688f4ecd1a66d761832b0c83bfc2b0d624bdee731c338331 SHA512 54fa4b041833e0643ce420832de7c6a42dc2b1a4b2addd7dfc7281b559225d1c05684fc1742d727d9dde0347c0de1cf1907de37b0ad2e10f5b3c0369e64adfeb
-EBUILD blackbox-0.77.ebuild 1342 BLAKE2B 806d21b88f5186772de988c2814ec8df2e48033bdf50a5cf205a9a4764337b8b13cbab9e7b97b75697811d3103ea6c77746f48c143fb0d8d70d7f2d7ff090ac7 SHA512 e263b3bf63faf225ca58eb6f2b67440eb11c20c7ec09f99deeb07890e688644635570d978f05ef5da6d03e2a5af8e744ed023e6438a4cd3abb44fb03824d2de1
+EBUILD blackbox-0.77.ebuild 1349 BLAKE2B 7b7e629c9a7bd01161fc0c8cf851fda1910b1c9ba054f9cc904bdde1dde60c9bfc12ae0d72060c47622d5bcdcf7ff6faf19aa9f0a462fa0f96a59bbddfbe2c6d SHA512 89503176e517b9dfcbd576e158bb7d03f2e6d5eb955afea8b2c4d5fc0a145f4ca0a9f4d225b50c41e53c04bc7360a77fe5f38d2aa006bb087eca8b881ec90ece
 MISC metadata.xml 573 BLAKE2B a267119a25e9f1ea39b05b705a9b186f428b5723f7d8abf43f55561f6929d5e0c1800aed851c81c2b6ddc655974848f43fd79426fc4907a77da0fccf571c2556 SHA512 0dabe8daa4a79b684c1654722ac9d7f958d4511046a7d2a28bd2500751695621bbf4043579f08f73ad98745c921e766b0f19112995324e31e3bf9efa78df221a
diff --git a/x11-wm/blackbox/blackbox-0.77.ebuild b/x11-wm/blackbox/blackbox-0.77.ebuild
index b476324b8951..eb4ce9fb2d69 100644
--- a/x11-wm/blackbox/blackbox-0.77.ebuild
+++ b/x11-wm/blackbox/blackbox-0.77.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug nls static-libs truetype"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index 44b4bac5a12d..1c10c80ce0cc 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -4,5 +4,5 @@ DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb
 DIST evilwm-1.3.1.tar.gz 64824 BLAKE2B 1145662c1907d27c39e55a4eddbc37c51a7b8d92dfa39b98c98eefdf419ebbee1bfc8889725ac38158f2b15e78e0d1a5a202584bc248cb93797c2ba05fbae5c2 SHA512 551ed96884792a6e607b0abb582bed68e583e7790773960a9f5ef6d974a7695752b4f2286d1549c2ca2d8f99b6401deb4e6da11e56bf6ce1fcf828370b072d75
 EBUILD evilwm-1.0.1-r1.ebuild 1221 BLAKE2B 306aacb8aa62d6714197febd6330a0a665329efb02fd8cddd2b479a2f28917dc8cfb89341b3164c0e3f108cdde20408ae67b9772e2833cc9eb92809273a712f8 SHA512 c556cf1863f411413adf27d93c8fbc38718cb4ca8ce9e82f2615a7ee02eef6e047867fd39f31b042345472443d6404f8bcb0eb7fd97264b4cd09c386b3d17baf
 EBUILD evilwm-1.1.1.ebuild 1116 BLAKE2B e9bea1716873f640641cf308013c04461b410ca13f974cdea94f73145f83c7cf8895919a204d15af4cd5dc8460e017d75561211b2df7c7b4f230e02de3ed8797 SHA512 52926c749e4adcfaeda8b2e4917c506f9400dcfcf1e49c24e63b7b6182825a4c98fe9596c47aae00b23b139d727a90a9dbb13b81cc262f99fa596ebf8cddfb0b
-EBUILD evilwm-1.3.1.ebuild 1113 BLAKE2B 4c165600d04a81dfcc7bcae1ee3582cc0ae7082564919f2e56ecc9c56a79696b5e8fd337f52c84fb430c19bcc1825df3baef36b8c9988a10946fd5e219bb3545 SHA512 bc07d93551610091f8b99a5b7bb0660b82f1cd819507e4d420ba0a3076de46a6eb3c4eff59b42ce32251f273921d97906a687af36d7889f88760f5394ccc82d8
+EBUILD evilwm-1.3.1.ebuild 1110 BLAKE2B aa50b0ce7d793dee20020b132d0c426380246acc8f6c7a56c9b2a4d4bd1f28bcaa3715cce81233b38944afaee15f4a0f690e7ba16b74ef83b98a19298b0b506f SHA512 b47f6ce8919728c01086479c94068638c73d57d62bf9647073673fb27187d0af5d2a276fd3d8149e46c79c99e5976fc63b1448f1668c9682a1411b9cb4cdfdd5
 MISC metadata.xml 660 BLAKE2B 6c35fd17e5e7e2fa617f985cc191443aca66ccb0ee73f2d08977e44dec5ace90a46b0d8ac8a3cf9b8b40c4e327f817915bd1bdb154b6f7a2dee127edf4cbb1a2 SHA512 decc23b07fbe6e3b6ee2c02edfb9951e962aa8e8fabc7bde178e4db52925f782a95c13afd3ceac0432eac1f9ef2d6e0e77ac5de53bdb505088f5a9da06d5a17e
diff --git a/x11-wm/evilwm/evilwm-1.3.1.ebuild b/x11-wm/evilwm/evilwm-1.3.1.ebuild
index 849578958ea8..dfb11cd6d186 100644
--- a/x11-wm/evilwm/evilwm-1.3.1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 2187b27b4a6d..c9a86d8a0123 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,9 +1,7 @@
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
-DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
 DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
-EBUILD mutter-40.2.1.ebuild 4857 BLAKE2B 7d7c1edaf536ead824e60131fa5e92e8c1a0fa612f0f2548d4669648dd0453c4325bd05f89163cb6fe9893619d1cdaf32038b0a3154c6fd4452c579cc0e72276 SHA512 43d5d57b0d96cb0a98a8b687672c7398cc23dd99990179d7a9031e669996f9a8ee73e2d83f31d36379844536c23463468db7f21743098478015ffb4789eec777
 EBUILD mutter-40.3-r1.ebuild 4845 BLAKE2B a21695fee7ce8398b5ab40ae41bbf69a8bfb83fe747e0310306763d3768c0a7815d76022b00b234f2567d34ca4729e079011b4c4e09cf4025a16b69083127ce9 SHA512 936522dfc39a0f7565bb8bb0b3e24793df32275db5352620bd72eb0f50ec6623bbd257cc6e6381bf72b226b36e744abd1fc15339efdb559becb734cc3003767a
 EBUILD mutter-40.4.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
 EBUILD mutter-40.5.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
deleted file mode 100644
index 8429f5326103..000000000000
--- a/x11-wm/mutter/mutter-40.2.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xorg-server[wayland]
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232:=
-		>=virtual/libudev-232-r1:= )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
-BDEPEND="
-	dev-libs/wayland
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		|| (
-			x11-libs/libxcvt
-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emsonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 3f3bfbac50ab..8b38ff39b562 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,5 +1,5 @@
 DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
 EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
-EBUILD page-1.9.9-r3.ebuild 1331 BLAKE2B 13fefcb79f087ebd25c92e4ec6d0e35eb11e2250bb2d7ae18d8bf2dd3144a3a5dd0f9dee75ed3d5faebaed2280bf14c9f934a24e9d906d7678ea3aa9fcdd0336 SHA512 225dc789aa4eb83a97a6d2be3e83e180491ff82a8c889bffe8844abe2a5603d38be947ba47471a7eba5e541a03c051d543f9ea6a8be559f6d6ea435012588078
+EBUILD page-1.9.9-r3.ebuild 1338 BLAKE2B 57513e1153465c8eebd9d5465c575637ae9e7e10273bce49f9d9d0f9a1e50fc66693802e6e370305f09f72a1af6b4d443f16a51ea55264c238a2bbeb401722a1 SHA512 5bf39133d17b991f19c5bf8366da9585abb4b4d66aab2db2959482258e1c11eee635980ddec7cb111e74de007a1c1d828a91781247eda30fd81ca4057f85adfe
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.9-r3.ebuild b/x11-wm/page/page-1.9.9-r3.ebuild
index d69704305042..8fc15947bd37 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=x11-libs/libxcb-1.11[xkb]
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index d633191302d4..08a12bbcbb21 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -2,5 +2,5 @@ AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f334
 DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
 DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
 EBUILD qtile-0.16.1.ebuild 1053 BLAKE2B a992609d10a060e1d08adec28af61cd3a92beff3a89b357841ec021bdb8002c923100ff4b75673104eb72a50e66778155c6f10d3cb77aed0cf7998031b7cd28b SHA512 e26c78bd68cc719e5b6bab463080a96a5be2e2b37e7a33932983f6af0231e83acf8b6a862f67f64e65b0b4fdb866cf7284ce6bc762065671b7bfa71e196a2f56
-EBUILD qtile-0.17.0.ebuild 1055 BLAKE2B 8c3b4a19f46e6a2ad85c090b935a916aad08c8f274aea7c291dbf77ce0c3b66eb0c267e42ad5479b0b1ca1f4c186c1013989dcc649113454fc67b407776067b4 SHA512 573fa4d0e8949bb899f28c9f9510b841db38786f86c7ac41c65e09c2cb6c641efa9f64d4e808ed8e3c5515fb97557078fa667ff19da5d65d4280036b88fae09f
+EBUILD qtile-0.17.0.ebuild 1062 BLAKE2B 59c74b424c03a96414183ed89aaee6933ecb14fd3854ca4f830b09a88657bb30d5eb8578acce4f3f16ec558b8eef44347cda589cf4f6713a38dd56b45098f0a4 SHA512 53d4fa24b5eb418dade24b413cb84a7bf8dcc6bcdf74bffd225a6dd798cdc20e795d84ab09aa919b1533c3580f5437f1fe8289a89665517859997ddba765c3c6
 MISC metadata.xml 324 BLAKE2B 6daea96aa4c9f4f18abe5fe4947d9cf7c50b825846816b5a6f683e51c3bb3b3d884f4afd4e424624fe8df2de1c80b6d124dba1a4a3a53982598158347db8dde2 SHA512 589b322da542f94c942b3f4775e0fa96806ec3de47485befaba65e6c803d8004a2ba1a02f4442c3bca5d525355966de837f00af4c109600e8c56fdb53438896a
diff --git a/x11-wm/qtile/qtile-0.17.0.ebuild b/x11-wm/qtile/qtile-0.17.0.ebuild
index cb5c91468622..ff3b8ed595c0 100644
--- a/x11-wm/qtile/qtile-0.17.0.ebuild
+++ b/x11-wm/qtile/qtile-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RESTRICT="test"
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index a2291b0eddba..66ac22bf672e 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -2,6 +2,6 @@ AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e54
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.9-r2.ebuild 3202 BLAKE2B 10e65a499404e5da7ab2305365142618c4b8fc2464dd9e3de617e4367b496eb2593e012817b4cdbac87992b1894abe9489354e2569e28132a183b1fa396b5de7 SHA512 e2391c97fc15e87394cd7d0f91e8b44ad65ff73c0908e4d6f837b05573acc3fb4d08dbffc6901362f856e9d2640ad004a1e4b853aa1604a9101cb39336a6a98e
+EBUILD windowmaker-0.95.9-r2.ebuild 3209 BLAKE2B af3224189a16ffdb2831ae7d2f0a7dbea51ba67e5806eb97e9226f3b41719e687a968a6b97d60b3e241f2eb9db43d03201af0d62a12731ffbf639714c02e4173 SHA512 f36cdcf7474673833d8c7dedeeddb03661aea47ffdf917f2a3fef1dec7a24b9b56f033a2e101e23ba159c6ba3f49ca80da0a167f92e775f524e8059b039798e8
 EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4
 MISC metadata.xml 491 BLAKE2B 655e5faf398e5613ba67612a85c0a2daad2397289a3d666eb49beff9d7bba2e8247a0a39d715244380573a017a5c87b616dc5c254ced104cdc8a9418c943a900 SHA512 38638b8e8648c39b4eb0d2b7f41b388cbc18998a8a9f859638495e1f0df90763ff5eb2d9397d2222fb29f6bd8183bc5366311b539904675d10fb070477314c93
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
index 27d0b6ffe5a5..64285cc4ed19 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 69a09bb755ef..4661fd3aa922 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 793f2822934b..4ea8254f5a28 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,6 +1,8 @@
 AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
 DIST exo-4.16.2.tar.bz2 881098 BLAKE2B df1ad499becd22087724abb716d07a50e432ec555d03a3892d0b81745045c334cb3705419e901697e4c3bc10328837b4f5c4055800d1b6c79c9cfc503427643b SHA512 9c1252d78f5bb900254841a79f1c1b952cb60d9d0197e184266c35a86c340140cdff2460fa83f6fabb66380e2b3d7ab8a08719b4f4784d2215dde51410ce33e8
 DIST exo-4.17.0.tar.bz2 876215 BLAKE2B 252efe98447ff9f7437370d0223f76b64b804eab32d173b77ba1644984faa2ae061d3b6434ab92c952c366ee520900bb26f6542ddca2dc86aade84626517f54c SHA512 9551c0e223b105348c886e52de6879428b672c51766a3277c81e4458389e4b129491cdc81c7b535278da6bc5d97f15f4ce509d5f9597eb6c85546b06b5486312
+DIST exo-4.17.1.tar.bz2 877757 BLAKE2B 152e168568f4ad12e1eb03f7b1971b3369647da0adac57f55d36fc176c36f7c2ccf9125f6bad386843753855b4bbb679a7a6abd80a9375d2212550e0987d4fa4 SHA512 597fee2cc0188159d5278bb5d547f1a4619645684ba3da4046946c5eb38b2a4913731e589caeeb2f8505516bdcbba64bee03291857215e2b4208aa3d2c563988
 EBUILD exo-4.16.2.ebuild 1037 BLAKE2B fc845e4cba69c4bfde2512f34e6c8674b9dc0614617d76f6ef050b8f6ba25dc8616622eaa9b6abd18aa52f5e2515a0a68a9230f07168fa70c798308f17ff3331 SHA512 0962ad579e7bdbb0f2e0127c9bd90972d4a6dddd57ca7b383084b5852743f7308731ec4a9b393fb76db710b13f4971f5d2390f94e0298aa021a89612e9b3788a
 EBUILD exo-4.17.0.ebuild 935 BLAKE2B 4c0db54f43f1321868edff4df673bdeac0d42f8b70c482d2761ce657cf8705710190a26d2eafbf0ed2954e199de48a47db97e97ce37fcdebb3d8462d8488a69f SHA512 839b506425507ccc3da2e1ead78f011ade6adb255d95fed6a8e652cf017122b57f084b689b515bd0e13eb093ce8cf477c87fa25de35b172178d96f073aa2fad8
+EBUILD exo-4.17.1.ebuild 935 BLAKE2B 22e3173c32dc14eb338e159298070d55815c11b7e75a34935a14d125077f8b5822d234305fcbd8dd550667fe151abd99847c54d884342bccbdbefc334a515ab1 SHA512 37d72958a4967cdce59632e24ca231a3bc582182634aac2fc8a798d571b4b742845ab6a571db3847f0702ff5d9d670cc712cb1970b46ff3c37b862bcd62fa957
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.17.1.ebuild b/xfce-base/exo/exo-4.17.1.ebuild
new file mode 100644
index 000000000000..0afdec17d30d
--- /dev/null
+++ b/xfce-base/exo/exo-4.17.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.50
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.17:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.16.0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 1acc2f12b02b..e11c8bb8a1fd 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,13 +1,11 @@
 DIST thunar-4.16.10.tar.bz2 2324476 BLAKE2B a8305f234b6f69654d6559594f1228ebbb5009b337fbdee6d94dc2f3c309d67cbe2aa5c357fd5207d4e907b9d06875dd3164d501c84a22c9f73e71b705577fd7 SHA512 b6fbb27acaae85e7d5c711213c5c457d7eaf973dabafbeabbc00ef01491b54b05da00304503ed03a1ee0716c2558f435754666dd5358f36b2e155e4c8132ebce
 DIST thunar-4.16.8.tar.bz2 2429407 BLAKE2B 0af1c14fff30f276c279ff459e33ff4c23533e1ce494cadba02fca6436c1d1d2a0c8ea302dfb9c7b5ff9b6d7a69a80996afa1274cc9f3c66f112b8230d8b30f3 SHA512 722caeef9a8a074bac705b0108faab418009e61d8e177838b6a63cbf29f7b9c78e3a135b8a59f154e978feb811d5d115810df2b2e9d53d93f1c34e62a2d5f7b8
 DIST thunar-4.16.9.tar.bz2 2323489 BLAKE2B dac834a9c3794f2e8bb4b6d29d3da17de1c49f3905fe4eac047c21dc89dda11582743ef084e7a6beb7cf128840cb6673442476b010352fe59a477bfff70c430c SHA512 afad777f78b898134e572a6d09d4adf69ead5d195cb077731c9261dde3cac489d37eb4b0148a2ca9b920a2c1298c5993170335a7e62b9b9c1863b2cfbfdc6fcb
-DIST thunar-4.17.3.tar.bz2 2427025 BLAKE2B 5fde8faf29f8b8f78a604c12cd0366187865d2c176109a8501500af573e77cfaf53aecc145674f2f49d730f2596c06e3304c4b2e033759430b1d3fd06439310b SHA512 7394121dd995296802b50ae6188a56228dec82f9cb1c29cf8c9bc4db6a69921e78f6a2bfcab459578faf64703eecc59a04ce6f4d623300e54faa2e0b4e261699
-DIST thunar-4.17.4.tar.bz2 2475127 BLAKE2B 1464162544f7d5f646975e9f663db1d4fb14249f87df013f68f04810eb2b961507a9b90b05cfe3dfbe9188c002ccc10143ee77b671e2b196b7ec3df803d05bf7 SHA512 0271d6925955692076168f4227c946479dc17cb8c0bf92d8dca523575f187c481b4c5f876ad13cdeadbdc67a4b773a1b88166a0eddc7b3ff4c8abb40135b84bf
 DIST thunar-4.17.5.tar.bz2 2464157 BLAKE2B 24486a8df430e101b700d2776f9f5329f9e5d43551db5da3a6010ed4dbe38e77269c4f076999f05f3934c024b3f1bcde6e64dc544f9da0e2eaa2a43765b5f269 SHA512 eb8a8b62a4a8c352c3f636e8c3bd07978fbfd0aa1b14e36e0262a766fffdc826f7e452f6a757fc096c7081b080caac85b8e1b75456146a8c95fe4e6e1e5e8d70
+DIST thunar-4.17.6.tar.bz2 2474323 BLAKE2B add0ec83dfff7119df7b0c7dfde579cbd8ea5ae86f77e38f8d1777d47c85145a8f301b3008a278a5ab94efd8ab3fcd6467cf09671630335b2e06123432e8209f SHA512 8ee9508ef1384525991fa96c7b69a4722bbb5d8f7a16c065f47daae9e9eca6e06875c92ba4a15b9c420a8162b9bd547d5a15120cc2f08e0824d318f52fd14b44
 EBUILD thunar-4.16.10.ebuild 2077 BLAKE2B 2c19acbb56267a0d4fa6dd0e35d041953eed34c0ccdea9edf711283c3f35f69c0ad16b60b7b9d71e7015bd7ea8b59ebdd1bf5e9cdc59b6768c5142fd945e538e SHA512 fabd05e46933ad5c6beec84a2e578283105049b7a0e0c0753e0dc927214fd44bde039c3dca70883d880a12064b3c8b9a55beabd263c8e19aa3dd45edd63b4a25
 EBUILD thunar-4.16.8.ebuild 2071 BLAKE2B d015592ff9c4d08936ba5b5c3a44bd74e45bb067000f89cae57a12734a05d18c3adb79e2785076859b8d6d78c9909adabb9ec2c74e10380dbaacababdb145748 SHA512 6f4fcffc0f5f5c48a87a96e971b04a362a119e09a7dad70ee990e3c7c858549d3ca08a3e0d5629e84e10230276c9a6949e5ab2103025bbacffdcee63df2e9b85
 EBUILD thunar-4.16.9.ebuild 2077 BLAKE2B 2c19acbb56267a0d4fa6dd0e35d041953eed34c0ccdea9edf711283c3f35f69c0ad16b60b7b9d71e7015bd7ea8b59ebdd1bf5e9cdc59b6768c5142fd945e538e SHA512 fabd05e46933ad5c6beec84a2e578283105049b7a0e0c0753e0dc927214fd44bde039c3dca70883d880a12064b3c8b9a55beabd263c8e19aa3dd45edd63b4a25
-EBUILD thunar-4.17.3.ebuild 2084 BLAKE2B fc0df0f03f031219056e7621f835b6b5c2868f6c30ec4cbc706aba5792854f9193b1c1810a03ae544e6bc1aed024641051b9629749ffcc0cc3df29b394ee854d SHA512 79efbbb6445f6beda503602781855fc7b298024b966dcaaaf8175a3185e1a09a8b05f154601fc74c922d3668fa8c6606899c6955a40ccfd32b844706948a8888
-EBUILD thunar-4.17.4.ebuild 2084 BLAKE2B afca73f4d7c6e83ca317218c6ae85ab74d005df0616fbbc0e2061b1550e7f21ca446bbb0158a3004cf8f181754cb4f2fc6a9730badbb3ef912ad2cddd47dad98 SHA512 bb62e444cf216066b4eb20aeb7ade3fb487eaea5aae8f97d35dbda827009f282a42376ff228526e18dbe9ff1cdccf1aadc5850236968ad73ce587021d1da5dd8
 EBUILD thunar-4.17.5.ebuild 2084 BLAKE2B 6f15d0d35c260c8e06bb4978944a7fff8a08771044affe31095b149fc2919e082e52da59ec47b9bf34d0c5c58395325c8c502c3d92cae984208bf561111edb7d SHA512 293e7373a7fb68bfd50f98e66871310220e7d0c81357c95ead70abc8d43f1da8580d58c1c86be7718351659dab197c6bbfb1f5892bc21cdb18bad791c9d4058d
+EBUILD thunar-4.17.6.ebuild 2084 BLAKE2B 6f15d0d35c260c8e06bb4978944a7fff8a08771044affe31095b149fc2919e082e52da59ec47b9bf34d0c5c58395325c8c502c3d92cae984208bf561111edb7d SHA512 293e7373a7fb68bfd50f98e66871310220e7d0c81357c95ead70abc8d43f1da8580d58c1c86be7718351659dab197c6bbfb1f5892bc21cdb18bad791c9d4058d
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.17.3.ebuild b/xfce-base/thunar/thunar-4.17.3.ebuild
deleted file mode 100644
index d1aeda971a82..000000000000
--- a/xfce-base/thunar/thunar-4.17.3.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 xdg-utils
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( dev-libs/libgudev:= )"
-RDEPEND="${DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-4.17.4.ebuild b/xfce-base/thunar/thunar-4.17.4.ebuild
deleted file mode 100644
index 63884c064f5a..000000000000
--- a/xfce-base/thunar/thunar-4.17.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg-utils
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.17.0:=
-	>=xfce-base/libxfce4ui-4.17.0:=
-	>=xfce-base/libxfce4util-4.17.0:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( dev-libs/libgudev:= )"
-RDEPEND="${DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-4.17.6.ebuild b/xfce-base/thunar/thunar-4.17.6.ebuild
new file mode 100644
index 000000000000..d13c7d3b9207
--- /dev/null
+++ b/xfce-base/thunar/thunar-4.17.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg-utils
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+DEPEND=">=dev-libs/glib-2.56
+	>=x11-libs/gdk-pixbuf-2.14
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/exo-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.0:=
+	>=xfce-base/libxfce4util-4.17.1:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( dev-libs/libgudev:= )"
+RDEPEND="${DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "If you were using an older Xfce version and Thunar fails to start"
+	elog "with a message similar to:"
+	elog "  Failed to register: Timeout was reached"
+	elog "you may need to reset your xfce4 session:"
+	elog "  rm ~/.cache/sessions/xfce4-session-*"
+	elog "See https://bugs.gentoo.org/698914."
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 9f299ad76d0c..891a52f241d0 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 0dd75e3731f6..3ec44db6c4f6 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-cpugraph-plugin-1.2.3.tar.bz2 427880 BLAKE2B 1e2223eab1c8db275eb2aa43197c9aac8a79faee96778a5b684c0dc74e1b55046d0c1bbe3c00d316118be33ef3ee3777cafd258ef3919d36bbbb073e51fc9455 SHA512 79d7c5b328e778156c6a35b1f4947732f42aaffb23f05fdc5e1e7668d03149f1a72ca4bf9b835904a93db6b23660cb10118b4d046b1bd2dded38ef382719052e
+DIST xfce4-cpugraph-plugin-1.2.4.tar.bz2 445048 BLAKE2B 03c8c6f3aa0ffcfda930e79b851e6c6a425cab18986c7968fbdcecff3b251dc3134aab0c632d13439208445d0786e6e29a9835ccdff189bf82ae95b9b6576d6d SHA512 0a31b60d263f53db9e19165580c6f03a826e514f41b24555b007ae12b0d038d5f1447e637aa21e77cafe9970177dbeab373385e223f77768d46ede4f1adb0ad2
 EBUILD xfce4-cpugraph-plugin-1.2.3.ebuild 815 BLAKE2B c070d7478c0da519addbc77b994ef70b02bf2305f77dbc7f54ddda572ac525a921f5cba4dda9b14082f8f56815f556c1858799f70ed12672ea95339006b4a354 SHA512 9c995793b7412222b659740866971b37841a08e35cf8619339aaa3b7a6aa6061e2477750bde0ca00d5d45a29a52d929c1560851af7c72e4fa58bc070f893c8c6
+EBUILD xfce4-cpugraph-plugin-1.2.4.ebuild 851 BLAKE2B c2b80ad2e422542d1196db425d8be21b7c3b0352c0813722f1f8671259745278f6c91c97143875f85c005294d2987ed6c421a93464cf62f900a75e39532ba1a9 SHA512 26ea9ce50fe8d95116ed6704c520684ab12b1abcc89075e669a00880846effb1021aa181b8503bd7798bb0e427d25567db2aa29d79704bfd7f1d7acd2bee08fe
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.4.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.4.ebuild
new file mode 100644
index 000000000000..6e63cc625b45
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A system load plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.14:=
+	>=xfce-base/libxfce4util-4.14:=
+	>=xfce-base/xfce4-panel-4.14:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}